Merge pull request #72 from Kicer86/bigtiff

Some improvements, crash fix.
v0.27.3
Robin Mills 8 years ago committed by GitHub
commit 197375dfa4

@ -155,7 +155,7 @@ namespace Exiv2
std::string mimeType() const std::string mimeType() const
{ {
return std::string();
} }
void printStructure(std::ostream& os, PrintStructureOption option, int depth) void printStructure(std::ostream& os, PrintStructureOption option, int depth)
@ -188,7 +188,7 @@ namespace Exiv2
if ( bFirst && bPrint ) if ( bFirst && bPrint )
{ {
out << Internal::indent(depth) << Internal::stringFormat("STRUCTURE OF TIFF FILE ") << io.path() << std::endl; out << Internal::indent(depth) << Internal::stringFormat("STRUCTURE OF BIGTIFF FILE ") << io.path() << std::endl;
if (tooBig) if (tooBig)
out << Internal::indent(depth) << "entries = " << entries << std::endl; out << Internal::indent(depth) << "entries = " << entries << std::endl;
} }

@ -221,6 +221,8 @@ namespace Exiv2 {
bool Image::is8ByteType(uint16_t type) bool Image::is8ByteType(uint16_t type)
{ {
return isRationalType(type) return isRationalType(type)
|| isLongLongType(type)
|| type == Exiv2::tiffIfd8
|| type == Exiv2::tiffDouble || type == Exiv2::tiffDouble
; ;
} }

Loading…
Cancel
Save