liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3436 from Beep6581/fix-canon-exif

Browse Source 
Fix Canon EXIF
This commit is contained in:
Floessie 2016-09-24 22:05:48 +02:00 committed by GitHub
commit 24e80cf8ee
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtexif/canonattribs.cc
View File

@ -1846,8 +1846,8 @@ const TagAttrib canonShotInfoAttribs[] = {
{0, AC_WRITE, 0, 0, 18, AUTO, "ControlMode", &caControModeInterpreter}, {0, AC_WRITE, 0, 0, 18, AUTO, "ControlMode", &caControModeInterpreter},
{0, AC_WRITE, 0, 0, 21, AUTO, "FNumber" , &caApertureInterpreter}, {0, AC_WRITE, 0, 0, 21, AUTO, "FNumber" , &caApertureInterpreter},
{0, AC_WRITE, 0, 0, 22, AUTO, "ExposureTime", &caExposureTimeInterpreter}, {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, "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, 26, AUTO, "CameraType", &caCameraTypeInterpreter},
{0, AC_WRITE, 0, 0, 27, AUTO, "AutoRotate", &caAutoRotateInterpreter}, {0, AC_WRITE, 0, 0, 27, AUTO, "AutoRotate", &caAutoRotateInterpreter},
{0, AC_WRITE, 0, 0, 28, AUTO, "NDFilter", &caOnOffInterpreter}, {0, AC_WRITE, 0, 0, 28, AUTO, "NDFilter", &caOnOffInterpreter},

4
rtexif/rtexif.cc
View File

@ -1553,11 +1553,11 @@ void Tag::toString (char* buffer, int ofs)
break; break;
case SLONG: case SLONG:
sprintf (b, "%ld", (long)toInt(4 * i + ofs)); sprintf (b, "%d", toInt(4 * i + ofs));
break; break;
case LONG: case LONG:
sprintf (b, "%lu", (unsigned long)toInt(4 * i + ofs)); sprintf (b, "%u", toInt(4 * i + ofs));
break; break;
case SRATIONAL: case SRATIONAL: