diff options
| author | Mark Harmer <drivehappy@gmail.com> | 2016-06-14 12:33:17 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2016-06-14 12:33:17 +0000 |
| commit | 41c854edad820e281097f6ba8f17ea89521155ea (patch) | |
| tree | 6c499ea7f95c4a588cc0061f56770e4b56b14118 /src | |
| parent | Merging lp:~inkscape+alexander/inkscape/comments into lp:inkscape. (diff) | |
| download | inkscape-41c854edad820e281097f6ba8f17ea89521155ea.tar.gz inkscape-41c854edad820e281097f6ba8f17ea89521155ea.zip | |
[Bug #1300865] lcms2: crash in Fill and Stroke if linked color profile is missing on local system.
Fixed bugs:
- https://launchpad.net/bugs/1300865
(bzr r14987)
Diffstat (limited to 'src')
| -rw-r--r-- | src/color-profile.cpp | 6 | ||||
| -rw-r--r-- | src/ui/widget/color-icc-selector.cpp | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index 9e545df03..aea9ccab0 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -588,7 +588,11 @@ bool ColorProfile::GamutCheck(SPColor color) static_cast<guchar>(SP_RGBA32_G_U(val)), static_cast<guchar>(SP_RGBA32_B_U(val)), 255}; - cmsDoTransform(ColorProfile::getTransfGamutCheck(), &check_color, &outofgamut, 1); + + cmsHTRANSFORM gamutCheck = ColorProfile::getTransfGamutCheck();
+ if (gamutCheck) {
+ cmsDoTransform(gamutCheck, &check_color, &outofgamut, 1);
+ } #if HAVE_LIBLCMS1 cmsSetAlarmCodes(alarm_r, alarm_g, alarm_b); diff --git a/src/ui/widget/color-icc-selector.cpp b/src/ui/widget/color-icc-selector.cpp index b422892fe..e4f58fe8a 100644 --- a/src/ui/widget/color-icc-selector.cpp +++ b/src/ui/widget/color-icc-selector.cpp @@ -633,9 +633,10 @@ void ColorICCSelectorImpl::_switchToProfile(gchar const *name) #endif // DEBUG_LCMS tmp.set(SP_RGBA32_U_COMPOSE(pre[0], pre[1], pre[2], 0xff)); } + + dirty = true; } } - dirty = true; } } else { |