[UFRaw-CVS] ufraw ufraw_exiv2.cc,1.46,1.47

[Udi F. <udi...@us...>]

Update of /cvsroot/ufraw/ufraw
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv25962

Modified Files:
	ufraw_exiv2.cc 
Log Message:
With Exiv2-0.18 there is no need any more to explicitly delete
tags Exif.Canon.0x4002, Exif.Canon.0x4005.


Index: ufraw_exiv2.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_exiv2.cc,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- ufraw_exiv2.cc	18 Nov 2008 06:58:13 -0000	1.46
+++ ufraw_exiv2.cc	23 Dec 2008 06:58:25 -0000	1.47
@@ -415,29 +415,6 @@
 	size = buf.size_;
 #endif
     }
-#if EXIV2_TEST_VERSION(0,17,91)		/* Exiv2 0.18-pre1 */
-    if ( size+sizeof(ExifHeader)>65533 ) {
-	Exiv2::ExifData::iterator pos;
-	if ( (pos=exifData.findKey(Exiv2::ExifKey("Exif.Canon.0x4002")))
-		!= exifData.end() ) {
-	    exifData.erase(pos);
-	    ufraw_message(UFRAW_SET_LOG,
-		    "buflen %d too big, erasing Exif.Canon.0x4002\n",
-		    size+sizeof(ExifHeader));
-	    Exiv2::ExifParser::encode(blob, Exiv2::bigEndian, exifData);
-	    size = blob.size();
-	}
-	if ( (pos=exifData.findKey(Exiv2::ExifKey("Exif.Canon.0x4005")))
-		!= exifData.end() ) {
-	    exifData.erase(pos);
-	    ufraw_message(UFRAW_SET_LOG,
-		    "buflen %d too big, erasing Exif.Canon.0x4005\n",
-		    size+sizeof(ExifHeader));
-	    Exiv2::ExifParser::encode(blob, Exiv2::bigEndian, exifData);
-	    size = blob.size();
-	}
-    }
-#endif
     uf->outputExifBufLen = size + sizeof(ExifHeader);
     uf->outputExifBuf = g_new(unsigned char, uf->outputExifBufLen);
     memcpy(uf->outputExifBuf, ExifHeader, sizeof(ExifHeader));