1 files changed, 139 insertions, 31 deletions

diff --git a/src/jpeg-utils.cpp b/src/jpeg-utils.cpp
index bee9562..df3c94e 100644
--- a/src/jpeg-utils.cpp
+++ b/src/jpeg-utils.cpp
@@ -30,11 +30,55 @@
 #include "gallery-utils.h"
 
 
-struct ExifData {
+struct ExifDataPrivate {
   Exiv2::Image::AutoPtr image;
 };
 
 
+static struct tm *
+parse_exif_date (const char *str)
+{
+  struct tm *tm;
+  char *res;
+
+  tm = (struct tm *) g_malloc0 (sizeof (struct tm));
+
+  res = strptime (str, "%Y:%m:%d %H:%M:%S", tm);
+  if (res == NULL || *res != '\0')
+    return NULL;
+
+  /*  FIXME: what was this used for?  */
+#if 0
+  tm->tm_year -= 1900;
+  tm->tm_mon--;
+#endif
+  mktime (tm);
+
+  return tm;
+}
+
+static void
+shift_time (struct tm *tm, int offset_min)
+{
+  time_t t;
+  struct tm *new_t;
+
+  if (offset_min != 0) {
+    /*  FIXME: converting between time formats could make some data lost, better to operate over struct tm directly  */
+    t = mktime (tm);
+    if (t == (time_t) -1) {
+      log_error ("Cannot shift time %p by %d minutes\n", tm, offset_min);
+      return;
+    }
+
+    t += offset_min * 60;
+
+    new_t = localtime (&t);
+    memcpy (tm, new_t, sizeof (struct tm));
+  }
+}
+
+
 /*
  *   EXIF and IPTC info retrieval, keeps the source file open until freed
  */
@@ -43,12 +87,12 @@ read_exif (const gchar *filename)
 {
   ExifData *data;
 
-  data = (ExifData*) g_malloc0 (sizeof (ExifData));
+  data = exif_data_new_empty ();
 
   try {
-    data->image = Exiv2::ImageFactory::open (filename);
-    g_assert (data->image.get() != 0);
-    data->image->readMetadata();
+    data->priv->image = Exiv2::ImageFactory::open (filename);
+    g_assert (data->priv->image.get() != 0);
+    data->priv->image->readMetadata();
   }
   catch (Exiv2::AnyError& e)
   {
@@ -60,11 +104,24 @@ read_exif (const gchar *filename)
   return data;
 }
 
+ExifData *
+exif_data_new_empty ()
+{
+  ExifData *data;
+
+  data = (ExifData*) g_malloc0 (sizeof (ExifData));
+  data->priv = (ExifDataPrivate*) g_malloc0 (sizeof (ExifDataPrivate));
+
+  return data;
+}
+
 void
 exif_data_free (ExifData *data)
 {
   if (data) {
-    /* FIXME: free data->image */
+    g_free (data->override_copyright);
+    /* FIXME: free data->priv->image */
+    g_free (data->priv);
     g_free (data);
   }
 }
@@ -103,18 +160,18 @@ get_exif_data (ExifData *exif, const gchar *key)
 
   try {
     if (g_strcmp0 (key, JPEG_COMMENT) == 0) {
-      return g_strdup (exif->image->comment().c_str());
+      return g_strdup (exif->priv->image->comment().c_str());
     }
 
     if (g_str_has_prefix (key, "Exif.")) {
-      Exiv2::ExifData &exifData = exif->image->exifData();
+      Exiv2::ExifData &exifData = exif->priv->image->exifData();
       if (! exifData.empty()) {
         return g_strdup (exifData[key].toString().c_str());
       }
     }
 
     if (g_str_has_prefix (key, "Iptc.")) {
-      Exiv2::IptcData &iptcData = exif->image->iptcData();
+      Exiv2::IptcData &iptcData = exif->priv->image->iptcData();
       if (! iptcData.empty()) {
         return g_strdup (iptcData[key].toString().c_str());
       }
@@ -136,7 +193,7 @@ get_exif_data_fixed (ExifData *exif, const gchar *key)
   try
   {
     if (g_str_has_prefix (key, "Exif.")) {
-      Exiv2::ExifData &exifData = exif->image->exifData();
+      Exiv2::ExifData &exifData = exif->priv->image->exifData();
       if (exifData.empty())
         return NULL;
 
@@ -153,24 +210,29 @@ get_exif_data_fixed (ExifData *exif, const gchar *key)
         } catch (...) { }
         if (! val || strlen (val) == 0)
           try {
+            val = exifData["Exif.Photo.DateTimeDigitized"].toString().c_str();
+          } catch (...) { }
+        if (! val || strlen (val) == 0)
+          try {
+            /*  usually a modification date  */
             val = exifData["Exif.Image.DateTime"].toString().c_str();
           } catch (...) { }
 
         if (val && strlen (val) > 0) {
-          struct tm tt;
+          struct tm *tt;
           char conv[1024];
 
           memset (&conv, 0, sizeof (conv));
-          memset (&tt, 0, sizeof (struct tm));
-
-          if (sscanf (val, "%d:%d:%d %d:%d:%d", &tt.tm_year, &tt.tm_mon, &tt.tm_mday, &tt.tm_hour, &tt.tm_min, &tt.tm_sec) == 6)
-            {
-              tt.tm_year -= 1900;
-              tt.tm_mon--;
-              mktime (&tt);
-              if (strftime (&conv[0], sizeof (conv), "%c", &tt))
-                  return g_strdup (&conv[0]);
+
+          tt = parse_exif_date (val);
+          if (tt) {
+            shift_time (tt, exif->timezone_shift);
+            if (strftime (&conv[0], sizeof (conv), "%c", tt)) {
+              g_free (tt);
+              return g_strdup (&conv[0]);
             }
+            g_free (tt);
+          }
         }
       }
 
@@ -214,7 +276,7 @@ get_exif_data_fixed (ExifData *exif, const gchar *key)
     }
 
     if (g_str_has_prefix (key, "Iptc.")) {
-      Exiv2::IptcData &iptcData = exif->image->iptcData();
+      Exiv2::IptcData &iptcData = exif->priv->image->iptcData();
       if (iptcData.empty())
         return NULL;
     }
@@ -239,16 +301,16 @@ exif_has_key (ExifData *exif, const gchar *key)
 
   try {
     if (g_strcmp0 (key, JPEG_COMMENT) == 0) {
-      return (! exif->image->comment().empty());
+      return (! exif->priv->image->comment().empty());
     }
 
     if (g_str_has_prefix (key, "Exif.")) {
-      Exiv2::ExifData &exifData = exif->image->exifData();
+      Exiv2::ExifData &exifData = exif->priv->image->exifData();
       return !exifData.empty() && exifData[key].count() > 0;
     }
 
     if (g_str_has_prefix (key, "Iptc.")) {
-      Exiv2::IptcData &iptcData = exif->image->iptcData();
+      Exiv2::IptcData &iptcData = exif->priv->image->iptcData();
       return !iptcData.empty() && iptcData[key].count() > 0;
     }
 
@@ -450,17 +512,50 @@ calculate_sizes (const unsigned long max_width, const unsigned long max_height,
   }
 }
 
+static gboolean
+shift_exif_time (Exiv2::ExifData& exifData, const char *key, int amount)
+{
+  const char *s;
+  gboolean res;
+
+  res = FALSE;
+  try {
+    if (exifData[key].count() > 0) {
+      s = exifData[key].toString().c_str();
+
+      if (s && strlen (s) > 0) {
+        struct tm *tt;
+        char conv[1024];
+
+        memset (&conv, 0, sizeof (conv));
+
+        tt = parse_exif_date (s);
+        if (tt) {
+          shift_time (tt, amount);
+          if (strftime (&conv[0], sizeof (conv), "%Y:%m:%d %H:%M:%S", tt)) {
+            exifData[key] = (const char *) &conv[0];
+            res = TRUE;
+          }
+          g_free (tt);
+        }
+      }
+    }
+  } catch (...) {  }
+
+  return res;
+}
 
 /*
  *   modify_exif: - strip thumbnail stored in EXIF table
- *                - add copyright to Exif::Image::Copyright and Iptc::Application2::Copyright
+ *                - write down overriden keys
  */
 void
-modify_exif (const gchar *filename, gboolean strip_thumbnail, const gchar *add_copyright)
+modify_exif (const gchar *filename, ExifData *exif, gboolean strip_thumbnail)
 {
   gboolean modified;
+  gboolean res;
 
-  if (! strip_thumbnail && add_copyright == NULL)
+  if (! strip_thumbnail && exif == NULL)
     return;
 
   modified = FALSE;
@@ -470,10 +565,23 @@ modify_exif (const gchar *filename, gboolean strip_thumbnail, const gchar *add_c
 
     image->readMetadata();
     Exiv2::ExifData &exifData = image->exifData();
-    if (add_copyright) {
-      exifData["Exif.Image.Copyright"] = add_copyright;
-      image->iptcData()["Iptc.Application2.Copyright"] = add_copyright;
-      modified = TRUE;
+
+    if (exif) {
+      if (exif->override_copyright) {
+        exifData["Exif.Image.Copyright"] = exif->override_copyright;
+        image->iptcData()["Iptc.Application2.Copyright"] = exif->override_copyright;
+        modified = TRUE;
+      }
+
+      if (exif->timezone_shift != 0 && !exifData.empty()) {
+        /*  need original data to calculate the shift from  */
+        res = shift_exif_time (exifData, "Exif.Photo.DateTimeOriginal", exif->timezone_shift);
+        res = shift_exif_time (exifData, "Exif.Photo.DateTimeDigitized", exif->timezone_shift) || res;
+        if (! res)
+          /*  usually a modification date, shift as a last option  */
+          shift_exif_time (exifData, "Exif.Image.DateTime", exif->timezone_shift);
+        modified = TRUE;
+      }
     }
 
     if (strip_thumbnail && ! exifData.empty())  {