From 050e064c40dafe1e90307870e02ad29815fe9f74 Mon Sep 17 00:00:00 2001
From: Tomas Bzatek <tbzatek@users.sourceforge.net>
Date: Tue, 18 Mar 2014 12:23:18 +0100
Subject: Use "override" terminology instead of "fake"

This is a file format break within development branch.
---
 src/jpeg-utils.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'src/jpeg-utils.cpp')

diff --git a/src/jpeg-utils.cpp b/src/jpeg-utils.cpp
index e2d0871..ada7677 100644
--- a/src/jpeg-utils.cpp
+++ b/src/jpeg-utils.cpp
@@ -226,8 +226,8 @@ get_exif_data_fixed (ExifData *exif, const gchar *key)
 
       if (g_str_equal (key, EXIF_APERTURE)) {
         double val = -1;
-        if (exif->fake_aperture != -1)
-          val = exif->fake_aperture;
+        if (exif->override_aperture != -1)
+          val = exif->override_aperture;
         else {
           if (exifData["Exif.Photo.FNumber"].count() > 0)
             val = exifData["Exif.Photo.FNumber"].toFloat();
@@ -264,9 +264,9 @@ get_exif_data_fixed (ExifData *exif, const gchar *key)
 
           memset (&conv, 0, sizeof (conv));
 
-          if (exif->fake_datetime != (time_t) -1) {
+          if (exif->override_datetime != (time_t) -1) {
             tt = (struct tm *) g_malloc0 (sizeof (struct tm));
-            localtime_r (&exif->fake_datetime, tt);
+            localtime_r (&exif->override_datetime, tt);
             if (strftime (&conv[0], sizeof (conv), "%c", tt))
               res = g_strdup (&conv[0]);
           }
@@ -307,7 +307,7 @@ get_exif_data_fixed (ExifData *exif, const gchar *key)
 
       if (g_str_equal (key, EXIF_FOCAL_LENGTH)) {
         double val;
-        val = exif->fake_focal_length != -1 ? exif->fake_focal_length : exifData["Exif.Photo.FocalLength"].toFloat();
+        val = exif->override_focal_length != -1 ? exif->override_focal_length : exifData["Exif.Photo.FocalLength"].toFloat();
         if (val >= 0)
           return g_strdup_printf ("%.0f mm", val);
       }
@@ -658,7 +658,7 @@ shift_iptc_time (Exiv2::IptcData &iptcData, const char *date_key, const char *ti
 }
 
 static gboolean
-fake_exif_time (Exiv2::ExifData &exifData, const char *key, time_t datetime)
+override_exif_time (Exiv2::ExifData &exifData, const char *key, time_t datetime)
 {
   struct tm tt = {0};
   gchar *st;
@@ -680,7 +680,7 @@ fake_exif_time (Exiv2::ExifData &exifData, const char *key, time_t datetime)
 }
 
 static gboolean
-fake_iptc_time (Exiv2::IptcData &iptcData, const char *date_key, const char *time_key, time_t datetime)
+override_iptc_time (Exiv2::IptcData &iptcData, const char *date_key, const char *time_key, time_t datetime)
 {
   struct tm tt = {0};
   Exiv2::DateValue dval;
@@ -746,7 +746,7 @@ modify_exif (const gchar *filename, ExifData *exif, gboolean strip_thumbnail, gb
         }
       }
 
-      if (exif->timezone_shift != 0 && exif->fake_datetime == (time_t) -1) {
+      if (exif->timezone_shift != 0 && exif->override_datetime == (time_t) -1) {
         if (! exifData.empty()) {
           res = shift_exif_time (exifData, "Exif.Photo.DateTimeOriginal", exif->timezone_shift);
           res = shift_exif_time (exifData, "Exif.Photo.DateTimeDigitized", exif->timezone_shift) || res;
@@ -761,33 +761,33 @@ modify_exif (const gchar *filename, ExifData *exif, gboolean strip_thumbnail, gb
         }
       }
 
-      if (exif->fake_datetime != (time_t) -1 && !exifData.empty()) {
+      if (exif->override_datetime != (time_t) -1 && !exifData.empty()) {
         if (! exifData.empty()) {
-          res = fake_exif_time (exifData, "Exif.Photo.DateTimeOriginal", exif->fake_datetime);
-          res = fake_exif_time (exifData, "Exif.Photo.DateTimeDigitized", exif->fake_datetime) || res;
-          res = fake_exif_time (exifData, "Exif.Image.DateTime", exif->fake_datetime) || res;
+          res = override_exif_time (exifData, "Exif.Photo.DateTimeOriginal", exif->override_datetime);
+          res = override_exif_time (exifData, "Exif.Photo.DateTimeDigitized", exif->override_datetime) || res;
+          res = override_exif_time (exifData, "Exif.Image.DateTime", exif->override_datetime) || res;
           modified = TRUE;
         }
         if (! iptcData.empty()) {
-          res = fake_iptc_time (iptcData, "Iptc.Application2.DateCreated", "Iptc.Application2.TimeCreated", exif->fake_datetime);
-          res = fake_iptc_time (iptcData, "Iptc.Application2.DigitizationDate", "Iptc.Application2.DigitizationTime", exif->fake_datetime) || res;
+          res = override_iptc_time (iptcData, "Iptc.Application2.DateCreated", "Iptc.Application2.TimeCreated", exif->override_datetime);
+          res = override_iptc_time (iptcData, "Iptc.Application2.DigitizationDate", "Iptc.Application2.DigitizationTime", exif->override_datetime) || res;
           if (res)
             modified = TRUE;
         }
       }
 
-      if (exif->fake_aperture != -1) {
+      if (exif->override_aperture != -1) {
         if (! exifData.empty()) {
-          exifData["Exif.Photo.FNumber"] = Exiv2::floatToRationalCast (exif->fake_aperture);
+          exifData["Exif.Photo.FNumber"] = Exiv2::floatToRationalCast (exif->override_aperture);
           if (exifData["Exif.Photo.ApertureValue"].count() > 0)
-            exifData["Exif.Photo.ApertureValue"] = Exiv2::floatToRationalCast (exif->fake_aperture);
+            exifData["Exif.Photo.ApertureValue"] = Exiv2::floatToRationalCast (exif->override_aperture);
           modified = TRUE;
         }
       }
 
-      if (exif->fake_focal_length != -1) {
+      if (exif->override_focal_length != -1) {
         if (! exifData.empty()) {
-          exifData["Exif.Photo.FocalLength"] = Exiv2::floatToRationalCast (exif->fake_focal_length);
+          exifData["Exif.Photo.FocalLength"] = Exiv2::floatToRationalCast (exif->override_focal_length);
           modified = TRUE;
         }
       }
-- 
cgit v1.2.3