[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=c62fa03

The following commit has been merged in the master branch:
commit c62fa03a8665043ef89c8fd55627ad1c2777c743
Author: vog <vog at notjusthosting.com>
Date:   Fri Jul 8 05:05:04 2011 +0000

    Improved coding style in EpsImage
---
 src/epsimage.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/epsimage.cpp b/src/epsimage.cpp
index 3135790..1fd5557 100644
--- a/src/epsimage.cpp
+++ b/src/epsimage.cpp
@@ -916,7 +916,7 @@ namespace {
             EXV_DEBUG << "readWriteEpsMetadata: New EPS size: " << (posEndEpsNew - posEpsNew) << "
";
             #endif
             if (dosEps) {
-                // add WMF and/or TIFF section if present
+                // write WMF and/or TIFF section if present
                 writeTemp(*tempIo, data + posWmf, sizeWmf);
                 writeTemp(*tempIo, data + posTiff, sizeTiff);
                 #ifdef DEBUG
@@ -929,16 +929,16 @@ namespace {
                     #endif
                     throw Error(21);
                 }
-                byte b[30];
-                dosEpsSignature.copy(reinterpret_cast<char*>(b), dosEpsSignature.size());
-                ul2Data(b +  4, posEpsNew,                                  littleEndian);
-                ul2Data(b +  8, posEndEpsNew - posEpsNew,                   littleEndian);
-                ul2Data(b + 12, sizeWmf == 0 ? 0 : posEndEpsNew,            littleEndian);
-                ul2Data(b + 16, sizeWmf,                                    littleEndian);
-                ul2Data(b + 20, sizeTiff == 0 ? 0 : posEndEpsNew + sizeWmf, littleEndian);
-                ul2Data(b + 24, sizeTiff,                                   littleEndian);
-                us2Data(b + 28, 0xFFFF,                                     littleEndian);
-                writeTemp(*tempIo, b, sizeof(b));
+                byte dosEpsHeader[30];
+                dosEpsSignature.copy(reinterpret_cast<char*>(dosEpsHeader), dosEpsSignature.size());
+                ul2Data(dosEpsHeader +  4, posEpsNew,                                  littleEndian);
+                ul2Data(dosEpsHeader +  8, posEndEpsNew - posEpsNew,                   littleEndian);
+                ul2Data(dosEpsHeader + 12, sizeWmf == 0 ? 0 : posEndEpsNew,            littleEndian);
+                ul2Data(dosEpsHeader + 16, sizeWmf,                                    littleEndian);
+                ul2Data(dosEpsHeader + 20, sizeTiff == 0 ? 0 : posEndEpsNew + sizeWmf, littleEndian);
+                ul2Data(dosEpsHeader + 24, sizeTiff,                                   littleEndian);
+                us2Data(dosEpsHeader + 28, 0xFFFF,                                     littleEndian);
+                writeTemp(*tempIo, dosEpsHeader, sizeof(dosEpsHeader));
             }
 
             // copy temporary file to real output file

-- 
exiv2 packaging