|
|
|
// ***************************************************************** -*- C++ -*-
|
|
|
|
/*
|
|
|
|
* Copyright (C) 2004-2008 Andreas Huggel <ahuggel@gmx.net>
|
|
|
|
*
|
|
|
|
* This program is part of the Exiv2 distribution.
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU General Public License
|
|
|
|
* as published by the Free Software Foundation; either version 2
|
|
|
|
* of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
|
|
|
|
*/
|
|
|
|
/*
|
|
|
|
File: pngchunk.cpp
|
|
|
|
Version: $Rev: 823 $
|
|
|
|
Author(s): Gilles Caulier (cgilles) <caulier dot gilles at gmail dot com>
|
|
|
|
History: 12-Jun-06, gc: submitted
|
|
|
|
Credits: See header file
|
|
|
|
*/
|
|
|
|
// *****************************************************************************
|
|
|
|
#include "rcsid.hpp"
|
|
|
|
EXIV2_RCSID("@(#) $Id: pngchunk.cpp 823 2006-06-23 07:35:00Z cgilles $")
|
|
|
|
|
|
|
|
// *****************************************************************************
|
|
|
|
// included header files
|
|
|
|
#ifdef _MSC_VER
|
|
|
|
# include "exv_msvc.h"
|
|
|
|
#else
|
|
|
|
# include "exv_conf.h"
|
|
|
|
#endif
|
|
|
|
|
|
|
|
//#define DEBUG 1
|
|
|
|
|
|
|
|
// some defines to make it easier
|
|
|
|
#define PNG_CHUNK_TYPE(data, index) &data[index+4]
|
|
|
|
#define PNG_CHUNK_DATA(data, index, offset) data[8+index+offset]
|
|
|
|
#define PNG_CHUNK_HEADER_SIZE 12
|
|
|
|
|
|
|
|
// To uncompress text chunck
|
|
|
|
#include <zlib.h>
|
|
|
|
|
|
|
|
#include "pngchunk.hpp"
|
|
|
|
#include "tiffparser.hpp"
|
|
|
|
#include "exif.hpp"
|
|
|
|
#include "iptc.hpp"
|
|
|
|
#include "image.hpp"
|
|
|
|
#include "error.hpp"
|
|
|
|
|
|
|
|
// + standard includes
|
|
|
|
#include <string>
|
|
|
|
#include <cstring>
|
|
|
|
#include <iostream>
|
|
|
|
#include <cassert>
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
URLs to find informations about PNG chunks :
|
|
|
|
|
|
|
|
tEXt and zTXt chuncks : http://www.vias.org/pngguide/chapter11_04.html
|
|
|
|
iTXt chunck : http://www.vias.org/pngguide/chapter11_05.html
|
|
|
|
PNG tags : http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/PNG.html#TextualData
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
// *****************************************************************************
|
|
|
|
// local declarations
|
|
|
|
namespace {
|
|
|
|
// Return the checked length of a PNG chunk
|
|
|
|
long chunkLength(const Exiv2::byte* pData, long index);
|
|
|
|
}
|
|
|
|
|
|
|
|
// *****************************************************************************
|
|
|
|
// class member definitions
|
|
|
|
namespace Exiv2 {
|
|
|
|
|
|
|
|
void PngChunk::decode(Image* pImage,
|
|
|
|
const byte* pData,
|
|
|
|
long size)
|
|
|
|
{
|
|
|
|
assert(pImage != 0);
|
|
|
|
assert(pData != 0);
|
|
|
|
|
|
|
|
// look for a tEXt chunk
|
|
|
|
long index = 8;
|
|
|
|
index += chunkLength(pData, index) + PNG_CHUNK_HEADER_SIZE;
|
|
|
|
|
|
|
|
while(index < size-PNG_CHUNK_HEADER_SIZE)
|
|
|
|
{
|
|
|
|
while (index < size-PNG_CHUNK_HEADER_SIZE &&
|
|
|
|
strncmp((char*)PNG_CHUNK_TYPE(pData, index), "tEXt", 4) &&
|
|
|
|
strncmp((char*)PNG_CHUNK_TYPE(pData, index), "zTXt", 4) &&
|
|
|
|
strncmp((char*)PNG_CHUNK_TYPE(pData, index), "iTXt", 4))
|
|
|
|
{
|
|
|
|
if (!strncmp((char*)PNG_CHUNK_TYPE(pData, index), "IEND", 4))
|
|
|
|
throw Error(14);
|
|
|
|
|
|
|
|
index += chunkLength(pData, index) + PNG_CHUNK_HEADER_SIZE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (index < size-PNG_CHUNK_HEADER_SIZE)
|
|
|
|
{
|
|
|
|
// we found a tEXt, zTXt, or iTXt field
|
|
|
|
|
|
|
|
// get the key, it's a null terminated string at the chunk start
|
|
|
|
const byte *key = &PNG_CHUNK_DATA(pData, index, 0);
|
|
|
|
|
|
|
|
int keysize=0;
|
|
|
|
for ( ; key[keysize] != 0 ; keysize++)
|
|
|
|
{
|
|
|
|
// look if we reached the end of the file (it might be corrupted)
|
|
|
|
if (8+index+keysize >= size)
|
|
|
|
throw Error(14);
|
|
|
|
}
|
|
|
|
|
|
|
|
DataBuf arr = parsePngChunk(pData, size, index, keysize);
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::decode: Found PNG chunk: "
|
|
|
|
<< std::string((const char*)key) << " :: "
|
|
|
|
<< std::string((const char*)arr.pData_, 32) << "\n";
|
|
|
|
#endif
|
|
|
|
|
|
|
|
parseChunkContent(pImage, key, arr);
|
|
|
|
|
|
|
|
index += chunkLength(pData, index) + PNG_CHUNK_HEADER_SIZE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
} // PngChunk::decode
|
|
|
|
|
|
|
|
DataBuf PngChunk::parsePngChunk(const byte* pData, long size, long& index, int keysize)
|
|
|
|
{
|
|
|
|
DataBuf arr;
|
|
|
|
|
|
|
|
if(!strncmp((char*)PNG_CHUNK_TYPE(pData, index), "zTXt", 4))
|
|
|
|
{
|
|
|
|
// Extract a deflate compressed Latin-1 text chunk
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::parsePngChunk: We found a zTXt field\n";
|
|
|
|
#endif
|
|
|
|
// we get the compression method after the key
|
|
|
|
const byte* compressionMethod = &PNG_CHUNK_DATA(pData, index, keysize+1);
|
|
|
|
if ( *compressionMethod != 0x00 )
|
|
|
|
{
|
|
|
|
// then it isn't zlib compressed and we are sunk
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::parsePngChunk: Non-standard zTXt compression method.\n";
|
|
|
|
#endif
|
|
|
|
throw Error(14);
|
|
|
|
}
|
|
|
|
|
|
|
|
// compressed string after the compression technique spec
|
|
|
|
const byte* compressedText = &PNG_CHUNK_DATA(pData, index, keysize+2);
|
|
|
|
unsigned int compressedTextSize = getLong(&pData[index], bigEndian)-keysize-2;
|
|
|
|
|
|
|
|
// security check, also considering overflow wraparound from the addition --
|
|
|
|
// we may endup with a /smaller/ index if we wrap all the way around
|
|
|
|
long firstIndex = (long)(compressedText - pData);
|
|
|
|
long onePastLastIndex = firstIndex + compressedTextSize;
|
|
|
|
if ( onePastLastIndex > size || onePastLastIndex <= firstIndex)
|
|
|
|
throw Error(14);
|
|
|
|
|
|
|
|
zlibUncompress(compressedText, compressedTextSize, arr);
|
|
|
|
}
|
|
|
|
else if (!strncmp((char*)PNG_CHUNK_TYPE(pData, index), "tEXt", 4))
|
|
|
|
{
|
|
|
|
// Extract a non-compressed Latin-1 text chunk
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::parsePngChunk: We found a tEXt field\n";
|
|
|
|
#endif
|
|
|
|
// the text comes after the key, but isn't null terminated
|
|
|
|
const byte* text = &PNG_CHUNK_DATA(pData, index, keysize+1);
|
|
|
|
long textsize = getLong(&pData[index], bigEndian)-keysize-1;
|
|
|
|
|
|
|
|
// security check, also considering overflow wraparound from the addition --
|
|
|
|
// we may endup with a /smaller/ index if we wrap all the way around
|
|
|
|
long firstIndex = (long)(text - pData);
|
|
|
|
long onePastLastIndex = firstIndex + textsize;
|
|
|
|
|
|
|
|
if ( onePastLastIndex > size || onePastLastIndex <= firstIndex)
|
|
|
|
throw Error(14);
|
|
|
|
|
|
|
|
arr.alloc(textsize);
|
|
|
|
arr = DataBuf(text, textsize);
|
|
|
|
}
|
|
|
|
else if(!strncmp((char*)PNG_CHUNK_TYPE(pData, index), "iTXt", 4))
|
|
|
|
{
|
|
|
|
// Extract a deflate compressed or uncompressed UTF-8 text chunk
|
|
|
|
|
|
|
|
// we get the compression flag after the key
|
|
|
|
const byte* compressionFlag = &PNG_CHUNK_DATA(pData, index, keysize+1);
|
|
|
|
// we get the compression method after the compression flag
|
|
|
|
const byte* compressionMethod = &PNG_CHUNK_DATA(pData, index, keysize+1);
|
|
|
|
// language description string after the compression technique spec
|
|
|
|
const byte* languageText = &PNG_CHUNK_DATA(pData, index, keysize+1);
|
|
|
|
unsigned int languageTextSize = getLong(&pData[index], bigEndian)-keysize-1;
|
|
|
|
// translated keyword string after the language description
|
|
|
|
const byte* translatedKeyText = &PNG_CHUNK_DATA(pData, index, keysize+1);
|
|
|
|
unsigned int translatedKeyTextSize = getLong(&pData[index], bigEndian)-keysize-1;
|
|
|
|
|
|
|
|
if ( *compressionFlag == 0x00 )
|
|
|
|
{
|
|
|
|
// then it's an uncompressed iTXt chunk
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::parsePngChunk: We found an uncompressed iTXt field\n";
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// the text comes after the translated keyword, but isn't null terminated
|
|
|
|
const byte* text = &PNG_CHUNK_DATA(pData, index, keysize+1);
|
|
|
|
long textsize = getLong(&pData[index], bigEndian)-keysize-1;
|
|
|
|
|
|
|
|
// security check, also considering overflow wraparound from the addition --
|
|
|
|
// we may endup with a /smaller/ index if we wrap all the way around
|
|
|
|
long firstIndex = (long)(text - pData);
|
|
|
|
long onePastLastIndex = firstIndex + textsize;
|
|
|
|
|
|
|
|
if ( onePastLastIndex > size || onePastLastIndex <= firstIndex)
|
|
|
|
throw Error(14);
|
|
|
|
|
|
|
|
arr.alloc(textsize);
|
|
|
|
arr = DataBuf(text, textsize);
|
|
|
|
}
|
|
|
|
else if ( *compressionMethod == 0x00 )
|
|
|
|
{
|
|
|
|
// then it's a zlib compressed iTXt chunk
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::parsePngChunk: We found a zlib compressed iTXt field\n";
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// the compressed text comes after the translated keyword, but isn't null terminated
|
|
|
|
const byte* compressedText = &PNG_CHUNK_DATA(pData, index, keysize+1);
|
|
|
|
long compressedTextSize = getLong(&pData[index], bigEndian)-keysize-1;
|
|
|
|
|
|
|
|
// security check, also considering overflow wraparound from the addition --
|
|
|
|
// we may endup with a /smaller/ index if we wrap all the way around
|
|
|
|
long firstIndex = (long)(compressedText - pData);
|
|
|
|
long onePastLastIndex = firstIndex + compressedTextSize;
|
|
|
|
if ( onePastLastIndex > size || onePastLastIndex <= firstIndex)
|
|
|
|
throw Error(14);
|
|
|
|
|
|
|
|
zlibUncompress(compressedText, compressedTextSize, arr);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// then it isn't zlib compressed and we are sunk
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::parsePngChunk: Non-standard iTXt compression method.\n";
|
|
|
|
#endif
|
|
|
|
throw Error(14);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::parsePngChunk: We found a field, not expected though\n";
|
|
|
|
#endif
|
|
|
|
throw Error(14);
|
|
|
|
}
|
|
|
|
|
|
|
|
return arr;
|
|
|
|
|
|
|
|
} // PngChunk::parsePngChunk
|
|
|
|
|
|
|
|
void PngChunk::parseChunkContent(Image* pImage, const byte *key, const DataBuf arr)
|
|
|
|
{
|
|
|
|
// We look if an ImageMagick EXIF raw profile exist.
|
|
|
|
|
|
|
|
if ( (memcmp("Raw profile type exif", key, 21) == 0 ||
|
|
|
|
memcmp("Raw profile type APP1", key, 21) == 0) &&
|
|
|
|
pImage->exifData().empty())
|
|
|
|
{
|
|
|
|
DataBuf exifData = readRawProfile(arr);
|
|
|
|
long length = exifData.size_;
|
|
|
|
|
|
|
|
if (length > 0)
|
|
|
|
{
|
|
|
|
// Find the position of Exif header in bytes array.
|
|
|
|
|
|
|
|
const byte exifHeader[] = { 0x45, 0x78, 0x69, 0x66, 0x00, 0x00 };
|
|
|
|
long pos = -1;
|
|
|
|
|
|
|
|
for (long i=0 ; i < length-(long)sizeof(exifHeader) ; i++)
|
|
|
|
{
|
|
|
|
if (memcmp(exifHeader, &exifData.pData_[i], sizeof(exifHeader)) == 0)
|
|
|
|
{
|
|
|
|
pos = i;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// If found it, store only these data at from this place.
|
|
|
|
|
|
|
|
if (pos !=-1)
|
|
|
|
{
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::decode: Exif header found at position " << pos << "\n";
|
|
|
|
#endif
|
|
|
|
pos = pos + sizeof(exifHeader);
|
|
|
|
TiffParser::decode(pImage, exifData.pData_ + pos, length - pos,
|
|
|
|
TiffCreator::create, TiffDecoder::findDecoder);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We look if an ImageMagick IPTC raw profile exist.
|
|
|
|
|
|
|
|
if ( memcmp("Raw profile type iptc", key, 21) == 0 &&
|
|
|
|
pImage->iptcData().empty())
|
|
|
|
{
|
|
|
|
DataBuf iptcData = readRawProfile(arr);
|
|
|
|
long length = iptcData.size_;
|
|
|
|
|
|
|
|
if (length > 0)
|
|
|
|
pImage->iptcData().load(iptcData.pData_, length);
|
|
|
|
}
|
|
|
|
|
|
|
|
// We look if an ImageMagick XMP raw profile exist.
|
|
|
|
|
|
|
|
if ( memcmp("Raw profile type xmp", key, 20) == 0 &&
|
|
|
|
pImage->xmpData().empty())
|
|
|
|
{
|
|
|
|
DataBuf xmpBuf = readRawProfile(arr);
|
|
|
|
long length = xmpBuf.size_;
|
|
|
|
|
|
|
|
if (length > 0)
|
|
|
|
{
|
|
|
|
std::string& xmpPacket = pImage->xmpPacket();
|
|
|
|
xmpPacket.assign(reinterpret_cast<char*>(xmpBuf.pData_), length);
|
|
|
|
std::string::size_type idx = xmpPacket.find_first_of('<');
|
|
|
|
if (idx != std::string::npos && idx > 0)
|
|
|
|
{
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
std::cerr << "Warning: Removing " << idx << " characters "
|
|
|
|
<< "from the beginning of the XMP packet\n";
|
|
|
|
#endif
|
|
|
|
xmpPacket = xmpPacket.substr(idx);
|
|
|
|
}
|
|
|
|
if (XmpParser::decode(pImage->xmpData(), xmpPacket))
|
|
|
|
{
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
std::cerr << "Warning: Failed to decode XMP metadata.\n";
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We look if an Adobe XMP string exist.
|
|
|
|
|
|
|
|
if ( memcmp("XML:com.adobe.xmp", key, 17) == 0 &&
|
|
|
|
pImage->xmpData().empty())
|
|
|
|
{
|
|
|
|
if (arr.size_ > 0)
|
|
|
|
{
|
|
|
|
std::string& xmpPacket = pImage->xmpPacket();
|
|
|
|
xmpPacket.assign(reinterpret_cast<char*>(arr.pData_), arr.size_);
|
|
|
|
std::string::size_type idx = xmpPacket.find_first_of('<');
|
|
|
|
if (idx != std::string::npos && idx > 0)
|
|
|
|
{
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
std::cerr << "Warning: Removing " << idx << " characters "
|
|
|
|
<< "from the beginning of the XMP packet\n";
|
|
|
|
#endif
|
|
|
|
xmpPacket = xmpPacket.substr(idx);
|
|
|
|
}
|
|
|
|
if (XmpParser::decode(pImage->xmpData(), xmpPacket))
|
|
|
|
{
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
std::cerr << "Warning: Failed to decode XMP metadata.\n";
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// We look if a comments string exist. Note than we use only 'Description' keyword which
|
|
|
|
// is dedicaced to store long comments. 'Comment' keyword is ignored.
|
|
|
|
|
|
|
|
if ( memcmp("Description", key, 11) == 0 &&
|
|
|
|
pImage->comment().empty())
|
|
|
|
{
|
|
|
|
pImage->comment().assign(reinterpret_cast<char*>(arr.pData_), arr.size_);
|
|
|
|
}
|
|
|
|
|
|
|
|
} // PngChunk::parseChunkContent
|
|
|
|
|
|
|
|
DataBuf PngChunk::readRawProfile(const DataBuf& text)
|
|
|
|
{
|
|
|
|
DataBuf info;
|
|
|
|
register long i;
|
|
|
|
register unsigned char *dp;
|
|
|
|
const char *sp;
|
|
|
|
unsigned int nibbles;
|
|
|
|
long length;
|
|
|
|
unsigned char unhex[103]={0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
|
|
|
|
0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
|
|
|
|
0,0,0,0,0,0,0,0,0,1, 2,3,4,5,6,7,8,9,0,0,
|
|
|
|
0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,
|
|
|
|
0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,10,11,12,
|
|
|
|
13,14,15};
|
|
|
|
|
|
|
|
sp = (char*)text.pData_+1;
|
|
|
|
|
|
|
|
// Look for newline
|
|
|
|
|
|
|
|
while (*sp != '\n')
|
|
|
|
sp++;
|
|
|
|
|
|
|
|
// Look for length
|
|
|
|
|
|
|
|
while (*sp == '\0' || *sp == ' ' || *sp == '\n')
|
|
|
|
sp++;
|
|
|
|
|
|
|
|
length = (long) atol(sp);
|
|
|
|
|
|
|
|
while (*sp != ' ' && *sp != '\n')
|
|
|
|
sp++;
|
|
|
|
|
|
|
|
// Allocate space
|
|
|
|
|
|
|
|
if (length == 0)
|
|
|
|
{
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::readRawProfile: Unable To Copy Raw Profile: invalid profile length\n";
|
|
|
|
#endif
|
|
|
|
return DataBuf();
|
|
|
|
}
|
|
|
|
|
|
|
|
info.alloc(length);
|
|
|
|
|
|
|
|
if (info.size_ != length)
|
|
|
|
{
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::readRawProfile: Unable To Copy Raw Profile: cannot allocate memory\n";
|
|
|
|
#endif
|
|
|
|
return DataBuf();
|
|
|
|
}
|
|
|
|
|
|
|
|
// Copy profile, skipping white space and column 1 "=" signs
|
|
|
|
|
|
|
|
dp = (unsigned char*)info.pData_;
|
|
|
|
nibbles = length * 2;
|
|
|
|
|
|
|
|
for (i = 0; i < (long) nibbles; i++)
|
|
|
|
{
|
|
|
|
while (*sp < '0' || (*sp > '9' && *sp < 'a') || *sp > 'f')
|
|
|
|
{
|
|
|
|
if (*sp == '\0')
|
|
|
|
{
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::readRawProfile: Unable To Copy Raw Profile: ran out of data\n";
|
|
|
|
#endif
|
|
|
|
return DataBuf();
|
|
|
|
}
|
|
|
|
|
|
|
|
sp++;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i%2 == 0)
|
|
|
|
*dp = (unsigned char) (16*unhex[(int) *sp++]);
|
|
|
|
else
|
|
|
|
(*dp++) += unhex[(int) *sp++];
|
|
|
|
}
|
|
|
|
|
|
|
|
return info;
|
|
|
|
|
|
|
|
} // PngChunk::readRawProfile
|
|
|
|
|
|
|
|
void PngChunk::zlibUncompress(const byte* compressedText,
|
|
|
|
unsigned int compressedTextSize,
|
|
|
|
DataBuf& arr)
|
|
|
|
{
|
|
|
|
uLongf uncompressedLen = compressedTextSize * 2; // just a starting point
|
|
|
|
int zlibResult;
|
|
|
|
|
|
|
|
do
|
|
|
|
{
|
|
|
|
arr.alloc(uncompressedLen);
|
|
|
|
zlibResult = uncompress((Bytef*)arr.pData_, &uncompressedLen,
|
|
|
|
compressedText, compressedTextSize);
|
|
|
|
|
|
|
|
if (zlibResult == Z_OK)
|
|
|
|
{
|
|
|
|
// then it is all OK
|
|
|
|
arr.alloc(uncompressedLen);
|
|
|
|
}
|
|
|
|
else if (zlibResult == Z_BUF_ERROR)
|
|
|
|
{
|
|
|
|
// the uncompressedArray needs to be larger
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::parsePngChunk: doubling size for decompression.\n";
|
|
|
|
#endif
|
|
|
|
uncompressedLen *= 2;
|
|
|
|
|
|
|
|
// DoS protection. can't be bigger than 64k
|
|
|
|
if ( uncompressedLen > 131072 )
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// something bad happened
|
|
|
|
throw Error(14);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (zlibResult == Z_BUF_ERROR);
|
|
|
|
|
|
|
|
if (zlibResult != Z_OK)
|
|
|
|
throw Error(14);
|
|
|
|
|
|
|
|
} // PngChunk::zlibUncompress
|
|
|
|
|
|
|
|
/* TODO : code backported from digiKam. Not yet adapted and used.
|
|
|
|
|
|
|
|
void PngChunk::writeRawProfile(png_struct *ping,
|
|
|
|
png_info* ping_info,
|
|
|
|
char* profile_type,
|
|
|
|
char* profile_data,
|
|
|
|
png_uint_32 length)
|
|
|
|
{
|
|
|
|
png_textp text;
|
|
|
|
|
|
|
|
register long i;
|
|
|
|
|
|
|
|
uchar *sp;
|
|
|
|
|
|
|
|
png_charp dp;
|
|
|
|
|
|
|
|
png_uint_32 allocated_length, description_length;
|
|
|
|
|
|
|
|
const uchar hex[16] = {'0','1','2','3','4','5','6','7','8','9','a','b','c','d','e','f'};
|
|
|
|
|
|
|
|
DDebug() << "Writing Raw profile: type=" << profile_type << ", length=" << length << endl;
|
|
|
|
|
|
|
|
text = (png_textp) png_malloc(ping, (png_uint_32) sizeof(png_text));
|
|
|
|
description_length = std::strlen((const char *) profile_type);
|
|
|
|
allocated_length = (png_uint_32) (length*2 + (length >> 5) + 20 + description_length);
|
|
|
|
|
|
|
|
text[0].text = (png_charp) png_malloc(ping, allocated_length);
|
|
|
|
text[0].key = (png_charp) png_malloc(ping, (png_uint_32) 80);
|
|
|
|
text[0].key[0] = '\0';
|
|
|
|
|
|
|
|
concatenateString(text[0].key, "Raw profile type ", 4096);
|
|
|
|
concatenateString(text[0].key, (const char *) profile_type, 62);
|
|
|
|
|
|
|
|
sp = (uchar*)profile_data;
|
|
|
|
dp = text[0].text;
|
|
|
|
*dp++='\n';
|
|
|
|
|
|
|
|
copyString(dp, (const char *) profile_type, allocated_length);
|
|
|
|
|
|
|
|
dp += description_length;
|
|
|
|
*dp++='\n';
|
|
|
|
|
|
|
|
formatString(dp, allocated_length-strlen(text[0].text), "%8lu ", length);
|
|
|
|
|
|
|
|
dp += 8;
|
|
|
|
|
|
|
|
for (i=0; i < (long) length; i++)
|
|
|
|
{
|
|
|
|
if (i%36 == 0)
|
|
|
|
*dp++='\n';
|
|
|
|
|
|
|
|
*(dp++)=(char) hex[((*sp >> 4) & 0x0f)];
|
|
|
|
*(dp++)=(char) hex[((*sp++ ) & 0x0f)];
|
|
|
|
}
|
|
|
|
|
|
|
|
*dp++='\n';
|
|
|
|
*dp='\0';
|
|
|
|
text[0].text_length = (png_size_t) (dp-text[0].text);
|
|
|
|
text[0].compression = -1;
|
|
|
|
|
|
|
|
if (text[0].text_length <= allocated_length)
|
|
|
|
png_set_text(ping, ping_info,text, 1);
|
|
|
|
|
|
|
|
png_free(ping, text[0].text);
|
|
|
|
png_free(ping, text[0].key);
|
|
|
|
png_free(ping, text);
|
|
|
|
|
|
|
|
} // PngChunk::writeRawProfile
|
|
|
|
|
|
|
|
size_t PngChunk::concatenateString(char* destination,
|
|
|
|
const char* source,
|
|
|
|
const size_t length)
|
|
|
|
{
|
|
|
|
register char *q;
|
|
|
|
|
|
|
|
register const char *p;
|
|
|
|
|
|
|
|
register size_t i;
|
|
|
|
|
|
|
|
size_t count;
|
|
|
|
|
|
|
|
if ( !destination || !source || length == 0 )
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
p = source;
|
|
|
|
q = destination;
|
|
|
|
i = length;
|
|
|
|
|
|
|
|
while ((i-- != 0) && (*q != '\0'))
|
|
|
|
q++;
|
|
|
|
|
|
|
|
count = (size_t) (q-destination);
|
|
|
|
i = length-count;
|
|
|
|
|
|
|
|
if (i == 0)
|
|
|
|
return(count+strlen(p));
|
|
|
|
|
|
|
|
while (*p != '\0')
|
|
|
|
{
|
|
|
|
if (i != 1)
|
|
|
|
{
|
|
|
|
*q++=(*p);
|
|
|
|
i--;
|
|
|
|
}
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
*q='\0';
|
|
|
|
|
|
|
|
return(count+(p-source));
|
|
|
|
|
|
|
|
} // PngChunk::concatenateString
|
|
|
|
|
|
|
|
size_t PngChunk::copyString(char* destination,
|
|
|
|
const char* source,
|
|
|
|
const size_t length)
|
|
|
|
{
|
|
|
|
register char *q;
|
|
|
|
|
|
|
|
register const char *p;
|
|
|
|
|
|
|
|
register size_t i;
|
|
|
|
|
|
|
|
if ( !destination || !source || length == 0 )
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
p = source;
|
|
|
|
q = destination;
|
|
|
|
i = length;
|
|
|
|
|
|
|
|
if ((i != 0) && (--i != 0))
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if ((*q++=(*p++)) == '\0')
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
while (--i != 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (i == 0)
|
|
|
|
{
|
|
|
|
if (length != 0)
|
|
|
|
*q='\0';
|
|
|
|
|
|
|
|
while (*p++ != '\0');
|
|
|
|
}
|
|
|
|
|
|
|
|
return((size_t) (p-source-1));
|
|
|
|
|
|
|
|
} // PngChunk::copyString
|
|
|
|
|
|
|
|
long PngChunk::formatString(char* string,
|
|
|
|
const size_t length,
|
|
|
|
const char* format,
|
|
|
|
...)
|
|
|
|
{
|
|
|
|
long n;
|
|
|
|
|
|
|
|
va_list operands;
|
|
|
|
|
|
|
|
va_start(operands,format);
|
|
|
|
n = (long) formatStringList(string, length, format, operands);
|
|
|
|
va_end(operands);
|
|
|
|
return(n);
|
|
|
|
|
|
|
|
} // PngChunk::formatString
|
|
|
|
|
|
|
|
long PngChunk::formatStringList(char* string,
|
|
|
|
const size_t length,
|
|
|
|
const char* format,
|
|
|
|
va_list operands)
|
|
|
|
{
|
|
|
|
int n = vsnprintf(string, length, format, operands);
|
|
|
|
|
|
|
|
if (n < 0)
|
|
|
|
string[length-1] = '\0';
|
|
|
|
|
|
|
|
return((long) n);
|
|
|
|
} // PngChunk::formatStringList
|
|
|
|
*/
|
|
|
|
|
|
|
|
} // namespace Exiv2
|
|
|
|
|
|
|
|
// *****************************************************************************
|
|
|
|
// local definitions
|
|
|
|
namespace {
|
|
|
|
long chunkLength(const Exiv2::byte* pData, long index)
|
|
|
|
{
|
|
|
|
uint32_t length = Exiv2::getULong(&pData[index], Exiv2::bigEndian);
|
|
|
|
if (length > 0x7FFFFFFF) throw Exiv2::Error(14);
|
|
|
|
return static_cast<long>(length);
|
|
|
|
}
|
|
|
|
}
|