Resolve exiv2 merge conflicts and merge with

2020-10-16 11:45:26 +02:00
parent e093555c66 28f0bc14da
commit 8b4389ade9
49 changed files with 1531 additions and 17588 deletions
--- a/rtengine/dynamicprofile.cc
+++ b/rtengine/dynamicprofile.cc
@@ -86,7 +86,7 @@ bool DynamicProfileRule::matches (const rtengine::FramesMetaData *im) const
            && expcomp (im->getExpComp())
            && camera (im->getCamera())
            && lens (im->getLens())
-            && imagetype(im->getImageType(0)));
+            && imagetype(im->getImageType()));
 }

 namespace