diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-02-26 22:26:11 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-04-12 18:19:07 +0300 |
| commit | f6e7bdc5ef99d5a5fe71ac4f32511900fa82e804 (patch) | |
| tree | 398efefad3b84b33eb5e488bdfa5b2482f345cdd /core/dive.c | |
| parent | 36644dc9f7540886801bda6131dff36241d9e879 (diff) | |
| download | subsurface-f6e7bdc5ef99d5a5fe71ac4f32511900fa82e804.tar.gz | |
Dive site: add dive site table parameter to dive site functions
To enable undo of dive site functions, it is crucial to work
with different dive site tables. Therefore add a dive site table
parameter to dive site functions. For now, always pass the global
dive site table. Thus, this commit shouldn't alter any functionality.
After this change, a simple search for dive_site_table reveals all
places where the global dive site table is accessed.
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'core/dive.c')
| -rw-r--r-- | core/dive.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/dive.c b/core/dive.c index 7e3b30be9..832f83759 100644 --- a/core/dive.c +++ b/core/dive.c @@ -4026,14 +4026,14 @@ bool picture_check_valid_time(timestamp_t timestamp, int shift_time) return false; } -static void dive_set_geodata_from_picture(struct dive *dive, struct picture *picture) +static void dive_set_geodata_from_picture(struct dive *dive, struct picture *picture, struct dive_site_table *table) { struct dive_site *ds = dive->dive_site; if (!dive_site_has_gps_location(ds) && has_location(&picture->location)) { if (ds) { ds->location = picture->location; } else { - dive->dive_site = create_dive_site_with_gps("", &picture->location, dive->when); + dive->dive_site = create_dive_site_with_gps("", &picture->location, dive->when, table); invalidate_dive_cache(dive); } } @@ -4062,7 +4062,7 @@ void create_picture(const char *filename, int shift_time, bool match_all) picture->location = metadata.location; dive_add_picture(dive, picture); - dive_set_geodata_from_picture(dive, picture); + dive_set_geodata_from_picture(dive, picture, &dive_site_table); invalidate_dive_cache(dive); } |