[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Jul 13 17:39:37 UTC 2017
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=b759193
The following commit has been merged in the master branch:
commit b75919327359f9692660ef351c1c8441f53539e3
Author: Andreas Huggel <ahuggel at gmx.net>
Date: Wed Jul 16 04:38:32 2008 +0000
Removed trailing whitespace.
---
src/actions.cpp | 10 ++--
src/bmpimage.cpp | 12 ++---
src/canonmn.cpp | 2 +-
src/convert.cpp | 6 +--
src/cr2image.hpp | 4 +-
src/exif.cpp | 2 +-
src/exif.hpp | 6 +--
src/exiv2.cpp | 10 ++--
src/gifimage.cpp | 12 ++---
src/image.cpp | 6 +--
src/image.hpp | 22 ++++-----
src/jp2image.cpp | 10 ++--
src/jpgimage.cpp | 6 +--
src/jpgimage.hpp | 6 +--
src/metadatum.hpp | 2 +-
src/mrwimage.hpp | 4 +-
src/mrwthumb.cpp | 2 +-
src/orfimage.hpp | 4 +-
src/pentaxmn.cpp | 2 +-
src/pngchunk.cpp | 128 ++++++++++++++++++++++++------------------------
src/pngchunk.hpp | 38 +++++++-------
src/pngimage.hpp | 6 +--
src/properties.cpp | 6 +--
src/properties.hpp | 14 +++---
src/psdimage.cpp | 14 +++---
src/rafimage.hpp | 4 +-
src/tags.cpp | 2 +-
src/tags.hpp | 2 +-
src/tgaimage.cpp | 10 ++--
src/tgaimage.hpp | 2 +-
src/tiffcomposite.cpp | 6 +--
src/tiffimage.cpp | 2 +-
src/tiffimage_int.hpp | 2 +-
src/tiffvisitor.cpp | 4 +-
src/tiffvisitor_int.hpp | 10 ++--
src/types.cpp | 2 +-
src/types.hpp | 12 ++---
src/value.cpp | 14 +++---
src/value.hpp | 26 +++++-----
src/version.hpp | 28 +++++------
src/xmp.cpp | 20 ++++----
src/xmp.hpp | 4 +-
42 files changed, 242 insertions(+), 242 deletions(-)
diff --git a/src/actions.cpp b/src/actions.cpp
index 54a90bd..83710e6 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -261,7 +261,7 @@ namespace Action {
std::cout << buf.st_size << " " << _("Bytes") << std::endl;
}
- // MIME type
+ // MIME type
printLabel(_("MIME type"));
std::cout << image->mimeType() << "
";
@@ -1358,7 +1358,7 @@ namespace Action {
else {
std::cerr << _("Warning") << ": " << modifyCmd.key_ << ": "
<< _("Failed to read") << " "
- << Exiv2::TypeInfo::typeName(value->typeId())
+ << Exiv2::TypeInfo::typeName(value->typeId())
<< " " << _("value")
<< " \"" << modifyCmd.value_ << "\"
";
}
@@ -1399,7 +1399,7 @@ namespace Action {
void Modify::regNamespace(const ModifyCmd& modifyCmd)
{
if (Params::instance().verbose_) {
- std::cout << _("Reg ") << modifyCmd.key_ << "=\""
+ std::cout << _("Reg ") << modifyCmd.key_ << "=\""
<< modifyCmd.value_ << "\"" << std::endl;
}
// Registration has been done immediately after parsing the command.
@@ -1888,11 +1888,11 @@ namespace {
return 0;
} // renameFile
- std::string newFilePath(const std::string& path, const std::string& ext)
+ std::string newFilePath(const std::string& path, const std::string& ext)
{
std::string directory = Params::instance().directory_;
if (directory.empty()) directory = Util::dirname(path);
- std::string newPath = directory + EXV_SEPERATOR_STR
+ std::string newPath = directory + EXV_SEPERATOR_STR
+ Util::basename(path, true) + ext;
return newPath;
}
diff --git a/src/bmpimage.cpp b/src/bmpimage.cpp
index 77984b0..c686172 100644
--- a/src/bmpimage.cpp
+++ b/src/bmpimage.cpp
@@ -80,13 +80,13 @@ namespace Exiv2 {
#ifdef DEBUG
std::cerr << "Exiv2::BmpImage::readMetadata: Reading Windows bitmap file " << io_->path() << "
";
#endif
- if (io_->open() != 0)
+ if (io_->open() != 0)
{
throw Error(9, io_->path(), strError());
}
IoCloser closer(*io_);
// Ensure that this is the correct image type
- if (!isBmpType(*io_, false))
+ if (!isBmpType(*io_, false))
{
if (io_->error() || io_->eof()) throw Error(14);
throw Error(3, "BMP");
@@ -95,7 +95,7 @@ namespace Exiv2 {
/*
The Windows bitmap header goes as follows -- all numbers are in little-endian byte order:
-
+
offset length name description
====== ======= ===================== =======
0 2 bytes signature always 'BM'
@@ -133,7 +133,7 @@ namespace Exiv2 {
Image::AutoPtr newBmpInstance(BasicIo::AutoPtr io, bool /*create*/)
{
Image::AutoPtr image(new BmpImage(io));
- if (!image->good())
+ if (!image->good())
{
image.reset();
}
@@ -146,12 +146,12 @@ namespace Exiv2 {
const unsigned char BmpImageId[2] = { 'B', 'M' };
byte buf[len];
iIo.read(buf, len);
- if (iIo.error() || iIo.eof())
+ if (iIo.error() || iIo.eof())
{
return false;
}
bool matched = (memcmp(buf, BmpImageId, len) == 0);
- if (!advance || !matched)
+ if (!advance || !matched)
{
iIo.seek(-len, BasicIo::cur);
}
diff --git a/src/canonmn.cpp b/src/canonmn.cpp
index 41a09df..dbc7b3e 100644
--- a/src/canonmn.cpp
+++ b/src/canonmn.cpp
@@ -243,7 +243,7 @@ namespace Exiv2 {
{ 6, N_("Medium 2") },
{ 7, N_("Medium 3") }
};
-
+
//! EasyMode, tag 0x000b
extern const TagDetails canonCsEasyMode[] = {
{ 0, N_("Full auto") },
diff --git a/src/convert.cpp b/src/convert.cpp
index 8a011ec..7d0f443 100644
--- a/src/convert.cpp
+++ b/src/convert.cpp
@@ -550,7 +550,7 @@ namespace Exiv2 {
else { // "Exif.GPSInfo.GPSTimeStamp"
bool ok = true;
- if (pos->value().count() != 3) ok = false;
+ if (pos->value().count() != 3) ok = false;
if (ok) {
for (int i = 0; i < 3; ++i) {
if (pos->value().toRational(i).second == 0) {
@@ -891,7 +891,7 @@ namespace Exiv2 {
}
std::ostringstream array;
- array << static_cast<int>(value[0]) << " "
+ array << static_cast<int>(value[0]) << " "
<< static_cast<int>(value[1]) << " "
<< static_cast<int>(value[2]) << " "
<< static_cast<int>(value[3]);
@@ -1282,7 +1282,7 @@ namespace {
if ( pos->value().ok()
&& value.length() > 5 && value.substr(0, 5) == "lang=") {
std::string::size_type pos = value.find_first_of(' ');
- if (pos != std::string::npos) {
+ if (pos != std::string::npos) {
value = value.substr(pos + 1);
}
else {
diff --git a/src/cr2image.hpp b/src/cr2image.hpp
index 2aa4f22..276b2f6 100644
--- a/src/cr2image.hpp
+++ b/src/cr2image.hpp
@@ -85,12 +85,12 @@ namespace Exiv2 {
*/
void writeMetadata();
/*!
- @brief Todo: Not supported yet, requires writeMetadata(). Calling
+ @brief Todo: Not supported yet, requires writeMetadata(). Calling
this function will throw an Error(32).
*/
void setExifData(const ExifData& exifData);
/*!
- @brief Todo: Not supported yet, requires writeMetadata(). Calling
+ @brief Todo: Not supported yet, requires writeMetadata(). Calling
this function will throw an Error(32).
*/
void setIptcData(const IptcData& iptcData);
diff --git a/src/exif.cpp b/src/exif.cpp
index 1f4159c..109f8d7 100644
--- a/src/exif.cpp
+++ b/src/exif.cpp
@@ -306,7 +306,7 @@ namespace Exiv2 {
void ExifThumb::setJpegThumbnail(
const std::string& path,
- URational xres,
+ URational xres,
URational yres,
uint16_t unit
)
diff --git a/src/exif.hpp b/src/exif.hpp
index 475072d..68958b7 100644
--- a/src/exif.hpp
+++ b/src/exif.hpp
@@ -252,7 +252,7 @@ namespace Exiv2 {
of the Exif data. These methods do not write to the Exif metadata.
Manipulators are provided in subclass ExifThumb.
- @note Various other preview and thumbnail images may be contained in an
+ @note Various other preview and thumbnail images may be contained in an
image, depending on its format and the camera make and model. This
class only provides access to the Exif thumbnail as specified in the
Exif standard.
@@ -306,7 +306,7 @@ namespace Exiv2 {
embedded in IFD1 of the Exif data. Accessors are provided by the
base class, ExifThumbC.
- @note Various other preview and thumbnail images may be contained in an
+ @note Various other preview and thumbnail images may be contained in an
image, depending on its format and the camera make and model. This
class only provides access to the Exif thumbnail as specified in the
Exif standard.
@@ -340,7 +340,7 @@ namespace Exiv2 {
*/
void setJpegThumbnail(
const std::string& path,
- URational xres,
+ URational xres,
URational yres,
uint16_t unit
);
diff --git a/src/exiv2.cpp b/src/exiv2.cpp
index 7d64a8b..14faa2b 100644
--- a/src/exiv2.cpp
+++ b/src/exiv2.cpp
@@ -144,7 +144,7 @@ int main(int argc, char* const argv[])
int n = 1;
int s = static_cast<int>(params.files_.size());
int w = s > 9 ? s > 99 ? 3 : 2 : 1;
- for (Params::Files::const_iterator i = params.files_.begin();
+ for (Params::Files::const_iterator i = params.files_.begin();
i != params.files_.end(); ++i) {
if (params.verbose_) {
std::cout << _("File") << " " << std::setw(w) << std::right << n++ << "/" << s << ": "
@@ -168,7 +168,7 @@ Params* Params::instance_ = 0;
const Params::YodAdjust Params::emptyYodAdjust_[] = {
{ false, "-Y", 0 },
{ false, "-O", 0 },
- { false, "-D", 0 },
+ { false, "-D", 0 },
};
Params& Params::instance()
@@ -356,8 +356,8 @@ int Params::evalRename(int opt, const std::string& optarg)
case Action::none:
action_ = Action::rename;
switch (opt) {
- case 'r':
- format_ = optarg;
+ case 'r':
+ format_ = optarg;
formatSet_ = true;
break;
case 't': timestamp_ = true; break;
@@ -370,7 +370,7 @@ int Params::evalRename(int opt, const std::string& optarg)
<< ": " << _("Ignoring surplus option") << " -r \"" << optarg << "\"
";
}
else {
- format_ = optarg;
+ format_ = optarg;
formatSet_ = true;
}
break;
diff --git a/src/gifimage.cpp b/src/gifimage.cpp
index cc5ffa4..f77325d 100644
--- a/src/gifimage.cpp
+++ b/src/gifimage.cpp
@@ -80,13 +80,13 @@ namespace Exiv2 {
#ifdef DEBUG
std::cerr << "Exiv2::GifImage::readMetadata: Reading GIF file " << io_->path() << "
";
#endif
- if (io_->open() != 0)
+ if (io_->open() != 0)
{
throw Error(9, io_->path(), strError());
}
IoCloser closer(*io_);
// Ensure that this is the correct image type
- if (!isGifType(*io_, true))
+ if (!isGifType(*io_, true))
{
if (io_->error() || io_->eof()) throw Error(14);
throw Error(3, "GIF");
@@ -112,7 +112,7 @@ namespace Exiv2 {
Image::AutoPtr newGifInstance(BasicIo::AutoPtr io, bool /*create*/)
{
Image::AutoPtr image(new GifImage(io));
- if (!image->good())
+ if (!image->good())
{
image.reset();
}
@@ -126,13 +126,13 @@ namespace Exiv2 {
const unsigned char Gif89aId[8] = { 'G', 'I', 'F', '8', '9', 'a' };
byte buf[len];
iIo.read(buf, len);
- if (iIo.error() || iIo.eof())
+ if (iIo.error() || iIo.eof())
{
return false;
}
- bool matched = (memcmp(buf, Gif87aId, len) == 0)
+ bool matched = (memcmp(buf, Gif87aId, len) == 0)
|| (memcmp(buf, Gif89aId, len) == 0);
- if (!advance || !matched)
+ if (!advance || !matched)
{
iIo.seek(-len, BasicIo::cur);
}
diff --git a/src/image.cpp b/src/image.cpp
index b3b8d12..65871ec 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -108,7 +108,7 @@ namespace Exiv2 {
return imageType == imageType_;
}
- Image::Image(int imageType,
+ Image::Image(int imageType,
uint16_t supportedMetadata,
BasicIo::AutoPtr io)
: io_(io),
@@ -118,7 +118,7 @@ namespace Exiv2 {
supportedMetadata_(supportedMetadata),
#ifdef EXV_HAVE_XMP_TOOLKIT
writeXmpFromPacket_(false),
-#else
+#else
writeXmpFromPacket_(true),
#endif
byteOrder_(invalidByteOrder)
@@ -190,7 +190,7 @@ namespace Exiv2 {
void Image::writeXmpFromPacket(bool flag)
{
#ifdef EXV_HAVE_XMP_TOOLKIT
- writeXmpFromPacket_ = flag;
+ writeXmpFromPacket_ = flag;
#endif
}
diff --git a/src/image.hpp b/src/image.hpp
index 5766003..490106a 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -77,10 +77,10 @@ namespace Exiv2 {
//@{
/*!
@brief Constructor taking the image type, a bitmap of the supported
- metadata types and an auto-pointer that owns an IO instance.
+ metadata types and an auto-pointer that owns an IO instance.
See subclass constructor doc.
*/
- Image(int imageType,
+ Image(int imageType,
uint16_t supportedMetadata,
BasicIo::AutoPtr io);
//! Virtual Destructor
@@ -142,8 +142,8 @@ namespace Exiv2 {
@brief Assign a raw XMP packet. The new XMP packet is not written
to the image until the writeMetadata() method is called.
- Subsequent calls to writeMetadata() write the XMP packet from
- the buffered raw XMP packet rather than from buffered parsed XMP
+ Subsequent calls to writeMetadata() write the XMP packet from
+ the buffered raw XMP packet rather than from buffered parsed XMP
data. In order to write from parsed XMP data again, use
either writeXmpFromPacket(false) or setXmpData().
@@ -154,10 +154,10 @@ namespace Exiv2 {
@brief Erase the buffered XMP packet. XMP data is not removed from
the actual image until the writeMetadata() method is called.
- This has the same effect as clearXmpData() but operates on the
+ This has the same effect as clearXmpData() but operates on the
buffered raw XMP packet only, not the parsed XMP data.
- Subsequent calls to writeMetadata() write the XMP packet from
+ Subsequent calls to writeMetadata() write the XMP packet from
the buffered raw XMP packet rather than from buffered parsed XMP
data. In order to write from parsed XMP data again, use
either writeXmpFromPacket(false) or setXmpData().
@@ -169,7 +169,7 @@ namespace Exiv2 {
Subsequent calls to writeMetadata() encode the XMP data to
a raw XMP packet and write the newly encoded packet to the image.
- In the process, the buffered raw XMP packet is updated.
+ In the process, the buffered raw XMP packet is updated.
In order to write directly from the raw XMP packet, use
writeXmpFromPacket(true) or setXmpPacket().
@@ -180,7 +180,7 @@ namespace Exiv2 {
@brief Erase any buffered XMP data. XMP data is not removed from
the actual image until the writeMetadata() method is called.
- This has the same effect as clearXmpPacket() but operates on the
+ This has the same effect as clearXmpPacket() but operates on the
buffered parsed XMP data.
Subsequent calls to writeMetadata() encode the XMP data to
@@ -260,11 +260,11 @@ namespace Exiv2 {
XMP from the buffered raw XMP packet or from parsed XMP data.
The default is to write from parsed XMP data. The switch is also
set by all functions to set and clear the buffered raw XMP packet
- and parsed XMP data, so using this function should usually not be
+ and parsed XMP data, so using this function should usually not be
necessary.
- If %Exiv2 was compiled without XMP support, the default for this
- flag is true and it will never be changed in order to preserve
+ If %Exiv2 was compiled without XMP support, the default for this
+ flag is true and it will never be changed in order to preserve
access to the raw XMP packet.
*/
void writeXmpFromPacket(bool flag);
diff --git a/src/jp2image.cpp b/src/jp2image.cpp
index 638c1c9..69743e1 100644
--- a/src/jp2image.cpp
+++ b/src/jp2image.cpp
@@ -115,13 +115,13 @@ namespace Exiv2 {
#ifdef DEBUG
std::cerr << "Exiv2::Jp2Image::readMetadata: Reading JPEG-2000 file " << io_->path() << "
";
#endif
- if (io_->open() != 0)
+ if (io_->open() != 0)
{
throw Error(9, io_->path(), strError());
}
IoCloser closer(*io_);
// Ensure that this is the correct image type
- if (!isJp2Type(*io_, true))
+ if (!isJp2Type(*io_, true))
{
if (io_->error() || io_->eof()) throw Error(14);
throw Error(3, "JPEG-2000");
@@ -240,7 +240,7 @@ namespace Exiv2 {
Image::AutoPtr newJp2Instance(BasicIo::AutoPtr io, bool /*create*/)
{
Image::AutoPtr image(new Jp2Image(io));
- if (!image->good())
+ if (!image->good())
{
image.reset();
}
@@ -254,12 +254,12 @@ namespace Exiv2 {
const unsigned char Jp2Header[len] = { 0x00, 0x00, 0x00, 0x0c, 0x6a, 0x50, 0x20, 0x20, 0x0d, 0x0a, 0x87, 0x0a };
byte buf[len];
iIo.read(buf, len);
- if (iIo.error() || iIo.eof())
+ if (iIo.error() || iIo.eof())
{
return false;
}
bool matched = (memcmp(buf, Jp2Header, len) == 0);
- if (!advance || !matched)
+ if (!advance || !matched)
{
iIo.seek(-len, BasicIo::cur);
}
diff --git a/src/jpgimage.cpp b/src/jpgimage.cpp
index af2463c..2482c49 100644
--- a/src/jpgimage.cpp
+++ b/src/jpgimage.cpp
@@ -137,7 +137,7 @@ namespace Exiv2 {
return -2;
}
#ifndef DEBUG
- if ( (dataSize & 1)
+ if ( (dataSize & 1)
&& position + dataSize == static_cast<uint32_t>(sizePsData)) {
std::cerr << "Warning: "
<< "Photoshop IRB data is not padded to even size
";
@@ -212,7 +212,7 @@ namespace Exiv2 {
}
// Write existing stuff after record, data is rounded to be even.
const uint32_t sizeOldData = sizeHdr + sizeIptc + (sizeIptc & 1);
- // Note: Because of the rounding, sizeFront + sizeOldData can be
+ // Note: Because of the rounding, sizeFront + sizeOldData can be
// _greater_ than sizePsData by 1 (not just equal), if the original
// data was not padded.
if (static_cast<uint32_t>(sizePsData) > sizeFront + sizeOldData) {
@@ -403,7 +403,7 @@ namespace Exiv2 {
}
else if ( pixelHeight_ == 0
&& ( marker == sof0_ || marker == sof1_ || marker == sof2_
- || marker == sof3_ || marker == sof5_ || marker == sof6_
+ || marker == sof3_ || marker == sof5_ || marker == sof6_
|| marker == sof7_ || marker == sof9_ || marker == sof10_
|| marker == sof11_ || marker == sof13_ || marker == sof14_
|| marker == sof15_)) {
diff --git a/src/jpgimage.hpp b/src/jpgimage.hpp
index a383ae0..9576ba5 100644
--- a/src/jpgimage.hpp
+++ b/src/jpgimage.hpp
@@ -140,10 +140,10 @@ namespace Exiv2 {
valid image of the calling subclass.
@param dataSize Size of initData in bytes.
*/
- JpegBase(int type,
- BasicIo::AutoPtr io,
+ JpegBase(int type,
+ BasicIo::AutoPtr io,
bool create,
- const byte initData[],
+ const byte initData[],
long dataSize);
//@}
diff --git a/src/metadatum.hpp b/src/metadatum.hpp
index b9423d3..b20cf06 100644
--- a/src/metadatum.hpp
+++ b/src/metadatum.hpp
@@ -212,7 +212,7 @@ namespace Exiv2 {
@brief Return the <EM>n</EM>-th component of the value converted to
a string. The behaviour of the method is undefined if there
is no <EM>n</EM>-th component.
- */
+ */
virtual std::string toString(long n) const =0;
/*!
@brief Return the <EM>n</EM>-th component of the value converted to long.
diff --git a/src/mrwimage.hpp b/src/mrwimage.hpp
index e03a6cc..786f93e 100644
--- a/src/mrwimage.hpp
+++ b/src/mrwimage.hpp
@@ -85,12 +85,12 @@ namespace Exiv2 {
*/
void writeMetadata();
/*!
- @brief Todo: Not supported yet, requires writeMetadata(). Calling
+ @brief Todo: Not supported yet, requires writeMetadata(). Calling
this function will throw an Error(32).
*/
void setExifData(const ExifData& exifData);
/*!
- @brief Todo: Not supported yet, requires writeMetadata(). Calling
+ @brief Todo: Not supported yet, requires writeMetadata(). Calling
this function will throw an Error(32).
*/
void setIptcData(const IptcData& iptcData);
diff --git a/src/mrwthumb.cpp b/src/mrwthumb.cpp
index 5068da8..694b955 100644
--- a/src/mrwthumb.cpp
+++ b/src/mrwthumb.cpp
@@ -27,7 +27,7 @@ try {
Exiv2::ExifKey key("Exif.Minolta.ThumbnailOffset");
Exiv2::ExifData::const_iterator format = exifData.findKey(key);
-
+
if (format != exifData.end()) {
Exiv2::DataBuf buf = format->dataArea();
diff --git a/src/orfimage.hpp b/src/orfimage.hpp
index de08a52..fbb79c3 100644
--- a/src/orfimage.hpp
+++ b/src/orfimage.hpp
@@ -85,12 +85,12 @@ namespace Exiv2 {
*/
void writeMetadata();
/*!
- @brief Todo: Not supported yet, requires writeMetadata(). Calling
+ @brief Todo: Not supported yet, requires writeMetadata(). Calling
this function will throw an Error(32).
*/
void setExifData(const ExifData& exifData);
/*!
- @brief Todo: Not supported yet, requires writeMetadata(). Calling
+ @brief Todo: Not supported yet, requires writeMetadata(). Calling
this function will throw an Error(32).
*/
void setIptcData(const IptcData& iptcData);
diff --git a/src/pentaxmn.cpp b/src/pentaxmn.cpp
index 28b65c6..dd1640d 100644
--- a/src/pentaxmn.cpp
+++ b/src/pentaxmn.cpp
@@ -625,7 +625,7 @@ namespace Exiv2 {
{ 4, N_("Vibrant") },
{ 5, N_("Monochrome") },
};
-
+
//! DynamicRangeExpansion, tag 0x0069
extern const TagDetails pentaxDynamicRangeExpansion[] = {
{ 0, N_("Off") },
diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index 90f3242..bcf0e66 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -135,7 +135,7 @@ namespace Exiv2 {
DataBuf arr = parsePngChunk(pData, size, index, keysize);
#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*)arr.pData_, 32) << "
";
#endif
@@ -360,7 +360,7 @@ namespace Exiv2 {
#endif
xmpPacket = xmpPacket.substr(idx);
}
- if (XmpParser::decode(pImage->xmpData(), xmpPacket))
+ if (XmpParser::decode(pImage->xmpData(), xmpPacket))
{
#ifndef SUPPRESS_WARNINGS
std::cerr << "Warning: Failed to decode XMP metadata.
";
@@ -387,7 +387,7 @@ namespace Exiv2 {
#endif
xmpPacket = xmpPacket.substr(idx);
}
- if (XmpParser::decode(pImage->xmpData(), xmpPacket))
+ if (XmpParser::decode(pImage->xmpData(), xmpPacket))
{
#ifndef SUPPRESS_WARNINGS
std::cerr << "Warning: Failed to decode XMP metadata.
";
@@ -489,8 +489,8 @@ namespace Exiv2 {
} // PngChunk::readRawProfile
- void PngChunk::zlibUncompress(const byte* compressedText,
- unsigned int compressedTextSize,
+ void PngChunk::zlibUncompress(const byte* compressedText,
+ unsigned int compressedTextSize,
DataBuf& arr)
{
uLongf uncompressedLen = compressedTextSize * 2; // just a starting point
@@ -534,101 +534,101 @@ namespace Exiv2 {
/* 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,
+ 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] = '
--
exiv2 packaging
More information about the pkg-kde-commits
mailing list