diff options
| author | monsta <[email protected]> | 2016-10-20 14:30:39 +0300 |
|---|---|---|
| committer | monsta <[email protected]> | 2016-10-20 14:30:39 +0300 |
| commit | b9f2604e5079882923abcd74ad13caf0e4b8faa2 (patch) | |
| tree | 32350510a7aa18d5b08f52ef8b4e92ce3fabec8c | |
| parent | d3cf808c47ab4f1aa59cbc91da7a59b7c2d1b48a (diff) | |
| download | atril-b9f2604e5079882923abcd74ad13caf0e4b8faa2.tar.bz2 atril-b9f2604e5079882923abcd74ad13caf0e4b8faa2.tar.xz | |
tiff: use function from cairo >= 1.6 unconditionally
no need for additional checks these days (and we actually already
use the same function in another file)
| -rw-r--r-- | backend/tiff/tiff-document.c | 4 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 0 insertions, 10 deletions
diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c index 52c35d6e..0aa31cb6 100644 --- a/backend/tiff/tiff-document.c +++ b/backend/tiff/tiff-document.c @@ -261,11 +261,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 bcc186d3..118a919b 100644 --- a/configure.ac +++ b/configure.ac @@ -165,12 +165,6 @@ AC_SUBST([SMCLIENT_LIBS]) BACKEND_LIBTOOL_FLAGS="-module -avoid-version -no-undefined -export-symbols \$(top_srcdir)/backend/backend.symbols" AC_SUBST(BACKEND_LIBTOOL_FLAGS) -dnl ===== Check special functions -atril_save_LIBS=$LIBS -LIBS="$LIBS $BACKEND_LIBS" -AC_CHECK_FUNCS(cairo_format_stride_for_width) -LIBS=$atril_save_LIBS - # ****************** # GKT+ Unix Printing # ****************** |