mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Picture handling: switch to stronger typed offset

Browse source 
Also change the on file XML to be even easier to read by making it a
duration as well (which gets us '32:34 min' instead of un-typed seconds).
This is backwards compatible, it will happily read what was written with
the previous commit).

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2014-06-09 09:38:50 -07:00
parent b0983d9d13
commit a26719c541
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dive.c
View file

@ -2290,7 +2290,7 @@ void dive_create_picture(struct dive *d, char *filename, int shift_time)
p->filename = filename;
picture_load_exif_data(p, &timestamp);
if (timestamp)
p->offset = timestamp - d->when + shift_time;
p->offset.seconds = timestamp - d->when + shift_time;
dive_add_picture(d, p);
dive_set_geodata_from_picture(d, p);
}
@ -2299,7 +2299,7 @@ void dive_add_picture(struct dive *d, struct picture *newpic)
{
struct picture **pic_ptr = &d->picture_list;
/* let's keep the list sorted by time */
while( *pic_ptr && (*pic_ptr)->offset < newpic->offset )
while( *pic_ptr && (*pic_ptr)->offset.seconds < newpic->offset.seconds )
pic_ptr = &(*pic_ptr)->next;
newpic->next = *pic_ptr;
*pic_ptr = newpic;