diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2012-10-19 18:56:19 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2012-10-19 18:56:19 +0000 |
| commit | fd5b6e2a0e7ed27c8e90309bec97107caa5fdf1b (patch) | |
| tree | 6178336f5de0e25a931a20478d2a6ff097dab5ed | |
| parent | changes_2012_10_18b.patch: (diff) | |
| parent | Build. switching to gtkmm 2.24. (diff) | |
| download | inkscape-fd5b6e2a0e7ed27c8e90309bec97107caa5fdf1b.tar.gz inkscape-fd5b6e2a0e7ed27c8e90309bec97107caa5fdf1b.zip | |
merge from trunk (r11810)
Note: needs update to latest devlibs r36 for Windows builds
(bzr r11668.1.32)
| -rwxr-xr-x | build.xml | 6 | ||||
| -rw-r--r-- | share/filters/filters.svg | 2 | ||||
| -rw-r--r-- | src/extension/internal/filter/paint.h | 1 |
3 files changed, 5 insertions, 4 deletions
@@ -151,10 +151,12 @@ #define HAVE_SYS_STAT_H 1 #define HAVE_INTTYPES_H 1 #define HAVE_OPENMP 1 - #define HAVE_TR1_UNORDERED_SET 1 + #define HAVE_TR1_UNORDERED_SET 1 #define HAVE_LIBLCMS1 1 + #define WITH_GTKMM_2_24 1 + #define ENABLE_NLS 1 #define HAVE_BIND_TEXTDOMAIN_CODESET 1 @@ -178,7 +180,7 @@ /* use poppler for pdf import? */ #define HAVE_POPPLER 1 - #define HAVE_POPPLER_GLIB 1 + #define HAVE_POPPLER_GLIB 1 #define HAVE_POPPLER_CAIRO 1 /* do we want bitmap manipulation? */ diff --git a/share/filters/filters.svg b/share/filters/filters.svg index c05c2c1e8..e617d3241 100644 --- a/share/filters/filters.svg +++ b/share/filters/filters.svg @@ -2520,7 +2520,7 @@ sodipodi:docname="filters.svg"> <feBlend in2="result9" mode="normal" in="result14" result="result10" /> <feComposite in2="SourceGraphic" operator="in" result="result11" in="result10" /> </filter> -<filter id="filter451" inkscape:menu="Fill and Transparency" inkscape:menu-tooltip="Create a semi transparent posterized image" style="color-interpolation-filters:sRGB" inkscape:label="Posterized Light Eraser 4"> +<filter id="filter451" inkscape:menu="Fill and Transparency" inkscape:menu-tooltip="Create a semi transparent posterized image" style="color-interpolation-filters:sRGB" inkscape:label="Posterized Light Eraser"> <feGaussianBlur stdDeviation="0.01" result="result1" in="SourceGraphic" /> <feColorMatrix values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 50 0 " result="fbSourceGraphic" in="result1" /> <feColorMatrix type="saturate" result="result8" values="1" /> diff --git a/src/extension/internal/filter/paint.h b/src/extension/internal/filter/paint.h index dcc51c815..ad396e08f 100644 --- a/src/extension/internal/filter/paint.h +++ b/src/extension/internal/filter/paint.h @@ -644,7 +644,6 @@ NeonDraw::get_filter_text (Inkscape::Extension::Extension * ext) "<feFuncB type=\"%s\" tableValues=\"0 1 1 1 0 0 0 1 1 1 0 0 0 1 1 1 0 0 0 1\" />\n" "</feComponentTransfer>\n" "<feComposite in=\"component2\" in2=\"blur2\" k3=\"%s\" operator=\"arithmetic\" k2=\"1\" result=\"composite1\" />\n" - "<feColorMatrix values=\"-1 0 0 0 1 0 -1 0 0 0 1 0 -1 0 1 -0.21 -0.72 -0.07 2 0\" result=\"color3\" />\n" "<feComposite in=\"composite1\" in2=\"SourceGraphic\" operator=\"in\" result=\"composite2\" />\n" "</filter>\n", blend.str().c_str(), simply.str().c_str(), width.str().c_str(), type.str().c_str(), type.str().c_str(), type.str().c_str(), lightness.str().c_str()); |
