--- oiio-Release-2.0.13/src/raw.imageio/rawinput.cpp 2019-12-03 23:28:14.000000000 +0100
+++ oiio-Release-2.0.13-fix/src/raw.imageio/rawinput.cpp 2020-12-20 23:29:30.556780764 +0100
@@ -643,7 +643,7 @@
#if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 17, 0)
if (other.parsed_gps.gpsparsed) {
add("GPS", "Latitude", other.parsed_gps.latitude, false, 0.0f);
- add("GPS", "Longitude", other.parsed_gps.longtitude, false,
+ add("GPS", "Longitude", other.parsed_gps.longitude, false,
0.0f); // N.B. wrong spelling!
add("GPS", "TimeStamp", other.parsed_gps.gpstimestamp, false, 0.0f);
add("GPS", "Altitude", other.parsed_gps.altitude, false, 0.0f);
@@ -667,12 +667,12 @@
// float AmbientTemperature;
// float BatteryTemperature;
// float exifAmbientTemperature;
- add("Exif", "Humidity", other.exifHumidity, false, 0.0f);
- add("Exif", "Pressure", other.exifPressure, false, 0.0f);
- add("Exif", "WaterDepth", other.exifWaterDepth, false, 0.0f);
- add("Exif", "Acceleration", other.exifAcceleration, false, 0.0f);
- add("Exif", "CameraElevactionAngle", other.exifCameraElevationAngle, false,
- 0.0f);
+ //add("Exif", "Humidity", other.exifHumidity, false, 0.0f);
+ //add("Exif", "Pressure", other.exifPressure, false, 0.0f);
+ //add("Exif", "WaterDepth", other.exifWaterDepth, false, 0.0f);
+ //add("Exif", "Acceleration", other.exifAcceleration, false, 0.0f);
+ //add("Exif", "CameraElevactionAngle", other.exifCameraElevationAngle, false,
+ // 0.0f);
// float real_ISO;
#endif
@@ -861,9 +861,9 @@
{
#if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 18, 0)
auto const& mn(m_processor->imgdata.makernotes.olympus);
- MAKERF(OlympusCropID);
- MAKERF(OlympusFrame); /* upper left XY, lower right XY */
- MAKERF(OlympusSensorCalibration);
+ //MAKERF(OlympusCropID);
+ //MAKERF(OlympusFrame); /* upper left XY, lower right XY */
+ //MAKERF(OlympusSensorCalibration);
MAKERF(FocusMode);
MAKERF(AutoFocus);
MAKERF(AFPoint);
@@ -938,12 +938,12 @@
{
#if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 18, 0)
auto const& mn(m_processor->imgdata.makernotes.fuji);
- add(m_make, "ExpoMidPointShift", mn.FujiExpoMidPointShift);
- add(m_make, "DynamicRange", mn.FujiDynamicRange);
- add(m_make, "FilmMode", mn.FujiFilmMode);
- add(m_make, "DynamicRangeSetting", mn.FujiDynamicRangeSetting);
- add(m_make, "DevelopmentDynamicRange", mn.FujiDevelopmentDynamicRange);
- add(m_make, "AutoDynamicRange", mn.FujiAutoDynamicRange);
+ add(m_make, "ExpoMidPointShift", mn.ExpoMidPointShift);
+ add(m_make, "DynamicRange", mn.DynamicRange);
+ add(m_make, "FilmMode", mn.FilmMode);
+ add(m_make, "DynamicRangeSetting", mn.DynamicRangeSetting);
+ add(m_make, "DevelopmentDynamicRange", mn.DevelopmentDynamicRange);
+ add(m_make, "AutoDynamicRange", mn.AutoDynamicRange);
MAKERF(FocusMode);
MAKERF(AFMode);
MAKERF(FocusPixel);
@@ -967,7 +967,7 @@
{
#if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 18, 0)
auto const& mn(m_processor->imgdata.makernotes.sony);
- MAKERF(SonyCameraType);
+ MAKERF(CameraType);
#endif
#if LIBRAW_VERSION >= LIBRAW_MAKE_VERSION(0, 19, 0)
// uchar Sony0x9400_version; /* 0 if not found/deciphered, 0xa, 0xb, 0xc following exiftool convention */
@@ -976,12 +976,12 @@
// uchar Sony0x9400_SequenceLength1;
// unsigned Sony0x9400_SequenceFileNumber;
// uchar Sony0x9400_SequenceLength2;
- if (mn.raw_crop.cwidth || mn.raw_crop.cheight) {
- add(m_make, "cropleft", mn.raw_crop.cleft, true);
- add(m_make, "croptop", mn.raw_crop.ctop, true);
- add(m_make, "cropwidth", mn.raw_crop.cwidth, true);
- add(m_make, "cropheight", mn.raw_crop.cheight, true);
- }
+ //if (mn.raw_crop.cwidth || mn.raw_crop.cheight) {
+ // add(m_make, "cropleft", mn.raw_crop.cleft, true);
+ // add(m_make, "croptop", mn.raw_crop.ctop, true);
+ // add(m_make, "cropwidth", mn.raw_crop.cwidth, true);
+ // add(m_make, "cropheight", mn.raw_crop.cheight, true);
+ //}
MAKERF(AFMicroAdjValue);
MAKERF(AFMicroAdjOn);
MAKER(AFMicroAdjRegisteredLenses, 0);
@@ -1054,17 +1054,17 @@
MAKER(Adapter, 0);
MAKER(AttachmentID, 0ULL);
MAKER(Attachment, 0);
- MAKER(CanonFocalUnits, 0);
+ MAKER(FocalUnits, 0);
MAKER(FocalLengthIn35mmFormat, 0.0f);
}
if (Strutil::iequals(m_make, "Nikon")) {
auto const& mn(m_processor->imgdata.lens.nikon);
- add(m_make, "EffectiveMaxAp", mn.NikonEffectiveMaxAp);
- add(m_make, "LensIDNumber", mn.NikonLensIDNumber);
- add(m_make, "LensFStops", mn.NikonLensFStops);
- add(m_make, "MCUVersion", mn.NikonMCUVersion);
- add(m_make, "LensType", mn.NikonLensType);
+ add(m_make, "EffectiveMaxAp", mn.EffectiveMaxAp);
+ add(m_make, "LensIDNumber", mn.LensIDNumber);
+ add(m_make, "LensFStops", mn.LensFStops);
+ add(m_make, "MCUVersion", mn.MCUVersion);
+ add(m_make, "LensType", mn.LensType);
}
if (Strutil::iequals(m_make, "DNG")) {
auto const& mn(m_processor->imgdata.lens.dng);
|
