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

List:       kde-commits
Subject:    koffice/libs/pigment
From:       Boudewijn Rempt <boud () valdyas ! org>
Date:       2010-03-29 18:00:23
Message-ID: 20100329180023.E116EAC886 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1108746 by rempt:

Don't crash if we cannot find a profile

We need to have a profile in grabColorSpace, but the code already
returns 0 under some circumstances: also return 0 if the profile
is not found.

BUG: 224233

 M  +5 -0      KoColorSpaceRegistry.cpp  


--- trunk/koffice/libs/pigment/KoColorSpaceRegistry.cpp #1108745:1108746
@@ -321,6 +321,11 @@
                 Q_ASSERT(p);
             }
         }
+        // We did our best, but still have no profile: and since csf->grabColorSpace
+        // needs the profile to find the colorspace, we have to give up.
+        if (!p) {
+            return 0; // XXX: maybe return rgb8?
+        }
         const KoColorSpace *cs = csf->grabColorSpace(p);
         if (!cs) {
             dbgPigmentCSRegistry << "Unable to create color space";
[prev in list] [next in list] [prev in thread] [next in thread]