summaryrefslogtreecommitdiffstats
path: root/dive.c
diff options
context:
space:
mode:
authorGravatar Dirk Hohndel <dirk@hohndel.org>2014-08-05 12:37:14 -0700
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-08-05 12:37:14 -0700
commit4583cd8e09944e61aa59baa58e74abee0af0d268 (patch)
tree0714993c8cf822c85b662f020ddd65ca4fc2d665 /dive.c
parent3adbff2320b90bbf27b1bedb540ec3d74fb30f9b (diff)
downloadsubsurface-4583cd8e09944e61aa59baa58e74abee0af0d268.tar.gz
Picture handling: cleaning up the mess
We had pointers to data structures on the stack which we frequently reallocated. These data structure contain basically a filename and an offset. We then create a hash of the pointers to those datastructures with the filename being the key. And then we passed those pointers around through a Qt model(!!!) only in order to then later look up by filename what the offset might be. I am at a loss for words for the lunacy behind this design. How about we just remember the offsets and pass the integers around? Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'dive.c')
-rw-r--r--dive.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/dive.c b/dive.c
index 472f8c2dc..2bea1e43c 100644
--- a/dive.c
+++ b/dive.c
@@ -2495,10 +2495,10 @@ static void picture_free( struct picture *p){
free( p->filename );
free( p );
}
-void dive_remove_picture(struct picture *p)
+void dive_remove_picture(char *filename)
{
struct picture **ep = &current_dive->picture_list;
- while (ep && !same_string((*ep)->filename, p->filename))
+ while (ep && !same_string((*ep)->filename, filename))
ep = &(*ep)->next;
if (ep) {
struct picture *temp = (*ep)->next;