[GNUnet-SVN] r2819 - Extractor/src/plugins/exiv2

[grothoff]

Author: grothoff
Date: 2006-05-14 12:16:19 -0700 (Sun, 14 May 2006)
New Revision: 2819

Modified:
   Extractor/src/plugins/exiv2/exiv2extractor.cc
Log:
manits 1094

Modified: Extractor/src/plugins/exiv2/exiv2extractor.cc
===================================================================
--- Extractor/src/plugins/exiv2/exiv2extractor.cc       2006-05-14 18:42:47 UTC 
(rev 2818)
+++ Extractor/src/plugins/exiv2/exiv2extractor.cc       2006-05-14 19:16:19 UTC 
(rev 2819)
@@ -346,9 +346,13 @@
         }
         result = newResult;
 
+#if 0
+       /* this can sometimes be wrong (corrupt exiv2 data?).
+          Either way, we should get the data directly from
+          the specific file format parser (i.e. jpeg, tiff). */
         // Exif Resolution
-        long xdim = 0;
-        long ydim = 0;
+        unsigned long xdim = 0;
+        unsigned long ydim = 0;
         md = exifData.findKey(Exiv2::ExifKey("Exif.Photo.PixelXDimension"));
         if (md != exifData.end()) xdim = md->toLong();
         md = exifData.findKey(Exiv2::ExifKey("Exif.Photo.PixelYDimension"));
@@ -360,7 +364,7 @@
                                 strdup(os.str().c_str()),
                                 result);
         }
-
+#endif
         // White balance
         // Todo: Implement this for other cameras