diff options
| author | mh0310.choi <mh0310.choi@samsung.com> | 2016-09-05 21:40:07 +0900 |
|---|---|---|
| committer | mh0310.choi <mh0310.choi@samsung.com> | 2016-09-06 11:40:39 +0900 |
| commit | 9819660fc447c5d1723960c092394b35d80b2ffb (patch) | |
| tree | d798514ec5299783699446682fef10c23487cc77 | |
| parent | 996e7dfe39899e78e8b7d52edd438f4451f7c19d (diff) | |
| download | cairo-accepted/tizen/3.0/mobile/20161015.032320.tar.gz cairo-accepted/tizen/3.0/mobile/20161015.032320.tar.bz2 cairo-accepted/tizen/3.0/mobile/20161015.032320.zip | |
Disable separable convolutionsubmit/tizen_3.0_wearable/20161015.000000submit/tizen_3.0_tv/20161015.000000submit/tizen_3.0_mobile/20161015.000000submit/tizen_3.0_ivi/20161010.000010submit/tizen_3.0_ivi/20161010.000000submit/tizen/20160907.063143submit/tizen/20160906.044247accepted/tizen/wearable/20160908.042911accepted/tizen/tv/20160908.042842accepted/tizen/mobile/20160908.042823accepted/tizen/ivi/20160908.042941accepted/tizen/common/20160906.131223accepted/tizen/3.0/wearable/20161015.080347accepted/tizen/3.0/tv/20161016.003644accepted/tizen/3.0/mobile/20161015.032320accepted/tizen/3.0/ivi/20161011.053623
- disable PIXMAN_FILTER_SEPARABLE_CONVOLUTION
Change-Id: Ib445178c84a0b904bd68267185898158030b2d87
| -rw-r--r-- | packaging/cairo.spec | 18 | ||||
| -rw-r--r-- | src/cairo-image-source.c | 14 |
2 files changed, 23 insertions, 9 deletions
diff --git a/packaging/cairo.spec b/packaging/cairo.spec index 51c24f797..24759dba5 100644 --- a/packaging/cairo.spec +++ b/packaging/cairo.spec @@ -6,7 +6,6 @@ Name: cairo -#Version: 1.12.16 Version: 1.14.2 Release: 0 License: MPL-1.1 or LGPL-2.1+ @@ -16,7 +15,6 @@ Group: Graphics/Libraries Source: http://cairographics.org/releases/%{name}-%{version}.tar.xz Source99: baselibs.conf Source1001: cairo.manifest -#BuildRequires: libtool BuildRequires: pkg-config BuildRequires: xz BuildRequires: pkgconfig(fontconfig) @@ -144,18 +142,20 @@ NOCONFIGURE=1 ./autogen.sh --enable-svg=yes \ --enable-tee=no \ --enable-ttrace=no \ -%if %{with wayland} && !%{with x} + --disable-gtk-doc \ + --disable-static \ +%if %{with wayland} --disable-xlib \ - --disable-xcb \ -%else + --disable-xcb \ +%endif +%if %{with x} --enable-xlib \ %if %{with cairo_xcb_backend} - --enable-xcb \ + --enable-xcb %endif %endif - --disable-gtk-doc \ - --disable-static -make %{?_smp_mflags} V=1 + +#make %{?_smp_mflags} V=1 %install %make_install diff --git a/src/cairo-image-source.c b/src/cairo-image-source.c index 25cdf9373..d811d4536 100644 --- a/src/cairo-image-source.c +++ b/src/cairo-image-source.c @@ -62,6 +62,8 @@ #define PIXMAN_HAS_ATOMIC_OPS 1 #endif +#define SEPARABLE_CONVOLUTION 0 + #if PIXMAN_HAS_ATOMIC_OPS static pixman_image_t *__pixman_transparent_image; static pixman_image_t *__pixman_black_image; @@ -941,6 +943,10 @@ _pixman_image_set_properties (pixman_image_t *pixman_image, case CAIRO_FILTER_FAST: pixman_filter = PIXMAN_FILTER_FAST; break; + /* In order to prevent performance drop, Disable PIXMAN_FILTER_SEPERABLE_CONVOLTION + * same as cairo 1.12.14 in Tizen2.4 + */ +#if SEPARABLE_CONVOLUTION case CAIRO_FILTER_GOOD: pixman_filter = PIXMAN_FILTER_SEPARABLE_CONVOLUTION; kernel = KERNEL_BOX; @@ -971,6 +977,14 @@ _pixman_image_set_properties (pixman_image_t *pixman_image, else dy = 1.0; } break; +#else + case CAIRO_FILTER_GOOD: + pixman_filter = PIXMAN_FILTER_GOOD; + break; + case CAIRO_FILTER_BEST: + pixman_filter = PIXMAN_FILTER_BEST; + break; +#endif case CAIRO_FILTER_NEAREST: pixman_filter = PIXMAN_FILTER_NEAREST; break; |