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

List:       kde-commits
Subject:    [calligra/calligra/2.9] krita/plugins/formats/exr: exr: Reset the info object for every new layer
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2015-09-21 10:58:52
Message-ID: E1Zdyo8-00059n-8q () scm ! kde ! org
[Download RAW message or body]

Git commit a1502a78747ad8a8bf5c6948007ca9e4da2cb8ad by Boudewijn Rempt.
Committed on 21/09/2015 at 10:43.
Pushed by rempt into branch 'calligra/2.9'.

exr: Reset the info object for every new layer

CCBUG:352734

M  +6    -1    krita/plugins/formats/exr/exr_converter.cc

http://commits.kde.org/calligra/a1502a78747ad8a8bf5c6948007ca9e4da2cb8ad

diff --git a/krita/plugins/formats/exr/exr_converter.cc b/krita/plugins/formats/exr/exr_converter.cc
index edfa0aa..cfcce00 100644
--- a/krita/plugins/formats/exr/exr_converter.cc
+++ b/krita/plugins/formats/exr/exr_converter.cc
@@ -629,6 +629,9 @@ KisImageBuilder_Result exrConverter::decode(const KUrl& uri)
 
     for (std::set<std::string>::const_iterator i = layerNames.begin();
          i != layerNames.end(); ++i) {
+
+        info = ExrPaintLayerInfo();
+
         dbgFile << "layer name = " << i->c_str();
         info.name = i->c_str();
         Imf::ChannelList::ConstIterator layerBegin, layerEnd;
@@ -659,7 +662,6 @@ KisImageBuilder_Result exrConverter::decode(const KUrl& uri)
         }
     }
 
-
     dbgFile << "File has" << informationObjects.size() << "layer(s)";
 
     // Set the colorspaces
@@ -742,6 +744,9 @@ KisImageBuilder_Result exrConverter::decode(const KUrl& uri)
                 info.channelMap = newChannelMap;
             }
         }
+        else {
+            dbgFile << info.name << "has" << info.channelMap.size() << "channels, and we don't know what to do.";
+        }
         if (!modelId.isEmpty()) {
             info.colorSpace = kisTypeToColorSpace(modelId, info.imageType);
         }
[prev in list] [next in list] [prev in thread] [next in thread]