Appended one more Id to an Ifd id to work around a g++-3.4

v0.27.3
Andreas Huggel 21 years ago
parent 1415a69561
commit 54e126d3e4

@ -20,14 +20,14 @@
*/ */
/* /*
File: exif.cpp File: exif.cpp
Version: $Name: $ $Revision: 1.56 $ Version: $Name: $ $Revision: 1.57 $
Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net> Author(s): Andreas Huggel (ahu) <ahuggel@gmx.net>
History: 26-Jan-04, ahu: created History: 26-Jan-04, ahu: created
11-Feb-04, ahu: isolated as a component 11-Feb-04, ahu: isolated as a component
*/ */
// ***************************************************************************** // *****************************************************************************
#include "rcsid.hpp" #include "rcsid.hpp"
EXIV2_RCSID("@(#) $Name: $ $Revision: 1.56 $ $RCSfile: exif.cpp,v $"); EXIV2_RCSID("@(#) $Name: $ $Revision: 1.57 $ $RCSfile: exif.cpp,v $");
// Define DEBUG_MAKERNOTE to output debug information to std::cerr // Define DEBUG_MAKERNOTE to output debug information to std::cerr
#undef DEBUG_MAKERNOTE #undef DEBUG_MAKERNOTE
@ -288,7 +288,7 @@ namespace Exiv2 {
// Copy the TIFF header // Copy the TIFF header
TiffHeader tiffHeader(byteOrder); TiffHeader tiffHeader(byteOrder);
if (len < tiffHeader.size()) rc = 1; if (len < tiffHeader.size()) rc = 1;
Ifd ifd1(ifd1); Ifd ifd1(ifd1Id);
long ifdOffset = 0; long ifdOffset = 0;
if (rc == 0) { if (rc == 0) {
buflen += tiffHeader.copy(img.pData_); buflen += tiffHeader.copy(img.pData_);

Loading…
Cancel
Save