Merge branch 'master' of https://github.com/Kalpanika/x3f_wrapper

Kalpanika · Jun 23, 2017 · 736b142 · 736b142
2 parents 0baf660 + 60244d6
commit 736b142
Show file tree

Hide file tree

Showing 17 changed files with 4 additions and 4 deletions.
diff --git a/cprocessingthread.cpp b/cprocessingthread.cpp
@@ -182,20 +182,20 @@ QString CProcessingThread::runExifTool_GetFFParam(const QString& exiftools,
     QString aperture;
     int index;
     if (( index = exiftool_output.indexOf("Aperture                        : ")) < 0) {
-        emit error_message("Warning","No aperture EXIF data found!");
+        emit error_message("Warning", "No aperture EXIF data found!");
         return output_string;
     }
     index += 34;  //34 seems like a bit of a magic number; could the string instead be split?
-    while (exiftool_output.at(index) != '\n')
+    while ((exiftool_output.at(index) != '\n') && (exiftool_output.at(index) != '\r')) //windows line endings too...
         aperture += exiftool_output.at(index++);
 
     QString lens_id;
     if (( index = exiftool_output.indexOf("Lens ID                         : ")) < 0) {
-        emit error_message("Warning","No lens ID EXIF data found!");
+        emit error_message("Warning", "No lens ID EXIF data found!");
         return output_string;
     }
     index += 34;
-    while (exiftool_output.at(index) != '\n')
+    while ((exiftool_output.at(index) != '\n') && (exiftool_output.at(index) != '\r'))
         lens_id += exiftool_output.at(index++);
     lens_id.replace(' ','_');
     lens_id.replace('|','_');  // for Sigma Art Lenses, there sometimes is an '|' in the name --> invalid in a file name on most OSs

diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_10.0 b/opcodes/DP3M_FF_DNG_Opcodelist3_10.0
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_11.0 b/opcodes/DP3M_FF_DNG_Opcodelist3_11.0
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_13.0 b/opcodes/DP3M_FF_DNG_Opcodelist3_13.0
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_14.0 b/opcodes/DP3M_FF_DNG_Opcodelist3_14.0
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_16.0 b/opcodes/DP3M_FF_DNG_Opcodelist3_16.0
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_2.8 b/opcodes/DP3M_FF_DNG_Opcodelist3_2.8
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_3.2 b/opcodes/DP3M_FF_DNG_Opcodelist3_3.2
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_3.5 b/opcodes/DP3M_FF_DNG_Opcodelist3_3.5
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_4.0 b/opcodes/DP3M_FF_DNG_Opcodelist3_4.0
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_4.5 b/opcodes/DP3M_FF_DNG_Opcodelist3_4.5
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_5.0 b/opcodes/DP3M_FF_DNG_Opcodelist3_5.0
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_5.6 b/opcodes/DP3M_FF_DNG_Opcodelist3_5.6
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_6.3 b/opcodes/DP3M_FF_DNG_Opcodelist3_6.3
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_7.1 b/opcodes/DP3M_FF_DNG_Opcodelist3_7.1
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_8.0 b/opcodes/DP3M_FF_DNG_Opcodelist3_8.0
diff --git a/opcodes/DP3M_FF_DNG_Opcodelist3_9.0 b/opcodes/DP3M_FF_DNG_Opcodelist3_9.0