From 2e9138cf9107fb0ae3834797ea74b5934b24b2f0 Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Thu, 13 Oct 2016 11:03:39 +0000
Subject: [PATCH] #1243 Work-in-progress.  Still to add code to writeMetadata
 for icc profiles.

---
 src/image.cpp         |   1 +
 src/jp2image.cpp      | 114 +++++++++++++++++++++---------------------
 test/data/Reagan2.jp2 | Bin 0 -> 8389 bytes
 3 files changed, 59 insertions(+), 56 deletions(-)
 create mode 100644 test/data/Reagan2.jp2

diff --git a/src/image.cpp b/src/image.cpp
index 68e32789..58c06be8 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -651,6 +651,7 @@ namespace Exiv2 {
 
     std::string binaryToString(DataBuf& buf, size_t size, size_t start /*=0*/)
     {
+        if ( size > buf.size_ ) size = buf.size_;
         return binaryToString(buf.pData_,size,start);
     }
 
diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 4bd5acc0..d08d69a8 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -26,6 +26,8 @@
 #include "rcsid_int.hpp"
 EXIV2_RCSID("@(#) $Id$")
 
+// #define DEBUG
+
 // included header files
 #include "config.h"
 
@@ -50,6 +52,7 @@ const uint32_t kJp2BoxTypeJp2Header   = 0x6a703268; // 'jp2h'
 const uint32_t kJp2BoxTypeImageHeader = 0x69686472; // 'ihdr'
 const uint32_t kJp2BoxTypeColorHeader = 0x636f6c72; // 'colr'
 const uint32_t kJp2BoxTypeUuid        = 0x75756964; // 'uuid'
+const uint32_t kJp2BoxTypeClose       = 0x6a703263; // 'jp2c'
 
 // from openjpeg-2.1.2/src/lib/openjp2/jp2.h
 /*#define JPIP_JPIP 0x6a706970*/
@@ -143,13 +146,13 @@ namespace Exiv2
             if (io_->open() == 0)
             {
 #ifdef DEBUG
-                std::cerr << "Exiv2::Jp2Image:: Creating JPEG2000 image to memory\n";
+                std::cerr << "Exiv2::Jp2Image:: Creating JPEG2000 image to memory" << std::endl;
 #endif
                 IoCloser closer(*io_);
                 if (io_->write(Jp2Blank, sizeof(Jp2Blank)) != sizeof(Jp2Blank))
                 {
 #ifdef DEBUG
-                    std::cerr << "Exiv2::Jp2Image:: Failed to create JPEG2000 image on memory\n";
+                    std::cerr << "Exiv2::Jp2Image:: Failed to create JPEG2000 image on memory" << std::endl;
 #endif
                 }
             }
@@ -178,7 +181,7 @@ namespace Exiv2
     void Jp2Image::readMetadata()
     {
 #ifdef DEBUG
-        std::cerr << "Exiv2::Jp2Image::readMetadata: Reading JPEG-2000 file " << io_->path() << "\n";
+        std::cerr << "Exiv2::Jp2Image::readMetadata: Reading JPEG-2000 file " << io_->path() << std::endl;
 #endif
         if (io_->open() != 0)
         {
@@ -204,19 +207,15 @@ namespace Exiv2
             box.length = getLong((byte*)&box.length, bigEndian);
             box.type   = getLong((byte*)&box.type, bigEndian);
 #ifdef DEBUG
-            std::cout << "Exiv2::Jp2Image::readMetadata: Position: " << position << "\n";
-            std::cout << "Exiv2::Jp2Image::readMetadata: Find box type: " << toAscii(box.type)
-                      << " length: " << box.length << "\n";
+            std::cout << "Exiv2::Jp2Image::readMetadata: "
+                      << "Position: " << position
+                      << " box type: " << toAscii(box.type)
+                      << " length: " << box.length
+                      << std::endl;
 #endif
 
-            if (box.length == 0)
-            {
-#ifdef DEBUG
-                std::cout << "Exiv2::Jp2Image::readMetadata: Null Box size has been found. "
-                             "This is the last box of file.\n";
-#endif
-                return;
-            }
+            if (box.length == 0) return ;
+
             if (box.length == 1)
             {
                 // FIXME. Special case. the real box size is given in another place.
@@ -227,7 +226,7 @@ namespace Exiv2
                 case kJp2BoxTypeJp2Header:
                 {
 #ifdef DEBUG
-                    std::cout << "Exiv2::Jp2Image::readMetadata: JP2Header box found\n";
+                    std::cout << "Exiv2::Jp2Image::readMetadata: JP2Header box found" << std::endl;
 #endif
                     long restore = io_->tell();
 
@@ -236,12 +235,14 @@ namespace Exiv2
                         subBox.length = getLong((byte*)&subBox.length, bigEndian);
                         subBox.type   = getLong((byte*)&subBox.type, bigEndian);
 #ifdef DEBUG
-                        std::cout << "subBox = " << toAscii(subBox.type) << " length = " << subBox.length << std::endl;
+                        std::cout << "Exiv2::Jp2Image::readMetadata: "
+                        << "subBox = " << toAscii(subBox.type) << " length = " << subBox.length << std::endl;
 #endif
                         if(subBox.type == kJp2BoxTypeColorHeader)
                         {
 #ifdef DEBUG
-                            std::cout << "Exiv2::Jp2Image::readMetadata: Color data found\n";
+                            std::cout << "Exiv2::Jp2Image::readMetadata: "
+                                     << "Color data found" << std::endl;
 #endif
                             long pad = 3 ; // don't know why there are 3 padding bytes
                             DataBuf data(subBox.length+8);
@@ -256,8 +257,7 @@ namespace Exiv2
                                 fwrite(icc.pData_,icc.size_,1,f);
                                 fclose(f);
                             }
-                            std::cout << "Exiv2::Jp2Image::readMetadata: wrote iccProfile to " << iccPath << std::endl ;
-
+                            std::cout << "Exiv2::Jp2Image::readMetadata: wrote iccProfile " << icc.size_<< " bytes to " << iccPath << std::endl ;
 #endif
                             setIccProfile(icc);
                         }
@@ -266,9 +266,8 @@ namespace Exiv2
                         {
                             io_->read((byte*)&ihdr, sizeof(ihdr));
 #ifdef DEBUG
-                           std::cout << "Exiv2::Jp2Image::readMetadata: Ihdr data found\n";
+                            std::cout << "Exiv2::Jp2Image::readMetadata: Ihdr data found" << std::endl;
 #endif
-
                             ihdr.imageHeight            = getLong((byte*)&ihdr.imageHeight, bigEndian);
                             ihdr.imageWidth             = getLong((byte*)&ihdr.imageWidth, bigEndian);
                             ihdr.componentCount         = getShort((byte*)&ihdr.componentCount, bigEndian);
@@ -284,10 +283,11 @@ namespace Exiv2
                     }
                     break;
                 }
+
                 case kJp2BoxTypeUuid:
                 {
 #ifdef DEBUG
-                    std::cout << "Exiv2::Jp2Image::readMetadata: UUID box found\n";
+                    std::cout << "Exiv2::Jp2Image::readMetadata: UUID box found" << std::endl;
 #endif
 
                     if (io_->read((byte*)&uuid, sizeof(uuid)) == sizeof(uuid))
@@ -301,7 +301,7 @@ namespace Exiv2
                         if(bIsExif)
                         {
 #ifdef DEBUG
-                           std::cout << "Exiv2::Jp2Image::readMetadata: Exif data found\n";
+                           std::cout << "Exiv2::Jp2Image::readMetadata: Exif data found" << std::endl ;
 #endif
                             rawData.alloc(box.length - (sizeof(box) + sizeof(uuid)));
                             bufRead = io_->read(rawData.pData_, rawData.size_);
@@ -342,7 +342,7 @@ namespace Exiv2
                             else
                             {
 #ifndef SUPPRESS_WARNINGS
-                                EXV_WARNING << "Failed to decode Exif metadata.\n";
+                                EXV_WARNING << "Failed to decode Exif metadata." << std::endl;
 #endif
                                 exifData_.clear();
                             }
@@ -351,7 +351,7 @@ namespace Exiv2
                         if(bIsIPTC)
                         {
 #ifdef DEBUG
-                           std::cout << "Exiv2::Jp2Image::readMetadata: Iptc data found\n";
+                           std::cout << "Exiv2::Jp2Image::readMetadata: Iptc data found" << std::endl;
 #endif
                             rawData.alloc(box.length - (sizeof(box) + sizeof(uuid)));
                             bufRead = io_->read(rawData.pData_, rawData.size_);
@@ -361,7 +361,7 @@ namespace Exiv2
                             if (IptcParser::decode(iptcData_, rawData.pData_, rawData.size_))
                             {
 #ifndef SUPPRESS_WARNINGS
-                                EXV_WARNING << "Failed to decode IPTC metadata.\n";
+                                EXV_WARNING << "Failed to decode IPTC metadata." << std::endl;
 #endif
                                 iptcData_.clear();
                             }
@@ -370,7 +370,7 @@ namespace Exiv2
                         if(bIsXMP)
                         {
 #ifdef DEBUG
-                           std::cout << "Exiv2::Jp2Image::readMetadata: Xmp data found\n";
+                           std::cout << "Exiv2::Jp2Image::readMetadata: Xmp data found" << std::endl;
 #endif
                             rawData.alloc(box.length - (uint32_t)(sizeof(box) + sizeof(uuid)));
                             bufRead = io_->read(rawData.pData_, rawData.size_);
@@ -383,7 +383,7 @@ namespace Exiv2
                             {
 #ifndef SUPPRESS_WARNINGS
                                 EXV_WARNING << "Removing " << static_cast<uint32_t>(idx)
-                                            << " characters from the beginning of the XMP packet\n";
+                                            << " characters from the beginning of the XMP packet" << std::endl;
 #endif
                                 xmpPacket_ = xmpPacket_.substr(idx);
                             }
@@ -391,7 +391,7 @@ namespace Exiv2
                             if (xmpPacket_.size() > 0 && XmpParser::decode(xmpData_, xmpPacket_))
                             {
 #ifndef SUPPRESS_WARNINGS
-                                EXV_WARNING << "Failed to decode XMP metadata.\n";
+                                EXV_WARNING << "Failed to decode XMP metadata." << std::endl;
 #endif
                             }
                         }
@@ -407,7 +407,7 @@ namespace Exiv2
 
             // Move to the next box.
             io_->seek(static_cast<long>(position - sizeof(box) + box.length), BasicIo::beg);
-            if (io_->error()/* || io_->eof()*/) throw Error(14);
+            if (io_->error()) throw Error(14);
         }
 
     } // Jp2Image::readMetadata
@@ -475,22 +475,24 @@ namespace Exiv2
                     bLF = true ;
                 }
 
-                if (box.length) switch(box.type)
+                if (box.length && box.type != kJp2BoxTypeClose) switch(box.type)
                 {
                     case kJp2BoxTypeJp2Header:
                     {
                         long restore = io_->tell();
                         lf(out,bLF);
 
-                        while (io_->read((byte*)&subBox, sizeof(subBox)) == sizeof(subBox) && subBox.length )
+                        while (io_->read((byte*)&subBox, sizeof(subBox)) == sizeof(subBox))
                         {
                             subBox.length = getLong((byte*)&subBox.length, bigEndian);
                             subBox.type   = getLong((byte*)&subBox.type, bigEndian);
 
-                            DataBuf data(subBox.length+8);
+                            if (subBox.type == kJp2BoxTypeClose || subBox.length < sizeof(box)) break;
+
+                            DataBuf data(subBox.length-sizeof(box));
                             io_->read(data.pData_,data.size_);
                             if ( bPrint ) out << Internal::stringFormat("%8ld | %8ld |  sub:",restore,subBox.length) << toAscii(subBox.type)
-                                              <<" | " << Internal::binaryToString(data.pData_,data.size_< 40 ? data.size_:40,sizeof(uuid)) << std::endl;
+                                <<" | " << Internal::binaryToString(data,40,0) << std::endl;
 
                             if(subBox.type == kJp2BoxTypeColorHeader)
                             {
@@ -525,19 +527,19 @@ namespace Exiv2
                             }
 
                             DataBuf rawData;
-                                    rawData.alloc(box.length-sizeof(uuid)-sizeof(box));
+                            rawData.alloc(box.length-sizeof(uuid)-sizeof(box));
                             long    bufRead = io_->read(rawData.pData_, rawData.size_);
                             if (io_->error()) throw Error(14);
                             if (bufRead != rawData.size_) throw Error(20);
 
-                            if ( bPrint )out << Internal::binaryToString(rawData.pData_,rawData.size_< 40 ? rawData.size_:40,0);
+                            if ( bPrint )out << Internal::binaryToString(rawData,40,0);
                             lf(out,bLF);
 
                             if(bIsExif && bRecursive && rawData.size_ > 0)
                             {
                                 if ( (rawData.pData_[0]      == rawData.pData_[1])
-                                &&   (rawData.pData_[0]=='I' || rawData.pData_[0]=='M' )
-                                ) {
+                                    &&   (rawData.pData_[0]=='I' || rawData.pData_[0]=='M' )
+                                    ) {
                                     BasicIo::AutoPtr p = BasicIo::AutoPtr(new MemIo(rawData.pData_,rawData.size_));
                                     TiffImage::printTiffStructure(*p,out,option,depth);
                                 }
@@ -593,8 +595,8 @@ namespace Exiv2
         if (!outIo.isopen()) throw Error(21);
 
 #ifdef DEBUG
-        std::cout << "Exiv2::Jp2Image::doWriteMetadata: Writing JPEG-2000 file " << io_->path() << "\n";
-        std::cout << "Exiv2::Jp2Image::doWriteMetadata: tmp file created " << outIo.path() << "\n";
+        std::cout << "Exiv2::Jp2Image::doWriteMetadata: Writing JPEG-2000 file " << io_->path() << std::endl;
+        std::cout << "Exiv2::Jp2Image::doWriteMetadata: tmp file created " << outIo.path() << std::endl;
 #endif
 
         // Ensure that this is the correct image type
@@ -619,7 +621,7 @@ namespace Exiv2
         while(io_->tell() < io_->size())
         {
 #ifdef DEBUG
-            std::cout << "Exiv2::Jp2Image::doWriteMetadata: Position: " << io_->tell() << " / " << io_->size() << "\n";
+            std::cout << "Exiv2::Jp2Image::doWriteMetadata: Position: " << io_->tell() << " / " << io_->size() << std::endl;
 #endif
 
             // Read chunk header.
@@ -636,14 +638,14 @@ namespace Exiv2
 
 #ifdef DEBUG
             std::cout << "Exiv2::Jp2Image::doWriteMetadata: Find box type: " << bheaderBuf.pData_ + 4
-                      << " length: " << box.length << "\n";
+                      << " length: " << box.length << std::endl;
 #endif
 
             if (box.length == 0)
             {
 #ifdef DEBUG
                 std::cout << "Exiv2::Jp2Image::doWriteMetadata: Null Box size has been found. "
-                             "This is the last box of file.\n";
+                             "This is the last box of file." << std::endl;
 #endif
                 box.length = io_->size() - io_->tell() + 8;
             }
@@ -660,7 +662,7 @@ namespace Exiv2
             if (io_->error())
             {
 #ifdef DEBUG
-                std::cout << "Exiv2::Jp2Image::doWriteMetadata: Error reading source file\n";
+                std::cout << "Exiv2::Jp2Image::doWriteMetadata: Error reading source file" << std::endl;
 #endif
 
                 throw Error(14);
@@ -669,7 +671,7 @@ namespace Exiv2
             if (bufRead != (long)(box.length - 8))
             {
 #ifdef DEBUG
-                std::cout << "Exiv2::Jp2Image::doWriteMetadata: Cannot read source file data\n";
+                std::cout << "Exiv2::Jp2Image::doWriteMetadata: Cannot read source file data" << std::endl;
 #endif
                 throw Error(20);
             }
@@ -680,7 +682,7 @@ namespace Exiv2
                 {
 
 #ifdef DEBUG
-                    std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write JP2Header box (length: " << box.length << ")\n";
+                    std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write JP2Header box (length: " << box.length << ")" << std::endl;
 #endif
                     if (outIo.write(boxBuf.pData_, boxBuf.size_) != boxBuf.size_) throw Error(21);
 
@@ -707,7 +709,7 @@ namespace Exiv2
 
 #ifdef DEBUG
                             std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write box with Exif metadata (length: "
-                                      << boxData.size_ << ")\n";
+                                      << boxData.size_ << std::endl;
 #endif
                             if (outIo.write(boxData.pData_, boxData.size_) != boxData.size_) throw Error(21);
                         }
@@ -730,7 +732,7 @@ namespace Exiv2
 
 #ifdef DEBUG
                             std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write box with Iptc metadata (length: "
-                                      << boxData.size_ << ")\n";
+                                      << boxData.size_ << std::endl;
 #endif
                             if (outIo.write(boxData.pData_, boxData.size_) != boxData.size_) throw Error(21);
                         }
@@ -741,7 +743,7 @@ namespace Exiv2
                         if (XmpParser::encode(xmpPacket_, xmpData_) > 1)
                         {
 #ifndef SUPPRESS_WARNINGS
-                            EXV_ERROR << "Failed to encode XMP metadata.\n";
+                            EXV_ERROR << "Failed to encode XMP metadata." << std::endl;
 #endif
                         }
                     }
@@ -760,7 +762,7 @@ namespace Exiv2
 
 #ifdef DEBUG
                         std::cout << "Exiv2::Jp2Image::doWriteMetadata: Write box with XMP metadata (length: "
-                                  << boxData.size_ << ")\n";
+                                  << boxData.size_ << ")" << std::endl;
 #endif
                         if (outIo.write(boxData.pData_, boxData.size_) != boxData.size_) throw Error(21);
                     }
@@ -773,25 +775,25 @@ namespace Exiv2
                     if(memcmp(boxBuf.pData_ + 8, kJp2UuidExif, 16) == 0)
                     {
 #ifdef DEBUG
-                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: strip Exif Uuid box\n";
+                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: strip Exif Uuid box" << std::endl;
 #endif
                     }
                     else if(memcmp(boxBuf.pData_ + 8, kJp2UuidIptc, 16) == 0)
                     {
 #ifdef DEBUG
-                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: strip Iptc Uuid box\n";
+                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: strip Iptc Uuid box" << std::endl;
 #endif
                     }
                     else if(memcmp(boxBuf.pData_ + 8, kJp2UuidXmp,  16) == 0)
                     {
 #ifdef DEBUG
-                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: strip Xmp Uuid box\n";
+                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: strip Xmp Uuid box" << std::endl;
 #endif
                     }
                     else
                     {
 #ifdef DEBUG
-                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: write Uuid box (length: " << box.length << ")\n";
+                        std::cout << "Exiv2::Jp2Image::doWriteMetadata: write Uuid box (length: " << box.length << ")" << std::endl;
 #endif
                         if (outIo.write(boxBuf.pData_, boxBuf.size_) != boxBuf.size_) throw Error(21);
                     }
@@ -801,7 +803,7 @@ namespace Exiv2
                 default:
                 {
 #ifdef DEBUG
-                    std::cout << "Exiv2::Jp2Image::doWriteMetadata: write box (length: " << box.length << ")\n";
+                    std::cout << "Exiv2::Jp2Image::doWriteMetadata: write box (length: " << box.length << ")" << std::endl;
 #endif
                     if (outIo.write(boxBuf.pData_, boxBuf.size_) != boxBuf.size_) throw Error(21);
 
@@ -811,7 +813,7 @@ namespace Exiv2
         }
 
 #ifdef DEBUG
-        std::cout << "Exiv2::Jp2Image::doWriteMetadata: EOF\n";
+        std::cout << "Exiv2::Jp2Image::doWriteMetadata: EOF" << std::endl;
 #endif
 
     } // Jp2Image::doWriteMetadata
diff --git a/test/data/Reagan2.jp2 b/test/data/Reagan2.jp2
new file mode 100644
index 0000000000000000000000000000000000000000..fa25ec449b5c5d2efa96dc794b7c8b4fd3466c94
GIT binary patch
literal 8389
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

literal 0
HcmV?d00001