commit 1511523450f40b539fb1d58950a907f3712fd5c7
author Albert Astals Cid <aacid@kde.org> Thu Dec 15 22:04:04 2016 +0100
committer Albert Astals Cid <aacid@kde.org> Thu Dec 15 22:04:04 2016 +0100
tree 4869759fa6bd72f67bed4bcca5d5ef3ae0efc499
parent 9b016440725de086fa87fcbf776e27acee2c01b7

Refine previous fix a bit

Call GfxColorSpace::setupColorProfiles only when we really need it

poppler/GfxState.cc

diff --git a/poppler/GfxState.cc b/poppler/GfxState.cc
index 7fcc3a2..6ac1874 100644
--- a/poppler/GfxState.cc
+++ b/poppler/GfxState.cc
@@ -2050,9 +2050,13 @@
   if (hp == 0) {
     error(errSyntaxWarning, -1, "read ICCBased color space profile error");
   } else {
-    GfxColorSpace::setupColorProfiles();
     cmsHPROFILE dhp = (state != NULL && state->getDisplayProfile() != NULL) ? state->getDisplayProfile() : displayProfile;
-    if (dhp == NULL) dhp = RGBProfile;
+    if (dhp == NULL) {
+      if (unlikely(RGBProfile == NULL)) {
+        GfxColorSpace::setupColorProfiles();
+      }
+      dhp = RGBProfile;
+    }
     unsigned int cst = getCMSColorSpaceType(cmsGetColorSpace(hp));
     unsigned int dNChannels = getCMSNChannels(cmsGetColorSpace(dhp));
     unsigned int dcst = getCMSColorSpaceType(cmsGetColorSpace(dhp));