1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51
|
From: Jason Crain <jcrain@src.gnome.org>
Date: Sat, 2 Dec 2017 20:24:45 -0600
Subject: [2/2] Remove unused configure check for cairo_format_stride_for_width
Origin: https://gitlab.gnome.org/GNOME/evince/commit/e6ed0d4cdb6326e329c8f61f9cc19ff9331cb0ce
Bug-Debian-Security: https://security-tracker.debian.org/tracker/CVE-2019-1010006
This function was introduced in cairo version 1.6. We already require
version 1.10 so this function will always be available.
https://bugzilla.gnome.org/show_bug.cgi?id=788980
---
backend/tiff/tiff-document.c | 4 ----
configure.ac | 6 ------
2 files changed, 10 deletions(-)
diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index 7bf95c2bbd7b..7715031b9a31 100644
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -273,11 +273,7 @@ tiff_document_render (EvDocument *document,
return NULL;
}
-#ifdef HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH
rowstride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width);
-#else
- rowstride = width * 4;
-#endif
if (rowstride / 4 != width) {
g_warning("Overflow while rendering document.");
/* overflow, or cairo was changed in an unsupported way */
diff --git a/configure.ac b/configure.ac
index 1c2a960a398e..923c65860f2a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -247,12 +247,6 @@ fi
BACKEND_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -export-symbols \$(top_srcdir)/backend/backend.symbols"
AC_SUBST(BACKEND_LIBTOOL_FLAGS)
-dnl ===== Check special functions
-evince_save_LIBS=$LIBS
-LIBS="$LIBS $BACKEND_LIBS"
-AC_CHECK_FUNCS(cairo_format_stride_for_width)
-LIBS=$evince_save_LIBS
-
# ******************
# GKT+ Unix Printing
# ******************
--
2.25.0
|