X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libview%2Fev-pixbuf-cache.c;h=74b8674f293685a68f006d165b6c29add76254f5;hb=03887c145d9614a0ca83f81d359a1e86b13b06c5;hp=1412236915185a374c8c06fafd07d187ce93ab32;hpb=43f0699bd214872e7389013214d0196a22d5368f;p=evince.git

diff --git a/libview/ev-pixbuf-cache.c b/libview/ev-pixbuf-cache.c
index 14122369..74b8674f 100644
--- a/libview/ev-pixbuf-cache.c
+++ b/libview/ev-pixbuf-cache.c
@@ -1,10 +1,6 @@
 #include <config.h>
 #include "ev-pixbuf-cache.h"
 #include "ev-job-scheduler.h"
-#include "ev-mapping.h"
-#include "ev-document-forms.h"
-#include "ev-document-images.h"
-#include "ev-document-annotations.h"
 #include "ev-view-private.h"
 
 typedef struct _CacheJobInfo
@@ -13,7 +9,7 @@ typedef struct _CacheJobInfo
 	gboolean page_ready;
 
 	/* Region of the page that needs to be drawn */
-	GdkRegion *region; 
+	cairo_region_t  *region;
 
 	/* Data we get from rendering */
 	cairo_surface_t *surface;
@@ -27,7 +23,7 @@ typedef struct _CacheJobInfo
 	gboolean         points_set;
 	
 	cairo_surface_t *selection;
-	GdkRegion *selection_region;
+	cairo_region_t  *selection_region;
 } CacheJobInfo;
 
 struct _EvPixbufCache
@@ -174,7 +170,7 @@ dispose_cache_job_info (CacheJobInfo *job_info,
 		job_info->surface = NULL;
 	}
 	if (job_info->region) {
-		gdk_region_destroy (job_info->region);
+		cairo_region_destroy (job_info->region);
 		job_info->region = NULL;
 	}
 	if (job_info->selection) {
@@ -182,7 +178,7 @@ dispose_cache_job_info (CacheJobInfo *job_info,
 		job_info->selection = NULL;
 	}
 	if (job_info->selection_region) {
-		gdk_region_destroy (job_info->selection_region);
+		cairo_region_destroy (job_info->selection_region);
 		job_info->selection_region = NULL;
 	}
 
@@ -259,12 +255,12 @@ copy_job_to_job_info (EvJobRender   *job_render,
 			job_info->selection = NULL;
 		}
 		if (job_info->selection_region) {
-			gdk_region_destroy (job_info->selection_region);
+			cairo_region_destroy (job_info->selection_region);
 			job_info->selection_region = NULL;
 		}
 
 		job_info->selection_points = job_render->selection_points;
-		job_info->selection_region = gdk_region_copy (job_render->selection_region);
+		job_info->selection_region = cairo_region_reference (job_render->selection_region);
 		job_info->selection = cairo_surface_reference (job_render->selection);
 		g_assert (job_info->selection_points.x1 >= 0);
 		job_info->points_set = TRUE;
@@ -620,21 +616,21 @@ get_selection_colors (GtkWidget *widget, GdkColor **text, GdkColor **base)
 }
 
 static void
-add_job (EvPixbufCache *pixbuf_cache,
-	 CacheJobInfo  *job_info,
-	 GdkRegion     *region,
-	 gint           width,
-	 gint           height,
-	 gint           page,
-	 gint           rotation,
-	 gfloat         scale,
-	 EvJobPriority  priority)
+add_job (EvPixbufCache  *pixbuf_cache,
+	 CacheJobInfo   *job_info,
+	 cairo_region_t *region,
+	 gint            width,
+	 gint            height,
+	 gint            page,
+	 gint            rotation,
+	 gfloat          scale,
+	 EvJobPriority   priority)
 {
 	job_info->page_ready = FALSE;
 
 	if (job_info->region)
-		gdk_region_destroy (job_info->region);
-	job_info->region = region ? gdk_region_copy (region) : NULL;
+		cairo_region_destroy (job_info->region);
+	job_info->region = region ? cairo_region_reference (region) : NULL;
 
 	job_info->job = ev_job_render_new (pixbuf_cache->document,
 					   page, rotation, scale,
@@ -869,6 +865,9 @@ ev_pixbuf_cache_clear (EvPixbufCache *pixbuf_cache)
 {
 	int i;
 
+	if (!pixbuf_cache->job_list)
+		return;
+
 	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
 		dispose_cache_job_info (pixbuf_cache->prev_job + i, pixbuf_cache);
 		dispose_cache_job_info (pixbuf_cache->next_job + i, pixbuf_cache);
@@ -885,6 +884,9 @@ ev_pixbuf_cache_style_changed (EvPixbufCache *pixbuf_cache)
 {
 	gint i;
 
+	if (!pixbuf_cache->job_list)
+		return;
+
 	/* FIXME: doesn't update running jobs. */
 	for (i = 0; i < pixbuf_cache->preload_cache_size; i++) {
 		CacheJobInfo *job_info;
@@ -914,10 +916,10 @@ ev_pixbuf_cache_style_changed (EvPixbufCache *pixbuf_cache)
 }
 
 cairo_surface_t *
-ev_pixbuf_cache_get_selection_surface (EvPixbufCache  *pixbuf_cache,
-				       gint            page,
-				       gfloat          scale,
-				       GdkRegion     **region)
+ev_pixbuf_cache_get_selection_surface (EvPixbufCache   *pixbuf_cache,
+				       gint             page,
+				       gfloat           scale,
+				       cairo_region_t **region)
 {
 	CacheJobInfo *job_info;
 
@@ -969,7 +971,7 @@ ev_pixbuf_cache_get_selection_surface (EvPixbufCache  *pixbuf_cache,
 		g_object_unref (ev_page);
 
 		if (job_info->selection_region)
-			gdk_region_destroy (job_info->selection_region);
+			cairo_region_destroy (job_info->selection_region);
 		job_info->selection_region =
 			ev_selection_get_selection_region (EV_SELECTION (pixbuf_cache->document),
 							   rc, job_info->selection_style,
@@ -1125,7 +1127,7 @@ ev_pixbuf_cache_get_selection_list (EvPixbufCache *pixbuf_cache)
 			selection->page = page;
 			selection->rect = pixbuf_cache->prev_job[i].selection_points;
 			if (pixbuf_cache->prev_job[i].selection_region)
-				selection->covered_region = gdk_region_copy (pixbuf_cache->prev_job[i].selection_region);
+				selection->covered_region = cairo_region_reference (pixbuf_cache->prev_job[i].selection_region);
 			retval = g_list_append (retval, selection);
 		}
 		
@@ -1139,7 +1141,7 @@ ev_pixbuf_cache_get_selection_list (EvPixbufCache *pixbuf_cache)
 			selection->page = page;
 			selection->rect = pixbuf_cache->job_list[i].selection_points;
 			if (pixbuf_cache->job_list[i].selection_region)
-				selection->covered_region = gdk_region_copy (pixbuf_cache->job_list[i].selection_region);
+				selection->covered_region = cairo_region_reference (pixbuf_cache->job_list[i].selection_region);
 			retval = g_list_append (retval, selection);
 		}
 		
@@ -1155,7 +1157,7 @@ ev_pixbuf_cache_get_selection_list (EvPixbufCache *pixbuf_cache)
 			selection->page = page;
 			selection->rect = pixbuf_cache->next_job[i].selection_points;
 			if (pixbuf_cache->next_job[i].selection_region)
-				selection->covered_region = gdk_region_copy (pixbuf_cache->next_job[i].selection_region);
+				selection->covered_region = cairo_region_reference (pixbuf_cache->next_job[i].selection_region);
 			retval = g_list_append (retval, selection);
 		}
 		
@@ -1166,11 +1168,11 @@ ev_pixbuf_cache_get_selection_list (EvPixbufCache *pixbuf_cache)
 }
 
 void
-ev_pixbuf_cache_reload_page (EvPixbufCache *pixbuf_cache,
-			     GdkRegion     *region,
-			     gint           page,
-			     gint           rotation,
-			     gdouble        scale)
+ev_pixbuf_cache_reload_page (EvPixbufCache  *pixbuf_cache,
+			     cairo_region_t *region,
+			     gint            page,
+			     gint            rotation,
+			     gdouble         scale)
 {
 	CacheJobInfo *job_info;
         gint width, height;