[UFRaw-CVS] ufraw ufraw_exiv2.cc,1.40,1.41

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

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

Modified Files:
	ufraw_exiv2.cc 
Log Message:
Fix previous commit.


Index: ufraw_exiv2.cc
===================================================================
RCS file: /cvsroot/ufraw/ufraw/ufraw_exiv2.cc,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- ufraw_exiv2.cc	22 Oct 2008 04:20:04 -0000	1.40
+++ ufraw_exiv2.cc	22 Oct 2008 22:13:53 -0000	1.41
@@ -40,21 +40,22 @@
 static void uf_strlcpy_to_utf8(char *dest, size_t dest_max,
 	Exiv2::ExifData::iterator pos, Exiv2::ExifData& exifData)
 {
-#if EXIV2_TEST_VERSION(0,17,99)		/* Exiv2 0.18-pre1 */
-    std::stringstream str = pos->print(exifData);
+#if EXIV2_TEST_VERSION(0,17,91)		/* Exiv2 0.18-pre1 */
+    std::string str = pos->print(&exifData);
 #else
     (void)exifData;
-    std::stringstream str;
-    str << *pos;
+    std::stringstream strm;
+    strm << *pos;
+    std::string str = strm.str();
 #endif
 
-    char *s = g_locale_to_utf8(str.str().c_str(), str.str().length(),
+    char *s = g_locale_to_utf8(str.c_str(), str.length(),
 				NULL, NULL, NULL);
     if ( s!=NULL ) {
 	g_strlcpy(dest, s, dest_max);
 	g_free(s);
     } else {
-	g_strlcpy(dest, str.str().c_str(), dest_max);
+	g_strlcpy(dest, str.c_str(), dest_max);
     }
 }