merge with Dev..

2017-04-19 08:15:15 +02:00
parent 1d1e378858 1206c602c2
commit f69a2db812
17 changed files with 2543 additions and 2264 deletions
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -157,7 +157,8 @@ void ImageData::extractInfo ()
            "SAMSUNG",
            "Mamiya",
            "MOTOROLA",
-            "Leaf"
+            "Leaf",
+            "Panasonic"
        }) {
            if (make.find(corp) != std::string::npos) { // Simplify company names
                make = corp;
@@ -482,6 +483,17 @@ void ImageData::extractInfo ()
                            lens = eq->getTag ("LensType")->valueToString ();
                        }
                    }
+                } else if (mnote && !make.compare (0, 9, "Panasonic")) {
+                    if (mnote->getTag ("LensType")) {
+                        std::string panalens = mnote->getTag("LensType")->valueToString();
+
+                        if (panalens.find("LUMIX") != Glib::ustring::npos) {
+                            lens = "Panasonic " + panalens;
+                        }
+                        else {
+                            lens = panalens;
+                        }
+                    }
                }
            } else if (exif->getTag ("DNGLensInfo")) {
                lens = exif->getTag ("DNGLensInfo")->valueToString ();