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

List:       kde-commits
Subject:    koffice/libs/flake
From:       Thomas Zander <zander () kde ! org>
Date:       2010-12-12 12:32:45
Message-ID: 20101212123245.CA9F5AC8B1 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1205758 by zander:

Revert "Use the image file suffix instead of 0"

This reverts commit 1195527

 M  +3 -6      KoImageData.cpp  


--- trunk/koffice/libs/flake/KoImageData.cpp #1205757:1205758
@@ -138,19 +138,16 @@
         // load image
         if (d->temporaryFile) {
             d->temporaryFile->open();
-            if (d->errorCode == Success && !d->image.load(d->temporaryFile, d->suffix.toLatin1())) {
+            if (d->errorCode == Success && !d->image.load(d->temporaryFile, 0))
                 d->errorCode = OpenFailed;
-            }
             d->temporaryFile->close();
         } else {
-            if (d->errorCode == Success && !d->image.load(d->imageLocation.toLocalFile())) {
+            if (d->errorCode == Success && !d->image.load(d->imageLocation.toLocalFile()))
                 d->errorCode = OpenFailed;
             }
-        }
-        if (d->errorCode == Success) {
+        if (d->errorCode == Success)
             d->dataStoreState = KoImageDataPrivate::StateImageLoaded;
         }
-    }
     return d->image;
 }
 
[prev in list] [next in list] [prev in thread] [next in thread]