From 8bde6369f06e30d06e84491af983b77062e355ad Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@users.sourceforge.net>
Date: Sun, 12 Dec 2010 11:24:13 +0100
Subject: jpeg-utils: Function data cleanup

---
 src/generators.c   |  3 ++-
 src/jpeg-utils.cpp | 11 +++++------
 src/jpeg-utils.h   |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/generators.c b/src/generators.c
index 75c1209..2cea20a 100644
--- a/src/generators.c
+++ b/src/generators.c
@@ -642,7 +642,8 @@ write_html_image (TGallerySetup *setup,
   res = TRUE;
 
   /*  Get EXIF data from the original image  */
-  if (get_exif (original_img, &exif))
+  exif = get_exif (original_img);
+  if (exif == NULL)
     log_error ("write_html_image: error getting exif data from file \"%s\"\n", orig_dst);
 
   /*  Retrieve image sizes of preview and original image  */
diff --git a/src/jpeg-utils.cpp b/src/jpeg-utils.cpp
index 3ec547c..330b597 100644
--- a/src/jpeg-utils.cpp
+++ b/src/jpeg-utils.cpp
@@ -34,13 +34,12 @@
 /*
  *   get_exif: retrieve EXIF informations from a JPEG image
  */
-int
-get_exif (const gchar *filename, TExifData **exif_data)
+TExifData *
+get_exif (const gchar *filename)
 {
   TExifData *data;
 
   data = (TExifData*) g_malloc0 (sizeof (TExifData));
-  *exif_data = data;
 
   try
   {
@@ -184,10 +183,11 @@ get_exif (const gchar *filename, TExifData **exif_data)
   catch (Exiv2::AnyError& e)
   {
     log_error ("get_exif: Caught Exiv2 exception: '%s'\n", e.what());
-    return -1;
+    free_exif_data (data);
+    return NULL;
   }
 
-  return 0;
+  return data;
 }
 
 /*
@@ -221,7 +221,6 @@ free_exif_data (TExifData *data)
     g_free (data->jpeg_comment);
 
     g_free (data);
-    data = NULL;
   }
 }
 
diff --git a/src/jpeg-utils.h b/src/jpeg-utils.h
index e26218e..6e0dc9c 100644
--- a/src/jpeg-utils.h
+++ b/src/jpeg-utils.h
@@ -56,7 +56,7 @@ typedef struct {
 /*
  *   get_exif: retrieve EXIF info from a JPEG image
  */
-int get_exif (const gchar *filename, TExifData **exif_data);
+TExifData * get_exif (const gchar *filename);
 
 /*
  *   free_exif_struct: free allocated structure
-- 
cgit v1.2.3