From 540e95a0634f646c8d8110de56724a3cde8eb363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B6ssie?= Date: Wed, 21 Sep 2016 21:16:24 +0200 Subject: [PATCH 1/2] Fix "MeasuredEV2" (#3422) Kudos to @cm7695! --- rtexif/canonattribs.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rtexif/canonattribs.cc b/rtexif/canonattribs.cc index 692133a4b..bd14c6514 100644 --- a/rtexif/canonattribs.cc +++ b/rtexif/canonattribs.cc @@ -1846,8 +1846,8 @@ const TagAttrib canonShotInfoAttribs[] = { {0, AC_WRITE, 0, 0, 18, AUTO, "ControlMode", &caControModeInterpreter}, {0, AC_WRITE, 0, 0, 21, AUTO, "FNumber" , &caApertureInterpreter}, {0, AC_WRITE, 0, 0, 22, AUTO, "ExposureTime", &caExposureTimeInterpreter}, + {0, AC_WRITE, 0, 0, 23, AUTO, "MeasuredEV2", &caMeasuredEVInterpreter}, {0, AC_WRITE, 0, 0, 24, AUTO, "BulbDuration", &stdInterpreter}, - {0, AC_WRITE, 0, 0, 24, AUTO, "MeasuredEV2", &caMeasuredEVInterpreter}, {0, AC_WRITE, 0, 0, 26, AUTO, "CameraType", &caCameraTypeInterpreter}, {0, AC_WRITE, 0, 0, 27, AUTO, "AutoRotate", &caAutoRotateInterpreter}, {0, AC_WRITE, 0, 0, 28, AUTO, "NDFilter", &caOnOffInterpreter}, From b32ace88a99800605bcf35da0e2874810447baef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fl=C3=B6ssie?= Date: Thu, 22 Sep 2016 22:00:05 +0200 Subject: [PATCH 2/2] Fix `Tag::toString()` for `LONG` type (#3422) --- rtexif/rtexif.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rtexif/rtexif.cc b/rtexif/rtexif.cc index dd49ab23d..91f52ce55 100644 --- a/rtexif/rtexif.cc +++ b/rtexif/rtexif.cc @@ -1553,11 +1553,11 @@ void Tag::toString (char* buffer, int ofs) break; case SLONG: - sprintf (b, "%ld", (long)toInt(4 * i + ofs)); + sprintf (b, "%d", toInt(4 * i + ofs)); break; case LONG: - sprintf (b, "%lu", (unsigned long)toInt(4 * i + ofs)); + sprintf (b, "%u", toInt(4 * i + ofs)); break; case SRATIONAL: