[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdegraphics/kfile-plugins/jpeg
From:       Brad Hards <bradh () frogmouth ! net>
Date:       2004-12-15 11:26:27
Message-ID: 20041215112627.001CA1BADE () office ! kde ! org
[Download RAW message or body]

CVS commit by bhards: 

Ensure that we treat comments as UTF8. There are a few approaches
to doing this, and I'm only doing the simplest - we write as UTF8,
so we read it back in like that. Should be fine for ASCII only 
comments too.

CCMAIL: 64509-done@bugs.kde.org
CCMAIL: 55066-done@bugs.kde.org
CCMAIL: 77546-done@bugs.kde.org


  M +1 -8      exif.cpp   1.10


--- kdegraphics/kfile-plugins/jpeg/exif.cpp  #1.9:1.10
@@ -731,12 +731,5 @@ void ExifData::ProcessExifDir(unsigned c
 void ExifData::process_COM (const uchar * Data, int length)
 {
-    QChar ch;
-    int a;
-
-    for (a=2;a<length;a++){
-        ch = Data[a];
-        if (ch == '\000') continue;                     // Remove nulls
-        Comment.append(ch);
-    }
+    Comment = QString::fromUtf8((char *)Data+2, (length-2));
 }
 


[prev in list] [next in list] [prev in thread] [next in thread]