From 48a56db27ef805cb43cbdfdea45e2586fbdc5ebf Mon Sep 17 00:00:00 2001
From: michael <michael@michaelezra.com>
Date: Thu, 5 Jul 2012 07:31:30 -0400
Subject: [PATCH] Adding support for jpeg and tiff file extensions (on behalf
 of sankeytms) see issue 1215. For existing RT installations - add 'jpeg' in
 Preferences/FileBrowser tab, Parsed extensions.

---
 rtdata/options/options.lin |  4 ++--
 rtdata/options/options.osx |  4 ++--
 rtdata/options/options.win |  4 ++--
 rtengine/imagedata.cc      |  2 +-
 rtengine/imageio.cc        | 12 ++++++++----
 rtgui/thumbnail.cc         |  2 +-
 6 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/rtdata/options/options.lin b/rtdata/options/options.lin
index 3553b0baa..f40e1685e 100644
--- a/rtdata/options/options.lin
+++ b/rtdata/options/options.lin
@@ -12,8 +12,8 @@ MultiUser=true
 
 [File Browser]
 # Image filename extensions to be looked for, and their corresponding search state (0/1 -> skip/include)
-ParseExtensions=arw;cr2;crf;crw;dng;jpg;kdc;mef;mrw;nef;nrw;orf;pef;png;raf;raw;rw2;rwz;sr2;srw;tif;tiff;
-ParseExtensionsEnabled=1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;
+ParseExtensions=arw;cr2;crf;crw;dng;jpg;jpeg;kdc;mef;mrw;nef;nrw;orf;pef;png;raf;raw;rw2;rwz;sr2;srw;tif;tiff;
+ParseExtensionsEnabled=1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;
 
 [Output]
 PathTemplate=%p1/converted/%f
diff --git a/rtdata/options/options.osx b/rtdata/options/options.osx
index 3553b0baa..f40e1685e 100644
--- a/rtdata/options/options.osx
+++ b/rtdata/options/options.osx
@@ -12,8 +12,8 @@ MultiUser=true
 
 [File Browser]
 # Image filename extensions to be looked for, and their corresponding search state (0/1 -> skip/include)
-ParseExtensions=arw;cr2;crf;crw;dng;jpg;kdc;mef;mrw;nef;nrw;orf;pef;png;raf;raw;rw2;rwz;sr2;srw;tif;tiff;
-ParseExtensionsEnabled=1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;
+ParseExtensions=arw;cr2;crf;crw;dng;jpg;jpeg;kdc;mef;mrw;nef;nrw;orf;pef;png;raf;raw;rw2;rwz;sr2;srw;tif;tiff;
+ParseExtensionsEnabled=1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;
 
 [Output]
 PathTemplate=%p1/converted/%f
diff --git a/rtdata/options/options.win b/rtdata/options/options.win
index 0b72287c6..ec72b661b 100644
--- a/rtdata/options/options.win
+++ b/rtdata/options/options.win
@@ -14,8 +14,8 @@ UseSystemTheme=false
 
 [File Browser]
 # Image filename extensions to be looked for, and their corresponding search state (0/1 -> skip/include)
-ParseExtensions=arw;cr2;crf;crw;dng;jpg;kdc;mef;mrw;nef;nrw;orf;pef;png;raf;raw;rw2;rwz;sr2;srw;tif;tiff;
-ParseExtensionsEnabled=1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;
+ParseExtensions=arw;cr2;crf;crw;dng;jpg;jpeg;kdc;mef;mrw;nef;nrw;orf;pef;png;raf;raw;rw2;rwz;sr2;srw;tif;tiff;
+ParseExtensionsEnabled=1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;1;
 
 [Output]
 PathTemplate=%p1/converted/%f
diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc
index 4a41209cc..585009c6a 100644
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -57,7 +57,7 @@ ImageData::ImageData (Glib::ustring fname, RawMetaDataLocation* ri) {
             extractInfo ();
         }
     }    
-    else if (dotpos<fname.size()-3 && !fname.casefold().compare (dotpos, 4, ".jpg")) {
+    else if ((dotpos<fname.size()-3 && !fname.casefold().compare (dotpos, 4, ".jpg")) || (dotpos<fname.size()-4 && !fname.casefold().compare (dotpos, 5, ".jpeg"))) {
         FILE* f = safe_g_fopen (fname, "rb");
         if (f) {
             root = rtexif::ExifManager::parseJPEG (f);
diff --git a/rtengine/imageio.cc b/rtengine/imageio.cc
index 47e014b2c..c9f216174 100644
--- a/rtengine/imageio.cc
+++ b/rtengine/imageio.cc
@@ -911,9 +911,11 @@ int ImageIO::load (Glib::ustring fname) {
     return IMIO_FILETYPENOTSUPPORTED;
   if (!fname.casefold().compare (lastdot, 4, ".png"))
     return loadPNG (fname);
-  else if (!fname.casefold().compare (lastdot, 4, ".jpg"))
+  else if (!fname.casefold().compare (lastdot, 4, ".jpg") ||
+           !fname.casefold().compare (lastdot, 5, ".jpeg"))
     return loadJPEG (fname);
-  else if (!fname.casefold().compare (lastdot, 4, ".tif"))
+  else if (!fname.casefold().compare (lastdot, 4, ".tif") ||
+           !fname.casefold().compare (lastdot, 5, ".tiff"))
     return loadTIFF (fname);
   else return IMIO_FILETYPENOTSUPPORTED;
 }
@@ -925,9 +927,11 @@ int ImageIO::save (Glib::ustring fname) {
     return IMIO_FILETYPENOTSUPPORTED;
   if (!fname.casefold().compare (lastdot, 4, ".png"))
     return savePNG (fname);
-  else if (!fname.casefold().compare (lastdot, 4, ".jpg"))
+  else if (!fname.casefold().compare (lastdot, 4, ".jpg") ||
+           !fname.casefold().compare (lastdot, 5, ".jpeg"))
     return saveJPEG (fname);
-  else if (!fname.casefold().compare (lastdot, 4, ".tif"))
+  else if (!fname.casefold().compare (lastdot, 4, ".tif") ||
+           !fname.casefold().compare (lastdot, 5, ".tiff"))
     return saveTIFF (fname);
   else return IMIO_FILETYPENOTSUPPORTED;
 }
diff --git a/rtgui/thumbnail.cc b/rtgui/thumbnail.cc
index 81518cc3b..517d44dc4 100644
--- a/rtgui/thumbnail.cc
+++ b/rtgui/thumbnail.cc
@@ -95,7 +95,7 @@ void Thumbnail::_generateThumbnailImage () {
 	cfs.exifValid = false;
 	cfs.timeValid = false;
 
-	if (ext.lowercase()=="jpg") {
+	if (ext.lowercase()=="jpg" || ext.lowercase()=="jpeg") {
 			tpp = rtengine::Thumbnail::loadFromImage (fname, tw, th, 1, infoFromImage (fname));
 			if (tpp)
 					cfs.format = FT_Jpeg;