[Hugin-cvs] /hgrepo/h/hu/hugin/hugin: Better calculation of ev when f-stop i...

[<hug...@li...>]

branch:    
details:   http://hugin.hg.sourceforge.net/hgweb/hugin/hugin/hgrepo/h/hu/hugin/hugin/rev/6004e787cf94
changeset: 4921:6004e787cf94
user:      tmodes
date:       Mon Jan 31 20:27:30 2011 +0100
description:
Better calculation of ev when f-stop is missing [710392]

diffstat:

 src/hugin_base/panodata/SrcPanoImage.cpp |  11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diffs (28 lines):

diff -r 758f521f02e6 -r 6004e787cf94 src/hugin_base/panodata/SrcPanoImage.cpp
--- a/src/hugin_base/panodata/SrcPanoImage.cpp	Mon Jan 31 07:39:06 2011 -0500
+++ b/src/hugin_base/panodata/SrcPanoImage.cpp	Mon Jan 31 20:27:30 2011 +0100
@@ -366,7 +366,15 @@
     // TODO: reconstruct real exposure value from "rounded" ones saved by the cameras?
 
     getExiv2Value(exifData,"Exif.Photo.FNumber",photoFNumber);
-
+    
+    //remember aperture for later
+    setExifAperture(photoFNumber);
+    //if no F-number was found in EXIF data assume a f stop of 3.5 to get
+    //a reasonable ev value if shutter time, e. g. for manual lenses is found
+    if(photoFNumber==0)
+    {
+        photoFNumber=3.5;
+    };
     if (exposureTime > 0 && photoFNumber > 0) {
         double gain = 1;
         if (getExiv2Value(exifData,"Exif.Photo.ISOSpeedRatings",isoSpeed)) {
@@ -589,7 +597,6 @@
     setExifFocalLength(focalLength);
     setExifFocalLength35(eFocalLength35);
     setExifOrientation(roll);
-    setExifAperture(photoFNumber);
     setExifISO(isoSpeed);
     setExifDistance(subjectDistance);
     setExifDate(captureDate);