From 217797d63b2d3b1c9a7a0511af1bbf3d99f0d482 Mon Sep 17 00:00:00 2001
From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Wed, 13 Jun 2007 08:54:53 +0000
Subject: Use cairo image surfaces instead of GDK pixbufs for drawing pages and

2007-06-13  Carlos Garcia Campos  <carlosgc@gnome.org>
	* backend/dvi/dvi-document.c: (dvi_document_render),
	(dvi_document_render_pixbuf), (dvi_document_document_iface_init):
	* backend/impress/impress-document.c:
	(imp_render_get_from_drawable), (impress_document_render_pixbuf),
	(impress_document_render), (impress_document_document_iface_init),
	(impress_document_thumbnails_get_thumbnail):
	* backend/djvu/djvu-document-private.h:
	* backend/djvu/djvu-document.c: (djvu_document_render),
	(djvu_document_finalize), (djvu_document_document_iface_init),
	(djvu_document_thumbnails_get_thumbnail), (djvu_document_init):
	* backend/tiff/tiff-document.c: (tiff_document_render),
	(tiff_document_render_pixbuf),
	(tiff_document_document_iface_init):
	* backend/pdf/ev-poppler.cc: (pdf_document_render),
	(pdf_document_render_pixbuf), (pdf_document_document_iface_init),
	(pdf_selection_render_selection):
	* backend/comics/comics-document.c:
	(comics_document_render_pixbuf), (comics_document_render),
	(comics_document_document_iface_init):
	* backend/pixbuf/pixbuf-document.c: (pixbuf_document_render),
	(pixbuf_document_document_iface_init):
	* libdocument/ev-document-misc.[ch]:
	(ev_document_misc_surface_from_pixbuf),
	(ev_document_misc_surface_rotate_and_scale):
	* libdocument/ev-document.[ch]: (ev_document_render):
	* libdocument/ev-selection.[ch]: (ev_selection_render_selection):
	* shell/ev-pixbuf-cache.[ch]: (dispose_cache_job_info),
	(move_one_job), (copy_job_to_job_info), (add_job_if_needed),
	(ev_pixbuf_cache_get_surface), (new_selection_surface_needed),
	(clear_selection_if_needed), (ev_pixbuf_cache_style_changed),
	(ev_pixbuf_cache_get_selection_surface), (clear_job_selection):
	* shell/ev-jobs.[ch]: (ev_job_render_dispose),
	(render_finished_cb), (ev_job_render_run):
	* shell/ev-view.c: (draw_loading_text), (draw_one_page),
	(merge_selection_region):
	Use cairo image surfaces instead of GDK pixbufs for drawing pages
	and selections.

svn path=/trunk/; revision=2499
---
(limited to 'backend/comics')

diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index 64bd2b7..092d8c2 100644
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -268,7 +268,7 @@ get_page_size_area_prepared_cb (GdkPixbufLoader *loader,
 }
 
 static GdkPixbuf *
-comics_document_render_pixbuf (EvDocument  *document,
+comics_document_render_pixbuf (EvDocument      *document,
 			       EvRenderContext *rc)
 {
 	GdkPixbufLoader *loader;
@@ -309,9 +309,24 @@ comics_document_render_pixbuf (EvDocument  *document,
 						   360 - rc->rotation);
 	g_spawn_close_pid (child_pid);
 	g_object_unref (loader);
+
 	return rotated_pixbuf;
 }
 
+static cairo_surface_t *
+comics_document_render (EvDocument      *document,
+			EvRenderContext *rc)
+{
+	GdkPixbuf       *pixbuf;
+	cairo_surface_t *surface;
+
+	pixbuf = comics_document_render_pixbuf (document, rc);
+	surface = ev_document_misc_surface_from_pixbuf (pixbuf);
+	g_object_unref (pixbuf);
+	
+	return surface;
+}
+
 static void
 render_pixbuf_size_prepared_cb (GdkPixbufLoader *loader,
 				gint             width,
@@ -319,8 +334,8 @@ render_pixbuf_size_prepared_cb (GdkPixbufLoader *loader,
 				gpointer         data)
 {
 	double *scale = data;
-	int w = width  * (*scale);
-	int h = height * (*scale);
+	int w = (width  * (*scale) + 0.5);
+	int h = (height * (*scale) + 0.5);
 
 	gdk_pixbuf_loader_set_size (loader, w, h);
 }
@@ -371,11 +386,11 @@ comics_document_document_iface_init (EvDocumentIface *iface)
 {
 	iface->load = comics_document_load;
 	iface->save = comics_document_save;
-	iface->can_get_text  = comics_document_can_get_text;
-	iface->get_n_pages   = comics_document_get_n_pages;
+	iface->can_get_text = comics_document_can_get_text;
+	iface->get_n_pages = comics_document_get_n_pages;
 	iface->get_page_size = comics_document_get_page_size;
-	iface->render_pixbuf = comics_document_render_pixbuf;
-	iface->get_info      = comics_document_get_info;
+	iface->render = comics_document_render;
+	iface->get_info = comics_document_get_info;
 }
 
 static void
--
cgit v0.9.1