From 7abdb0b17e48ac2e3a1d05260493f1549b481580 Mon Sep 17 00:00:00 2001 From: nkbj Date: Wed, 19 Jun 2013 04:02:05 +0000 Subject: [PATCH] Fix translatable names for Exif.Canon.LensModel. --- src/canonmn.cpp | 2 +- src/tiffvisitor.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/canonmn.cpp b/src/canonmn.cpp index 278e947f..9bf50108 100644 --- a/src/canonmn.cpp +++ b/src/canonmn.cpp @@ -358,7 +358,7 @@ namespace Exiv2 { TagInfo(0x0026, "AFInfo", N_("AF Info"), N_("AF info"), canonId, makerTags, unsignedShort, -1, printValue), TagInfo(0x0083, "OriginalDecisionDataOffset", N_("Original Decision Data Offset"), N_("Original decision data offset"), canonId, makerTags, signedLong, -1, printValue), TagInfo(0x00a4, "WhiteBalanceTable", N_("White Balance Table"), N_("White balance table"), canonId, makerTags, unsignedShort, -1, printValue), - TagInfo(0x0095, "LensModel", N_("LensModel"), N_("LensModel"), canonId, makerTags, asciiString, -1, printValue), + TagInfo(0x0095, "LensModel", N_("Lens Model"), N_("Lens model"), canonId, makerTags, asciiString, -1, printValue), TagInfo(0x0096, "InternalSerialNumber", N_("Internal Serial Number"), N_("Internal serial number"), canonId, makerTags, asciiString, -1, printValue), TagInfo(0x0097, "DustRemovalData", N_("Dust Removal Data"), N_("Dust removal data"), canonId, makerTags, asciiString, -1, printValue), TagInfo(0x0099, "CustomFunctions", N_("Custom Functions"), N_("Custom functions"), canonId, makerTags, unsignedShort, -1, printValue), diff --git a/src/tiffvisitor.cpp b/src/tiffvisitor.cpp index b3e95e33..ad20b5fc 100644 --- a/src/tiffvisitor.cpp +++ b/src/tiffvisitor.cpp @@ -1533,7 +1533,7 @@ namespace Exiv2 { // Exif.Canon.LensModel allocates additional bytes in the file following the null terminator int group = object->group(); int tag = object->tag(); - bool bCanonAscii = canonId == group && tag == 149 && typeId == ttAsciiString ; + bool bCanonAscii = canonId == group && tag == 0x0095 && typeId == ttAsciiString ; v->read(pData, size, bCanonAscii ? asciiBytes : byteOrder()); object->setValue(v);