Merged unstable branch to trunk.

2008-06-21 10:28:17 +00:00
parent b47b8085db
commit 0d55992e2f
92 changed files with 7209 additions and 9085 deletions
@@ -47,7 +47,7 @@ try {
    uint32_t sizeHdr;
    uint32_t sizeData;
    Exiv2::Photoshop::locateIptcIrb(irb.pData_, irb.size_, &record, &sizeHdr, &sizeData);
-    Exiv2::DataBuf rawIptc = iptcData.copy();
+    Exiv2::DataBuf rawIptc = Exiv2::IptcParser::encode(iptcData);
    std::cout << "Comparing IPTC and IRB size... ";
    if (static_cast<uint32_t>(rawIptc.size_) != sizeData) {
        std::cout << "not ";