diff options
| author | Karl Cheng <qantas94heavy@gmail.com> | 2019-05-10 07:56:07 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marc@jeanmougin.fr> | 2019-05-12 12:45:27 +0000 |
| commit | e6ad8433954db069908bac240f39911fc32e5025 (patch) | |
| tree | e655e16ddc932b6e936ca8ff85626ee5c0fdf023 /src/display | |
| parent | rename to avoid name clashes. (diff) | |
| download | inkscape-e6ad8433954db069908bac240f39911fc32e5025.tar.gz inkscape-e6ad8433954db069908bac240f39911fc32e5025.zip | |
Remove support for LCMS 1
Now that all platforms (including macOS) now support LCMS 2, we no
longer need to support LCMS 1.
Fixes: https://bugs.launchpad.net/inkscape/+bug/1133014
Diffstat (limited to 'src/display')
| -rw-r--r-- | src/display/nr-filter-diffuselighting.cpp | 2 | ||||
| -rw-r--r-- | src/display/nr-filter-flood.cpp | 2 | ||||
| -rw-r--r-- | src/display/nr-filter-specularlighting.cpp | 2 | ||||
| -rw-r--r-- | src/display/sp-canvas.cpp | 10 | ||||
| -rw-r--r-- | src/display/sp-canvas.h | 4 |
5 files changed, 10 insertions, 10 deletions
diff --git a/src/display/nr-filter-diffuselighting.cpp b/src/display/nr-filter-diffuselighting.cpp index cfb8091af..d33d513e6 100644 --- a/src/display/nr-filter-diffuselighting.cpp +++ b/src/display/nr-filter-diffuselighting.cpp @@ -139,7 +139,7 @@ void FilterDiffuseLighting::render_cairo(FilterSlot &slot) double g = SP_RGBA32_G_F(lighting_color); double b = SP_RGBA32_B_F(lighting_color); -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if defined(HAVE_LIBLCMS2) if (icc) { guchar ru, gu, bu; diff --git a/src/display/nr-filter-flood.cpp b/src/display/nr-filter-flood.cpp index eb00d6ea3..05c32939f 100644 --- a/src/display/nr-filter-flood.cpp +++ b/src/display/nr-filter-flood.cpp @@ -44,7 +44,7 @@ void FilterFlood::render_cairo(FilterSlot &slot) double b = SP_RGBA32_B_F(color); double a = opacity; -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if defined(HAVE_LIBLCMS2) if (icc) { guchar ru, gu, bu; diff --git a/src/display/nr-filter-specularlighting.cpp b/src/display/nr-filter-specularlighting.cpp index 54bc50d5f..330f19c36 100644 --- a/src/display/nr-filter-specularlighting.cpp +++ b/src/display/nr-filter-specularlighting.cpp @@ -150,7 +150,7 @@ void FilterSpecularLighting::render_cairo(FilterSlot &slot) double g = SP_RGBA32_G_F(lighting_color); double b = SP_RGBA32_B_F(lighting_color); -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if defined(HAVE_LIBLCMS2) if (icc) { guchar ru, gu, bu; diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index f3906e24b..e8a36a3a7 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -1038,10 +1038,10 @@ static void sp_canvas_init(SPCanvas *canvas) canvas->_changecursor = 0; bool _is_dragging; -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if defined(HAVE_LIBLCMS2) canvas->_enable_cms_display_adj = false; new (&canvas->_cms_key) Glib::ustring(""); -#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#endif // defined(HAVE_LIBLCMS2) } void SPCanvas::shutdownTransients() @@ -1084,7 +1084,7 @@ void SPCanvas::dispose(GObject *object) } canvas->shutdownTransients(); -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if defined(HAVE_LIBLCMS2) canvas->_cms_key.~ustring(); #endif if (G_OBJECT_CLASS(sp_canvas_parent_class)->dispose) { @@ -1871,7 +1871,7 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect // output to X cairo_destroy(buf.ct); -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if defined(HAVE_LIBLCMS2) if (_enable_cms_display_adj) { cmsHTRANSFORM transf = nullptr; Inkscape::Preferences *prefs = Inkscape::Preferences::get(); @@ -1893,7 +1893,7 @@ void SPCanvas::paintSingleBuffer(Geom::IntRect const &paint_rect, Geom::IntRect cairo_surface_mark_dirty(imgs); } } -#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#endif // defined(HAVE_LIBLCMS2) cairo_surface_mark_dirty(_backing_store); // cairo_surface_write_to_png( _backing_store, "debug3.png" ); diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index 9b782e8a4..b4be65887 100644 --- a/src/display/sp-canvas.h +++ b/src/display/sp-canvas.h @@ -269,10 +269,10 @@ public: int _rendermode; int _colorrendermode; -#if defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#if defined(HAVE_LIBLCMS2) bool _enable_cms_display_adj; Glib::ustring _cms_key; -#endif // defined(HAVE_LIBLCMS1) || defined(HAVE_LIBLCMS2) +#endif // defined(HAVE_LIBLCMS2) bool _is_scrolling; }; |