Use exiv2 to retrieve JPEG comment

1 files changed, 4 insertions, 18 deletions

diff --git a/jpeg-utils.cpp b/jpeg-utils.cpp
index 316cbd7..be4908f 100644
--- a/jpeg-utils.cpp
+++ b/jpeg-utils.cpp
@@ -175,6 +175,10 @@ get_exif (const char *filename, TExifData **exif_data)
        } catch (...) { }
      }
 
+     /*  JPEG::Comment  */
+     try {
+       data->jpeg_comment = strdup (image->comment().c_str());
+     } catch (...) { }
   }
   catch (Exiv2::AnyError& e)
   {
@@ -182,24 +186,6 @@ get_exif (const char *filename, TExifData **exif_data)
     return -1;
   }
 
-  /*  Read the JPEG comment  */
-  MagickBooleanType status;
-  MagickWand *magick_wand;
-  char *comment;
-
-  MagickWandGenesis();
-  magick_wand = NewMagickWand();
-  status = MagickPingImage (magick_wand, filename);
-  if (status == MagickTrue) {
-    comment = MagickGetImageProperty(magick_wand, "comment");
-    if (comment)
-      data->jpeg_comment = strdup (comment);
-    MagickRelinquishMemory (comment);
-  }
-  magick_wand = DestroyMagickWand (magick_wand);
-  MagickWandTerminus();
-
-
 #ifdef __DEBUG_ALL__
     printf("EXIF_TAG_DATE_TIME = '%s'\n", data->datetime);
     printf("EXIF_TAG_MODEL = '%s'\n", data->camera_model);