[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=b4789e7

The following commit has been merged in the master branch:
commit b4789e7969479c08551005355b42cf802d3a92a2
Author: HumanDynamo <caulier.gilles at gmail.com>
Date:   Mon Jun 12 05:49:54 2006 +0000

    Code polishing.
    Fix GCC 4.1 compilation warnings.
    Remove unwanted tabs.
---
 src/pngchunk.cpp | 76 +++++++++++++++++++++++++++++---------------------------
 src/pngchunk.hpp | 10 ++++----
 src/pngimage.cpp | 22 ++++++++--------
 src/pngimage.hpp |  4 +--
 4 files changed, 58 insertions(+), 54 deletions(-)

diff --git a/src/pngchunk.cpp b/src/pngchunk.cpp
index 00890dd..ba2469c 100644
--- a/src/pngchunk.cpp
+++ b/src/pngchunk.cpp
@@ -20,13 +20,13 @@
  */
 /*
   File:    pngchunk.cpp
-  Version: $Rev: 816 $
-  History: 07-Jun-06, gc: submitted
+  Version: $Rev: 823 $
+  History: 12-Jun-06, gc: submitted
   Credits: See header file
  */
 // *****************************************************************************
 #include "rcsid.hpp"
-EXIV2_RCSID("@(#) $Id: pngchunk.cpp 816 2006-06-04 15:21:19Z ahuggel $");
+EXIV2_RCSID("@(#) $Id: pngchunk.cpp 823 2006-06-23 07:35:00Z cgilles $");
 
 // *****************************************************************************
 // included header files
@@ -95,18 +95,18 @@ namespace Exiv2 {
 
                 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;
-                                
+
                 if(!strncmp((char*)PNG_CHUNK_TYPE(pData, index), "zTXt", 4)) 
                 {
                     // Extract a deflate compressed Latin-1 text chunk
-                
+
 #ifdef DEBUG
                     std::cerr << "Exiv2::PngChunk::decode: We found a zTXt field
";
 #endif
@@ -120,7 +120,7 @@ namespace Exiv2 {
 #endif
                         throw Error(14);
                     }
-                    
+
                     // compressed string after the compression technique spec
                     const byte* compressedText = &PNG_CHUNK_DATA(pData, index, keysize+2);
                     uint compressedTextSize    = getLong(&pData[index], bigEndian)-keysize-2;
@@ -134,13 +134,13 @@ namespace Exiv2 {
 
                     uLongf uncompressedLen = compressedTextSize * 2; // just a starting point
                     int zlibResult;
-                    
-                    do 
+
+                    do
                     {
                         arr.alloc(uncompressedLen);
                         zlibResult = uncompress((Bytef*)arr.pData_, &uncompressedLen,
                                                 compressedText, compressedTextSize);
-                        
+
                         if (Z_OK == zlibResult) 
                         {
                             // then it is all OK
@@ -192,6 +192,8 @@ namespace Exiv2 {
                 }
                 else
                 {
+                    // TODO : Add 'iTXt' chunk 'Description' tag support here
+
 #ifdef DEBUG
                     std::cerr << "Exiv2::PngChunk::decode: We found a field, not expected though
";
 #endif
@@ -204,17 +206,17 @@ namespace Exiv2 {
 #endif
 
                 // We look if an EXIF raw profile exist.
-                
+
                 if ( memcmp("Raw profile type exif", key, 21) == 0 ||
                      memcmp("Raw profile type APP1", key, 21) == 0 )
                 {
                     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;
 
@@ -228,7 +230,7 @@ namespace Exiv2 {
                         }
 
                         // If found it, store only these data at from this place.
-                        
+
                         if (pos !=-1)
                         {
 #ifdef DEBUG
@@ -236,17 +238,17 @@ namespace Exiv2 {
 #endif
                             pos = pos + sizeof(exifHeader);
                             TiffParser::decode(pImage, exifData.pData_+pos, length-pos, TiffCreator::create);
-                        }                        
+                        }
                     }
                 }
-                
+
                 // We look if an IPTC raw profile exist.
-                
+
                 if ( memcmp("Raw profile type iptc", key, 21) == 0 )
                 {
                     DataBuf iptcData = readRawProfile(arr);
                     long length = iptcData.size_;
-                    
+
                     if (length > 0)
                         pImage->iptcData().load(iptcData.pData_, length);
                 }
@@ -254,9 +256,9 @@ namespace Exiv2 {
                 index += getLong(&pData[index], bigEndian) + PNG_CHUNK_HEADER_SIZE;
             }
         }
-    
+
     } // PngChunk::decode
-    
+
     DataBuf PngChunk::readRawProfile(const DataBuf& text)
     {
         DataBuf                 info;
@@ -271,45 +273,45 @@ namespace Exiv2 {
                                             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 != '
')
             sp++;
-    
+
         // Look for length
-    
+
         while (*sp == '

-- 
exiv2 packaging