[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=0b1ae63

The following commit has been merged in the master branch:
commit 0b1ae63131df28722400fd3d8a3f2c049b17863a
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Mon Jul 26 14:41:18 2004 +0000

    Minor changes: mostly PSD->PsD
---
 src/image.cpp | 26 +++++++++++++-------------
 src/image.hpp | 16 ++++++++--------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/src/image.cpp b/src/image.cpp
index 43fff74..31d64ba 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -20,7 +20,7 @@
  */
 /*
   File:      image.cpp
-  Version:   $Name:  $ $Revision: 1.20 $
+  Version:   $Name:  $ $Revision: 1.21 $
   Author(s): Andreas Huggel (ahu) <ahuggel at gmx.net>
              Brad Schick (brad) <schick at robotbattle.com>
   History:   26-Jan-04, ahu: created
@@ -29,7 +29,7 @@
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.20 $ $RCSfile: image.cpp,v $")
+EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.21 $ $RCSfile: image.cpp,v $")
 
 // *****************************************************************************
 // included header files
@@ -39,7 +39,7 @@ EXIV2_RCSID("@(#) $Name:  $ $Revision: 1.20 $ $RCSfile: image.cpp,v $")
 #include "types.hpp"
 
 // + standard includes
-#include <stdio.h>
+#include <cstdio>
 #include <cstring>
 #include <cstdio>                               // for rename, remove
 #include <cassert>
@@ -369,8 +369,8 @@ namespace Exiv2 {
 
 
     // Operates on raw data (rather than file streams) to simplify reuse
-    int JpegBase::locateIptcData(const byte *pPSData, 
-                                 long sizePSData,
+    int JpegBase::locateIptcData(const byte *pPsData, 
+                                 long sizePsData,
                                  const byte **record, 
                                  uint16 *const sizeHdr,
                                  uint16 *const sizeIptc) const
@@ -382,23 +382,23 @@ namespace Exiv2 {
         long position = 0;
 
         // Data should follow Photoshop format, if not exit
-        while (position <= (sizePSData - 14) &&
-                memcmp(pPSData + position, bimId_, 4)==0) {
-            const byte *hrd = pPSData + position;
+        while (position <= (sizePsData - 14) &&
+                memcmp(pPsData + position, bimId_, 4)==0) {
+            const byte *hrd = pPsData + position;
             position += 4;
-            uint16 type = getUShort(pPSData+ position, bigEndian);
+            uint16 type = getUShort(pPsData+ position, bigEndian);
             position += 2;
            
             // Pascal string is padded to have an even size (including size byte)
-            byte psSize = pPSData[position] + 1;
+            byte psSize = pPsData[position] + 1;
             psSize += (psSize & 1);
             position += psSize;
-            if (position >= sizePSData) return 1;
+            if (position >= sizePsData) return 1;
 
             // Data is also padded to be even
-            long dataSize = getULong(pPSData + position, bigEndian);
+            long dataSize = getULong(pPsData + position, bigEndian);
             position += 4;
-            if (dataSize > sizePSData - position) return 1;
+            if (dataSize > sizePsData - position) return 1;
            
             if (type == iptc_) {
                 *sizeIptc = static_cast<uint16>(dataSize);
diff --git a/src/image.hpp b/src/image.hpp
index 7ba8e92..c48b0c1 100644
--- a/src/image.hpp
+++ b/src/image.hpp
@@ -21,7 +21,7 @@
 /*!
   @file    image.hpp
   @brief   Class JpegImage to access JPEG images
-  @version $Name:  $ $Revision: 1.15 $
+  @version $Name:  $ $Revision: 1.16 $
   @author  Andreas Huggel (ahu)
            <a href="mailto:ahuggel at gmx.net">ahuggel at gmx.net</a>
   @author  Brad Schick (brad) 
@@ -428,11 +428,11 @@ namespace Exiv2 {
         /*!
           @brief Locates Photoshop formated IPTC data in a memory buffer.
                  Operates on raw data (rather than file streams) to simplify reuse.
-          @param pPSData Pointer to buffer containing entire payload of 
+          @param pPsData Pointer to buffer containing entire payload of 
                  Photoshop formated APP13 Jpeg segment.
-          @param sizePSData Size in bytes of pPSData.
+          @param sizePsData Size in bytes of pPsData.
           @param record Output value that is set to the start of the IPTC
-                 data block within pPSData (may not be null).
+                 data block within pPsData (may not be null).
           @param sizeHdr Output value that is set to the size of the header
                  within the IPTC data block pointed to by record (may not
                  be null).
@@ -440,11 +440,11 @@ namespace Exiv2 {
                  IPTC data within the IPTC data block pointed to by record
                  (may not be null).
           @return 0 if successful;<BR>
-                  1 if the pPSData buffer does not contain valid data;<BR>
-                  2 if no IPTC data was found in pPSData;<BR>
+                  1 if the pPsData buffer does not contain valid data;<BR>
+                  2 if no IPTC data was found in pPsData;<BR>
          */
-        int locateIptcData(const byte *pPSData, 
-                           long sizePSData,
+        int locateIptcData(const byte *pPsData, 
+                           long sizePsData,
                            const byte **record, 
                            uint16 *const sizeHdr,
                            uint16 *const sizeIptc) const;

-- 
exiv2 packaging