|
 |
d905ca4 |
--- digikam-5.7.0/core/libs/rawengine/libraw/internal/dcraw_common.cpp.orig 2017-09-05 09:51:22.000000000 +0100
|
|
|
d905ca4 |
+++ digikam-5.7.0/core/libs/rawengine/libraw/internal/dcraw_common.cpp 2018-01-10 02:46:30.990330876 +0000
|
|
|
d905ca4 |
@@ -5773,7 +5773,7 @@ static float my_roundf(float x) {
|
|
|
d905ca4 |
static float _CanonConvertAperture(ushort in)
|
|
|
d905ca4 |
{
|
|
|
d905ca4 |
if ((in == (ushort)0xffe0) || (in == (ushort)0x7fff)) return 0.0f;
|
|
|
d905ca4 |
- return powf64(2.0, in/64.0);
|
|
|
d905ca4 |
+ return powf64(2.0f, float(in/64.0));
|
|
|
d905ca4 |
}
|
|
|
d905ca4 |
|
|
|
d905ca4 |
static float _CanonConvertEV (short in)
|
|
|
d905ca4 |
@@ -6726,7 +6726,7 @@ void CLASS PentaxLensInfo (unsigned id,
|
|
 |
3ea1507 |
if (table_buf[iLensData+9] &&
|
|
|
3ea1507 |
(fabs(imgdata.lens.makernotes.CurFocal) < 0.1f))
|
|
|
3ea1507 |
imgdata.lens.makernotes.CurFocal =
|
|
|
3ea1507 |
- 10*(table_buf[iLensData+9]>>2) * powf64(4, (table_buf[iLensData+9] & 0x03)-2);
|
|
|
3ea1507 |
+ 10*(table_buf[iLensData+9]>>2) * powf64(4.0f, (float)((table_buf[iLensData+9] & 0x03)-2));
|
|
|
3ea1507 |
if (table_buf[iLensData+10] & 0xf0)
|
|
|
3ea1507 |
imgdata.lens.makernotes.MaxAp4CurFocal =
|
|
|
3ea1507 |
powf64(2.0f, (float)((table_buf[iLensData+10] & 0xf0) >>4)/4.0f);
|
|
|
d905ca4 |
@@ -7648,7 +7648,7 @@ void CLASS parse_makernote_0xc634(int ba
|
|
|
d905ca4 |
{
|
|
|
d905ca4 |
unsigned char cc;
|
|
|
d905ca4 |
fread(&cc, 1, 1, ifp);
|
|
|
d905ca4 |
- iso_speed = (int)(100.0 * powf64(2.0, (double)(cc) / 12.0 - 5.0));
|
|
|
d905ca4 |
+ iso_speed = (int)(100.0 * powf64(2.0f, (float)((double)(cc) / 12.0 - 5.0)));
|
|
|
d905ca4 |
break;
|
|
|
d905ca4 |
}
|
|
|
d905ca4 |
}
|
|
|
d905ca4 |
@@ -9151,15 +9151,15 @@ void CLASS parse_makernote (int base, in
|
|
|
d905ca4 |
}
|
|
|
d905ca4 |
if (tag == 4 && len > 26 && len < 35) {
|
|
|
d905ca4 |
if ((i=(get4(),get2())) != 0x7fff && (!iso_speed || iso_speed == 65535))
|
|
|
d905ca4 |
- iso_speed = 50 * powf64(2.0, i/32.0 - 4);
|
|
|
d905ca4 |
+ iso_speed = 50 * powf64(2.0f, (float)(i/32.0 - 4));
|
|
|
d905ca4 |
#ifdef LIBRAW_LIBRARY_BUILD
|
|
|
d905ca4 |
get4();
|
|
|
d905ca4 |
#else
|
|
|
d905ca4 |
if ((i=(get2(),get2())) != 0x7fff && !aperture)
|
|
|
d905ca4 |
- aperture = powf64(2.0, i/64.0);
|
|
|
d905ca4 |
+ aperture = powf64(2.0f, (float)(i/64.0));
|
|
|
d905ca4 |
#endif
|
|
|
d905ca4 |
if ((i=get2()) != 0xffff && !shutter)
|
|
|
d905ca4 |
- shutter = powf64(2.0, (short) i/-32.0);
|
|
|
d905ca4 |
+ shutter = powf64(2.0f, (short) i/-32.0);
|
|
|
d905ca4 |
wbi = (get2(),get2());
|
|
|
d905ca4 |
shot_order = (get2(),get2());
|
|
|
d905ca4 |
}
|
|
|
d905ca4 |
@@ -9768,11 +9768,11 @@ void CLASS parse_exif (int base)
|
|
|
d905ca4 |
case 36868: get_timestamp(0); break;
|
|
|
d905ca4 |
case 37377: if ((expo = -getreal(type)) < 128 && shutter == 0.)
|
|
|
d905ca4 |
tiff_ifd[tiff_nifds-1].t_shutter =
|
|
|
d905ca4 |
- shutter = powf64(2.0, expo);
|
|
|
d905ca4 |
+ shutter = powf64(2.0f, (float)expo);
|
|
|
d905ca4 |
break;
|
|
|
d905ca4 |
case 37378: // 0x9202 ApertureValue
|
|
|
d905ca4 |
if ((fabs(ape = getreal(type))<256.0) && (!aperture))
|
|
|
d905ca4 |
- aperture = powf64(2.0, ape/2);
|
|
|
d905ca4 |
+ aperture = powf64(2.0f, (float)ape/2);
|
|
|
d905ca4 |
break;
|
|
|
d905ca4 |
case 37385: flash_used = getreal(type); break;
|
|
|
d905ca4 |
case 37386: focal_len = getreal(type); break;
|
|
|
d905ca4 |
@@ -11716,9 +11716,9 @@ void CLASS parse_ciff (int offset, int l
|
|
|
d905ca4 |
aperture = _CanonConvertAperture((get2(),get2()));
|
|
|
d905ca4 |
imgdata.lens.makernotes.CurAp = aperture;
|
|
|
d905ca4 |
#else
|
|
|
d905ca4 |
- aperture = powf64(2.0, (get2(),(short)get2())/64.0);
|
|
|
d905ca4 |
+ aperture = powf64(2.0f, (get2(),(short)get2())/64.0);
|
|
|
d905ca4 |
#endif
|
|
|
d905ca4 |
- shutter = powf64(2.0,-((short)get2())/32.0);
|
|
|
d905ca4 |
+ shutter = powf64(2.0f,(float)(-((short)get2())/32.0));
|
|
|
d905ca4 |
wbi = (get2(),get2());
|
|
|
d905ca4 |
if (wbi > 17) wbi = 0;
|
|
|
d905ca4 |
fseek (ifp, 32, SEEK_CUR);
|