Fiji midpoint: avoid ambiguity

LibRaw · Jan 22, 2017 · b622cdd · b622cdd
1 parent 8d50ba1
commit b622cdd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/dcraw/dcraw.c b/dcraw/dcraw.c
@@ -13265,8 +13265,11 @@ void CLASS parse_fuji (int offset)
 
 // IB start
 #ifdef LIBRAW_LIBRARY_BUILD
-    } else if (tag == 0x9650) {
-      imgdata.makernotes.fuji.FujiExpoMidPointShift = ((short)get2()) / fMAX(1.0f,get2());
+    else if (tag == 0x9650)
+    {
+      short a = (short)get2();
+      float b =fMAX(1.0f, get2());
+      imgdata.makernotes.fuji.FujiExpoMidPointShift = a / b;
     } else if (tag == 0x2100) {
         FORC4 imgdata.color.WB_Coeffs[LIBRAW_WBI_Daylight][c ^ 1] = get2();
     } else if (tag == 0x2200) {

diff --git a/internal/dcraw_common.cpp b/internal/dcraw_common.cpp
@@ -12076,8 +12076,11 @@ void CLASS parse_fuji (int offset)
 
 // IB start
 #ifdef LIBRAW_LIBRARY_BUILD
-    } else if (tag == 0x9650) {
-      imgdata.makernotes.fuji.FujiExpoMidPointShift = ((short)get2()) / fMAX(1.0f,get2());
+    else if (tag == 0x9650)
+    {
+      short a = (short)get2();
+      float b =fMAX(1.0f, get2());
+      imgdata.makernotes.fuji.FujiExpoMidPointShift = a / b;
     } else if (tag == 0x2100) {
         FORC4 imgdata.color.WB_Coeffs[LIBRAW_WBI_Daylight][c ^ 1] = get2();
     } else if (tag == 0x2200) {