X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=backend%2Fcomics%2Fcomics-document.c;h=77e6fabd5a4d66d8aeef07c5fec5cb3e375ada4b;hb=71cea58275509f85d7d93fa5b8939590b025767b;hp=e0fdd31ef781b0223b05afa746cbf11001efede9;hpb=1d6150237848b4c1fede94ce23baa4fd8870fd93;p=evince.git

diff --git a/backend/comics/comics-document.c b/backend/comics/comics-document.c
index e0fdd31e..77e6fabd 100644
--- a/backend/comics/comics-document.c
+++ b/backend/comics/comics-document.c
@@ -72,7 +72,7 @@ comics_regex_quote (const char *s)
 {
     char *ret, *d;
 
-    d = ret = g_malloc (strlen (s) * 2 + 3);
+    d = ret = g_malloc (strlen (s) * 4 + 3);
     
     *d++ = '\'';
 
@@ -85,7 +85,9 @@ comics_regex_quote (const char *s)
 	case '*':
 	case '\\':
 	case '\'':
+	    *d++ = '\'';
 	    *d++ = '\\';
+	    *d++ = '\'';
 	    break;
 	}
 	*d = *s;
@@ -266,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;
@@ -307,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,
@@ -317,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);
 }
@@ -350,12 +367,6 @@ comics_document_class_init (ComicsDocumentClass *klass)
 	gobject_class->finalize = comics_document_finalize;
 }
 
-static gboolean
-comics_document_can_get_text (EvDocument *document)
-{
-	return FALSE;
-}
-
 static EvDocumentInfo *
 comics_document_get_info (EvDocument *document)
 {
@@ -369,11 +380,10 @@ 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->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
@@ -461,6 +471,7 @@ extract_argv (EvDocument *document, gint page)
 	ComicsDocument *comics_document = COMICS_DOCUMENT (document);
 	char **argv;
 	char *command_line, *quoted_archive, *quoted_filename;
+	GError *err = NULL;
 
 	quoted_archive = g_shell_quote (comics_document->archive);
 	if (comics_document->regex_arg) {
@@ -475,8 +486,14 @@ extract_argv (EvDocument *document, gint page)
 					comics_document->extract_command,
 					quoted_archive,
 					quoted_filename);
-	g_shell_parse_argv (command_line, NULL, &argv, NULL);
 
+	g_shell_parse_argv (command_line, NULL, &argv, &err);
+	
+	if (err) {
+		g_warning ("Error %s", err->message);
+		return NULL;
+	}
+	
 	g_free (command_line);
 	g_free (quoted_archive);
 	g_free (quoted_filename);