Merge pull request #1144 from Exiv2/fix_1045_0.27

fix_1045_0.27

src/error.cpp

@@ -154,12 +154,10 @@ namespace {
           N_("%1 has invalid XMP value type `%2'") }, // %1=key, %2=value type
         { Exiv2::kerInvalidIccProfile,
           N_("Not a valid ICC Profile") },
-        { Exiv2::kerInvalidXMP,
-          N_("Not valid XMP") },
         { Exiv2::kerTiffDirectoryTooLarge,
           N_("tiff directory length is too large") },
         { Exiv2::kerInvalidTypeValue,
-          N_("invalid type value detected in Image::printIFDStructure") },
+          N_("invalid type in tiff structure") },
         { Exiv2::kerInvalidMalloc,
           N_("invalid memory allocation request") },
         { Exiv2::kerCorruptedMetadata,

src/image.cpp

@@ -376,7 +376,7 @@ namespace Exiv2 {
 
                 // Break for unknown tag types else we may segfault.
                 if ( !typeValid(type) ) {
-                    std::cerr << "invalid type value detected in Image::printIFDStructure:  " << type << std::endl;
+                    std::cerr << "invalid type in tiff structure" << type << std::endl;
                     start = 0; // break from do loop
                     throw Error(kerInvalidTypeValue);
                 }

tests/suite.conf

@@ -24,7 +24,7 @@ kerOffsetOutOfRange: Offset out of range
 kerFailedToReadImageData: Failed to read image data
 kerCorruptedMetadata: corrupted image metadata
 kerInvalidMalloc: invalid memory allocation request
-kerInvalidTypeValue: invalid type value detected in Image::printIFDStructure
+kerInvalidTypeValue: invalid type in tiff structure
 kerNotAJpeg : This does not look like a JPEG image
 kerNoImageInInputData: Input data does not contain a valid image
 addition_overflow_message: Overflow in addition