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

core: turn picture-table into std::vector<>

Browse source 
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
This commit is contained in:
Berthold Stoeger 2024-05-30 15:00:28 +02:00 • committed by bstoeger
parent 3cb04d230b
commit 9e3e0a5a05
29 changed files with 170 additions and 316 deletions
Download patch file Download diff file Expand all files Collapse all files

12
core/save-xml.cpp
View file

@ -456,13 +456,13 @@ static void save_dc(struct membuffer *b, struct dive *dive, struct divecomputer
put_format(b, " </divecomputer>\n");
}
static void save_picture(struct membuffer *b, struct picture *pic)
static void save_picture(struct membuffer *b, const struct picture &pic)
{
put_string(b, " <picture filename='");
put_quoted(b, pic->filename, true, false);
put_quoted(b, pic.filename.c_str(), true, false);
put_string(b, "'");
if (pic->offset.seconds) {
int offset = pic->offset.seconds;
if (pic.offset.seconds) {
int offset = pic.offset.seconds;
char sign = '+';
if (offset < 0) {
sign = '-';
@ -470,7 +470,7 @@ static void save_picture(struct membuffer *b, struct picture *pic)
}
put_format(b, " offset='%c%u:%02u min'", sign, FRACTION_TUPLE(offset, 60));
}
put_location(b, &pic->location, " gps='","'");
put_location(b, &pic.location, " gps='","'");
put_string(b, "/>\n");
}
@ -528,7 +528,7 @@ void save_one_dive_to_mb(struct membuffer *b, struct dive *dive, bool anonymize)
/* Save the dive computer data */
for (auto &dc: dive->dcs)
save_dc(b, dive, &dc);
FOR_EACH_PICTURE(dive)
for (auto &picture: dive->pictures)
save_picture(b, picture);
put_format(b, "</dive>\n");
}