From 449f6af7514251c7dda6fdf4ad2d1c6e37d42835 Mon Sep 17 00:00:00 2001
From: Matthew Petroff <matthew@mpetroff.net>
Date: Fri, 4 Nov 2016 15:41:10 -0400
Subject: Bump Cairo version to 1.14.0

such that hi-dpi conditionals aren't needed.

origin commit:
https://github.com/linuxmint/xreader/commit/df3cdc6
---
 libview/ev-pixbuf-cache.c | 8 --------
 libview/ev-view.c         | 6 ------
 2 files changed, 14 deletions(-)

(limited to 'libview')

diff --git a/libview/ev-pixbuf-cache.c b/libview/ev-pixbuf-cache.c
index ca96d484..3b353c98 100644
--- a/libview/ev-pixbuf-cache.c
+++ b/libview/ev-pixbuf-cache.c
@@ -251,22 +251,14 @@ ev_pixbuf_cache_set_max_size (EvPixbufCache *pixbuf_cache,
 static int
 get_device_scale (EvPixbufCache *pixbuf_cache)
 {
-#ifdef HAVE_HIDPI_SUPPORT
 	return gtk_widget_get_scale_factor (pixbuf_cache->view);
-#else
-	return 1;
-#endif
 }
 
 static void
 set_device_scale_on_surface (cairo_surface_t *surface,
                              int              device_scale)
 {
-#ifdef HAVE_HIDPI_SUPPORT
 	cairo_surface_set_device_scale (surface, device_scale, device_scale);
-#else
-	g_return_if_fail (device_scale == 1);
-#endif
 }
 
 static void
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 2db3eb2b..e08db24f 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -5707,9 +5707,7 @@ draw_surface (cairo_t 	      *cr,
 	gdouble width, height;
 	gdouble device_scale_x = 1, device_scale_y = 1;
 
-#ifdef HAVE_HIDPI_SUPPORT
 	cairo_surface_get_device_scale (surface, &device_scale_x, &device_scale_y);
-#endif
 	width = cairo_image_surface_get_width (surface) / device_scale_x;
 	height = cairo_image_surface_get_height (surface) / device_scale_y;
 
@@ -5841,9 +5839,7 @@ draw_one_page (EvView       *view,
 			return;
 		}
 
-#ifdef HAVE_HIDPI_SUPPORT
 		cairo_surface_get_device_scale (page_surface, &device_scale_x, &device_scale_y);
-#endif
 
 		if (page == current_page)
 			ev_view_set_loading (view, FALSE);
@@ -5878,9 +5874,7 @@ draw_one_page (EvView       *view,
 			scale_x = (gdouble)width / cairo_image_surface_get_width (page_surface);
 			scale_y = (gdouble)height / cairo_image_surface_get_height (page_surface);
 
-#ifdef HAVE_HIDPI_SUPPORT
 			cairo_surface_get_device_scale (page_surface, &device_scale_x, &device_scale_y);
-#endif
 
 			scale_x *= device_scale_x;
 			scale_y *= device_scale_y;
-- 
cgit v1.2.1