Update exif-loader.c (#33)

[platform/upstream/libexif.git] / libexif / exif-mnote-data.c

diff --git a/libexif/exif-mnote-data.c b/libexif/exif-mnote-data.c
index e3168f9..248056e 100644 (file)
--- a/libexif/exif-mnote-data.c
+++ b/libexif/exif-mnote-data.c
@@ -1,6 +1,6 @@
 /* exif-mnote-data.c
  *
- * Copyright (C) 2003 Lutz Müller <lutz@users.sourceforge.net>
+ * Copyright (C) 2003 Lutz Mueller <lutz@users.sourceforge.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -14,13 +14,14 @@
  *
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA.
  */
 
 #include <config.h>
-#include "exif-mnote-data.h"
-#include "exif-mnote-data-priv.h"
+
+#include <libexif/exif-mnote-data.h>
+#include <libexif/exif-mnote-data-priv.h>
 
 #include <stdlib.h>
 #include <string.h>
@@ -53,14 +54,17 @@ exif_mnote_data_ref (ExifMnoteData *d)
 static void
 exif_mnote_data_free (ExifMnoteData *d)
 {
+       ExifMem *mem = d ? d->mem : NULL;
+
        if (!d) return;
        if (d->priv) {
                if (d->methods.free) d->methods.free (d);
-               exif_mem_free (d->mem, d->priv);
+               exif_mem_free (mem, d->priv);
                d->priv = NULL;
        }
-       exif_mem_unref (d->mem);
-       d->mem = NULL;
+       exif_log_unref (d->log);
+       exif_mem_free (mem, d);
+       exif_mem_unref (mem);
 }
 
 void