|
|
|
@ -135,7 +135,7 @@ namespace Exiv2 {
|
|
|
|
DataBuf arr = parsePngChunk(pData, size, index, keysize);
|
|
|
|
DataBuf arr = parsePngChunk(pData, size, index, keysize);
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
#ifdef DEBUG
|
|
|
|
std::cerr << "Exiv2::PngChunk::decode: Found PNG chunk: "
|
|
|
|
std::cerr << "Exiv2::PngChunk::decode: Found PNG chunk: "
|
|
|
|
<< std::string((const char*)key) << " :: "
|
|
|
|
<< std::string((const char*)key) << " :: "
|
|
|
|
<< std::string((const char*)arr.pData_, 32) << "\n";
|
|
|
|
<< std::string((const char*)arr.pData_, 32) << "\n";
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
@ -360,7 +360,7 @@ namespace Exiv2 {
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
xmpPacket = xmpPacket.substr(idx);
|
|
|
|
xmpPacket = xmpPacket.substr(idx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (XmpParser::decode(pImage->xmpData(), xmpPacket))
|
|
|
|
if (XmpParser::decode(pImage->xmpData(), xmpPacket))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
std::cerr << "Warning: Failed to decode XMP metadata.\n";
|
|
|
|
std::cerr << "Warning: Failed to decode XMP metadata.\n";
|
|
|
|
@ -387,7 +387,7 @@ namespace Exiv2 {
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
xmpPacket = xmpPacket.substr(idx);
|
|
|
|
xmpPacket = xmpPacket.substr(idx);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (XmpParser::decode(pImage->xmpData(), xmpPacket))
|
|
|
|
if (XmpParser::decode(pImage->xmpData(), xmpPacket))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
#ifndef SUPPRESS_WARNINGS
|
|
|
|
std::cerr << "Warning: Failed to decode XMP metadata.\n";
|
|
|
|
std::cerr << "Warning: Failed to decode XMP metadata.\n";
|
|
|
|
@ -489,8 +489,8 @@ namespace Exiv2 {
|
|
|
|
|
|
|
|
|
|
|
|
} // PngChunk::readRawProfile
|
|
|
|
} // PngChunk::readRawProfile
|
|
|
|
|
|
|
|
|
|
|
|
void PngChunk::zlibUncompress(const byte* compressedText,
|
|
|
|
void PngChunk::zlibUncompress(const byte* compressedText,
|
|
|
|
unsigned int compressedTextSize,
|
|
|
|
unsigned int compressedTextSize,
|
|
|
|
DataBuf& arr)
|
|
|
|
DataBuf& arr)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
uLongf uncompressedLen = compressedTextSize * 2; // just a starting point
|
|
|
|
uLongf uncompressedLen = compressedTextSize * 2; // just a starting point
|
|
|
|
@ -534,101 +534,101 @@ namespace Exiv2 {
|
|
|
|
|
|
|
|
|
|
|
|
/* TODO : code backported from digiKam. Not yet adapted and used.
|
|
|
|
/* TODO : code backported from digiKam. Not yet adapted and used.
|
|
|
|
|
|
|
|
|
|
|
|
void PngChunk::writeRawProfile(png_struct *ping,
|
|
|
|
void PngChunk::writeRawProfile(png_struct *ping,
|
|
|
|
png_info* ping_info,
|
|
|
|
png_info* ping_info,
|
|
|
|
char* profile_type,
|
|
|
|
char* profile_type,
|
|
|
|
char* profile_data,
|
|
|
|
char* profile_data,
|
|
|
|
png_uint_32 length)
|
|
|
|
png_uint_32 length)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
png_textp text;
|
|
|
|
png_textp text;
|
|
|
|
|
|
|
|
|
|
|
|
register long i;
|
|
|
|
register long i;
|
|
|
|
|
|
|
|
|
|
|
|
uchar *sp;
|
|
|
|
uchar *sp;
|
|
|
|
|
|
|
|
|
|
|
|
png_charp dp;
|
|
|
|
png_charp dp;
|
|
|
|
|
|
|
|
|
|
|
|
png_uint_32 allocated_length, description_length;
|
|
|
|
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'};
|
|
|
|
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;
|
|
|
|
DDebug() << "Writing Raw profile: type=" << profile_type << ", length=" << length << endl;
|
|
|
|
|
|
|
|
|
|
|
|
text = (png_textp) png_malloc(ping, (png_uint_32) sizeof(png_text));
|
|
|
|
text = (png_textp) png_malloc(ping, (png_uint_32) sizeof(png_text));
|
|
|
|
description_length = std::strlen((const char *) profile_type);
|
|
|
|
description_length = std::strlen((const char *) profile_type);
|
|
|
|
allocated_length = (png_uint_32) (length*2 + (length >> 5) + 20 + description_length);
|
|
|
|
allocated_length = (png_uint_32) (length*2 + (length >> 5) + 20 + description_length);
|
|
|
|
|
|
|
|
|
|
|
|
text[0].text = (png_charp) png_malloc(ping, allocated_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 = (png_charp) png_malloc(ping, (png_uint_32) 80);
|
|
|
|
text[0].key[0] = '\0';
|
|
|
|
text[0].key[0] = '\0';
|
|
|
|
|
|
|
|
|
|
|
|
concatenateString(text[0].key, "Raw profile type ", 4096);
|
|
|
|
concatenateString(text[0].key, "Raw profile type ", 4096);
|
|
|
|
concatenateString(text[0].key, (const char *) profile_type, 62);
|
|
|
|
concatenateString(text[0].key, (const char *) profile_type, 62);
|
|
|
|
|
|
|
|
|
|
|
|
sp = (uchar*)profile_data;
|
|
|
|
sp = (uchar*)profile_data;
|
|
|
|
dp = text[0].text;
|
|
|
|
dp = text[0].text;
|
|
|
|
*dp++='\n';
|
|
|
|
*dp++='\n';
|
|
|
|
|
|
|
|
|
|
|
|
copyString(dp, (const char *) profile_type, allocated_length);
|
|
|
|
copyString(dp, (const char *) profile_type, allocated_length);
|
|
|
|
|
|
|
|
|
|
|
|
dp += description_length;
|
|
|
|
dp += description_length;
|
|
|
|
*dp++='\n';
|
|
|
|
*dp++='\n';
|
|
|
|
|
|
|
|
|
|
|
|
formatString(dp, allocated_length-strlen(text[0].text), "%8lu ", length);
|
|
|
|
formatString(dp, allocated_length-strlen(text[0].text), "%8lu ", length);
|
|
|
|
|
|
|
|
|
|
|
|
dp += 8;
|
|
|
|
dp += 8;
|
|
|
|
|
|
|
|
|
|
|
|
for (i=0; i < (long) length; i++)
|
|
|
|
for (i=0; i < (long) length; i++)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (i%36 == 0)
|
|
|
|
if (i%36 == 0)
|
|
|
|
*dp++='\n';
|
|
|
|
*dp++='\n';
|
|
|
|
|
|
|
|
|
|
|
|
*(dp++)=(char) hex[((*sp >> 4) & 0x0f)];
|
|
|
|
*(dp++)=(char) hex[((*sp >> 4) & 0x0f)];
|
|
|
|
*(dp++)=(char) hex[((*sp++ ) & 0x0f)];
|
|
|
|
*(dp++)=(char) hex[((*sp++ ) & 0x0f)];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
*dp++='\n';
|
|
|
|
*dp++='\n';
|
|
|
|
*dp='\0';
|
|
|
|
*dp='\0';
|
|
|
|
text[0].text_length = (png_size_t) (dp-text[0].text);
|
|
|
|
text[0].text_length = (png_size_t) (dp-text[0].text);
|
|
|
|
text[0].compression = -1;
|
|
|
|
text[0].compression = -1;
|
|
|
|
|
|
|
|
|
|
|
|
if (text[0].text_length <= allocated_length)
|
|
|
|
if (text[0].text_length <= allocated_length)
|
|
|
|
png_set_text(ping, ping_info,text, 1);
|
|
|
|
png_set_text(ping, ping_info,text, 1);
|
|
|
|
|
|
|
|
|
|
|
|
png_free(ping, text[0].text);
|
|
|
|
png_free(ping, text[0].text);
|
|
|
|
png_free(ping, text[0].key);
|
|
|
|
png_free(ping, text[0].key);
|
|
|
|
png_free(ping, text);
|
|
|
|
png_free(ping, text);
|
|
|
|
|
|
|
|
|
|
|
|
} // PngChunk::writeRawProfile
|
|
|
|
} // PngChunk::writeRawProfile
|
|
|
|
|
|
|
|
|
|
|
|
size_t PngChunk::concatenateString(char* destination,
|
|
|
|
size_t PngChunk::concatenateString(char* destination,
|
|
|
|
const char* source,
|
|
|
|
const char* source,
|
|
|
|
const size_t length)
|
|
|
|
const size_t length)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
register char *q;
|
|
|
|
register char *q;
|
|
|
|
|
|
|
|
|
|
|
|
register const char *p;
|
|
|
|
register const char *p;
|
|
|
|
|
|
|
|
|
|
|
|
register size_t i;
|
|
|
|
register size_t i;
|
|
|
|
|
|
|
|
|
|
|
|
size_t count;
|
|
|
|
size_t count;
|
|
|
|
|
|
|
|
|
|
|
|
if ( !destination || !source || length == 0 )
|
|
|
|
if ( !destination || !source || length == 0 )
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
p = source;
|
|
|
|
p = source;
|
|
|
|
q = destination;
|
|
|
|
q = destination;
|
|
|
|
i = length;
|
|
|
|
i = length;
|
|
|
|
|
|
|
|
|
|
|
|
while ((i-- != 0) && (*q != '\0'))
|
|
|
|
while ((i-- != 0) && (*q != '\0'))
|
|
|
|
q++;
|
|
|
|
q++;
|
|
|
|
|
|
|
|
|
|
|
|
count = (size_t) (q-destination);
|
|
|
|
count = (size_t) (q-destination);
|
|
|
|
i = length-count;
|
|
|
|
i = length-count;
|
|
|
|
|
|
|
|
|
|
|
|
if (i == 0)
|
|
|
|
if (i == 0)
|
|
|
|
return(count+strlen(p));
|
|
|
|
return(count+strlen(p));
|
|
|
|
|
|
|
|
|
|
|
|
while (*p != '\0')
|
|
|
|
while (*p != '\0')
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (i != 1)
|
|
|
|
if (i != 1)
|
|
|
|
@ -638,61 +638,61 @@ namespace Exiv2 {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
p++;
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
*q='\0';
|
|
|
|
*q='\0';
|
|
|
|
|
|
|
|
|
|
|
|
return(count+(p-source));
|
|
|
|
return(count+(p-source));
|
|
|
|
|
|
|
|
|
|
|
|
} // PngChunk::concatenateString
|
|
|
|
} // PngChunk::concatenateString
|
|
|
|
|
|
|
|
|
|
|
|
size_t PngChunk::copyString(char* destination,
|
|
|
|
size_t PngChunk::copyString(char* destination,
|
|
|
|
const char* source,
|
|
|
|
const char* source,
|
|
|
|
const size_t length)
|
|
|
|
const size_t length)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
register char *q;
|
|
|
|
register char *q;
|
|
|
|
|
|
|
|
|
|
|
|
register const char *p;
|
|
|
|
register const char *p;
|
|
|
|
|
|
|
|
|
|
|
|
register size_t i;
|
|
|
|
register size_t i;
|
|
|
|
|
|
|
|
|
|
|
|
if ( !destination || !source || length == 0 )
|
|
|
|
if ( !destination || !source || length == 0 )
|
|
|
|
return 0;
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
p = source;
|
|
|
|
p = source;
|
|
|
|
q = destination;
|
|
|
|
q = destination;
|
|
|
|
i = length;
|
|
|
|
i = length;
|
|
|
|
|
|
|
|
|
|
|
|
if ((i != 0) && (--i != 0))
|
|
|
|
if ((i != 0) && (--i != 0))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
do
|
|
|
|
do
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if ((*q++=(*p++)) == '\0')
|
|
|
|
if ((*q++=(*p++)) == '\0')
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
while (--i != 0);
|
|
|
|
while (--i != 0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (i == 0)
|
|
|
|
if (i == 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (length != 0)
|
|
|
|
if (length != 0)
|
|
|
|
*q='\0';
|
|
|
|
*q='\0';
|
|
|
|
|
|
|
|
|
|
|
|
while (*p++ != '\0');
|
|
|
|
while (*p++ != '\0');
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
return((size_t) (p-source-1));
|
|
|
|
return((size_t) (p-source-1));
|
|
|
|
|
|
|
|
|
|
|
|
} // PngChunk::copyString
|
|
|
|
} // PngChunk::copyString
|
|
|
|
|
|
|
|
|
|
|
|
long PngChunk::formatString(char* string,
|
|
|
|
long PngChunk::formatString(char* string,
|
|
|
|
const size_t length,
|
|
|
|
const size_t length,
|
|
|
|
const char* format,
|
|
|
|
const char* format,
|
|
|
|
...)
|
|
|
|
...)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
long n;
|
|
|
|
long n;
|
|
|
|
|
|
|
|
|
|
|
|
va_list operands;
|
|
|
|
va_list operands;
|
|
|
|
|
|
|
|
|
|
|
|
va_start(operands,format);
|
|
|
|
va_start(operands,format);
|
|
|
|
n = (long) formatStringList(string, length, format, operands);
|
|
|
|
n = (long) formatStringList(string, length, format, operands);
|
|
|
|
va_end(operands);
|
|
|
|
va_end(operands);
|
|
|
|
@ -700,20 +700,20 @@ namespace Exiv2 {
|
|
|
|
|
|
|
|
|
|
|
|
} // PngChunk::formatString
|
|
|
|
} // PngChunk::formatString
|
|
|
|
|
|
|
|
|
|
|
|
long PngChunk::formatStringList(char* string,
|
|
|
|
long PngChunk::formatStringList(char* string,
|
|
|
|
const size_t length,
|
|
|
|
const size_t length,
|
|
|
|
const char* format,
|
|
|
|
const char* format,
|
|
|
|
va_list operands)
|
|
|
|
va_list operands)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int n = vsnprintf(string, length, format, operands);
|
|
|
|
int n = vsnprintf(string, length, format, operands);
|
|
|
|
|
|
|
|
|
|
|
|
if (n < 0)
|
|
|
|
if (n < 0)
|
|
|
|
string[length-1] = '\0';
|
|
|
|
string[length-1] = '\0';
|
|
|
|
|
|
|
|
|
|
|
|
return((long) n);
|
|
|
|
return((long) n);
|
|
|
|
} // PngChunk::formatStringList
|
|
|
|
} // PngChunk::formatStringList
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
} // namespace Exiv2
|
|
|
|
} // namespace Exiv2
|
|
|
|
|
|
|
|
|
|
|
|
// *****************************************************************************
|
|
|
|
// *****************************************************************************
|
|
|
|
|
Andreas Huggel
17 years ago