summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormonsta <[email protected]>2017-04-13 15:15:49 +0300
committermonsta <[email protected]>2017-04-13 15:15:49 +0300
commit3bc10a2e070d958032f3c1c95380c2f7a1948a5d (patch)
tree35b74adccf1b27f6b76a2f23fcb524b848738d9c
parentc5fb1fc9098e0f5a50f4cc1a8599c1d1809f116b (diff)
downloadatril-3bc10a2e070d958032f3c1c95380c2f7a1948a5d.tar.bz2
atril-3bc10a2e070d958032f3c1c95380c2f7a1948a5d.tar.xz
build: require cairo >= 1.10.0 and drop some old code
-rw-r--r--configure.ac2
-rw-r--r--libview/ev-view.c11
2 files changed, 1 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index 523886ac..de5d68f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ AC_ARG_WITH([gtk],
AC_MSG_RESULT([$with_gtk])
dnl Specify required versions of dependencies
-CAIRO_REQUIRED=1.9.10
+CAIRO_REQUIRED=1.10.0
GLIB_REQUIRED=2.36.0
GTK_REQUIRED=3.14.0
WEBKIT_REQUIRED=2.4.3
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 70e78fa0..a930deae 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -6047,18 +6047,7 @@ merge_selection_region (EvView *view,
* changed, so we xor the old and new regions
* and redraw if it's different */
region = cairo_region_copy (old_sel->covered_region);
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1, 9, 12)
cairo_region_xor (region, new_sel->covered_region);
-#else
- cairo_region_t *tbr;
- tbr = cairo_region_copy (new_sel->covered_region);
-
- /* xor old_sel, new_sel*/
- cairo_region_subtract (tbr, region);
- cairo_region_subtract (region, new_sel->covered_region);
- cairo_region_union (region, tbr);
- cairo_region_destroy (tbr);
-#endif
if (cairo_region_is_empty (region)) {
cairo_region_destroy (region);