[Rawstudio-commit] r4290 - trunk/plugins/meta-tiff

[Klaus Post]

Author: post
Date: 2012-10-12 20:40:14 +0200 (Fri, 12 Oct 2012)
New Revision: 4290

Modified:
   trunk/plugins/meta-tiff/tiff-meta.c
Log:
Allow taking Panasonic paths when parsin Leica Images (for D-LUX 4 & 5)

Modified: trunk/plugins/meta-tiff/tiff-meta.c
===================================================================
--- trunk/plugins/meta-tiff/tiff-meta.c 2012-10-12 18:05:36 UTC (rev 4289)
+++ trunk/plugins/meta-tiff/tiff-meta.c 2012-10-12 18:40:14 UTC (rev 4290)
@@ -1497,8 +1497,9 @@
                                        case MAKE_SONY:
                                                makernote_sony(rawfile, 
ifd.value_offset, meta);
                                                break;
+                                       case MAKE_LEICA:
                                        case MAKE_PANASONIC:
-                                               if (raw_strcmp(rawfile, 
ifd.value_offset, "Panasonic", 9))
+                                               if (raw_strcmp(rawfile, 
ifd.value_offset, "Panasonic", 9) || raw_strcmp(rawfile, ifd.value_offset, 
"LEICA", 5))
                                                        
makernote_panasonic(rawfile, ifd.value_offset+12, meta);
                                                break;
                                        default:
@@ -1602,8 +1603,9 @@
                case MAKE_SONY:
                        makernote_sony(maker_raw, org_offset, meta);
                        break;
+               case MAKE_LEICA:
                case MAKE_PANASONIC:
-                       if (raw_strcmp(maker_raw, org_offset, "Panasonic", 9))
+                       if (raw_strcmp(maker_raw, org_offset, "Panasonic", 9) 
|| raw_strcmp(maker_raw, org_offset, "LEICA", 5))
                                makernote_panasonic(maker_raw, org_offset+12, 
meta);
                        break;
                default:
@@ -1846,7 +1848,7 @@
                        exif_reader(rawfile, offset, meta);
                if (meta->make == MAKE_KODAK && g_str_equal(meta->model_ascii, 
"DCS Pro 14N"))
                        exif_reader(rawfile, offset, meta);
-               if (meta->make == MAKE_PANASONIC)
+               if (meta->make == MAKE_PANASONIC || meta->make == MAKE_LEICA)
                        ifd_panasonic(rawfile, offset, meta);
 
                if (offset == next) break; /* avoid infinite loops */


_______________________________________________
Rawstudio-commit mailing list
Rawstudio-commit@rawstudio.org
http://rawstudio.org/cgi-bin/mailman/listinfo/rawstudio-commit