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

Merge pull request #2742 from bstoeger/clean87

Browse source 
cleanup: don't keep pointer-to-picture in PictureEntry
This commit is contained in:
Dirk Hohndel 2020-04-11 11:00:11 -07:00 • committed by GitHub
commit 2990010ccd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
qt-models/divepicturemodel.cpp
View file

@ -59,7 +59,7 @@ void DivePictureModel::updateDivePictures()
if (dive->selected) { if (dive->selected) {
int first = pictures.count(); int first = pictures.count();
FOR_EACH_PICTURE(dive) FOR_EACH_PICTURE(dive)
pictures.push_back({ dive->id, picture, picture->filename, {}, picture->offset.seconds, {.seconds = 0}}); pictures.push_back({ dive->id, picture->filename, {}, picture->offset.seconds, {.seconds = 0}});
// Sort pictures of this dive by offset. // Sort pictures of this dive by offset.
// Thus, the list will be sorted by (diveId, offset). // Thus, the list will be sorted by (diveId, offset).

1
qt-models/divepicturemodel.h
View file

@ -10,7 +10,6 @@
struct PictureEntry { struct PictureEntry {
int diveId; int diveId;
struct picture *picture;
QString filename; QString filename;
QImage image; QImage image;
int offsetSeconds; int offsetSeconds;