X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=thumbnailer%2Fevince-thumbnailer.c;h=c4a02cb6b7193c31374a6c03fae05e520265a9d8;hb=27a43b9586896427e70a7423c7527337d9f56240;hp=06fdec146bd62c0aeef20718aa28f84b20f12874;hpb=5828087a754699a1f5a5e0234f706fd6e53e2648;p=evince.git

diff --git a/thumbnailer/evince-thumbnailer.c b/thumbnailer/evince-thumbnailer.c
index 06fdec14..c4a02cb6 100644
--- a/thumbnailer/evince-thumbnailer.c
+++ b/thumbnailer/evince-thumbnailer.c
@@ -16,36 +16,33 @@
    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 */
 
-#include <pdf-document.h>
-
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #include <libgnomevfs/gnome-vfs-uri.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <libgnomevfs/gnome-vfs-init.h>
 
 #include <ev-document.h>
+#include <ev-document-types.h>
 #include <ev-document-thumbnails.h>
 
 #include <string.h>
 
-#define THUMBNAIL_SIZE 100
+#define THUMBNAIL_SIZE 128
 
 static gboolean
-evince_thumbnail_pngenc_get (const char *uri, const char *thumbnail)
+evince_thumbnail_pngenc_get (const char *uri, const char *thumbnail, int size)
 {
 	EvDocument *document = NULL;
-	char *mime_type;
-	GError *error;
+	GError *error = NULL;
 	GdkPixbuf *pixbuf;
+	GType document_type;
+	char *mime_type = NULL;
 
-	mime_type = gnome_vfs_get_mime_type (uri);
-	if (mime_type == NULL)
+	document_type = ev_document_type_lookup (uri, &mime_type, &error);
+	if (document_type == G_TYPE_INVALID || error != NULL)
 		return FALSE;
 
-	if (!strcmp (mime_type, "application/pdf"))
-		document = g_object_new (PDF_TYPE_DOCUMENT, NULL);
-	else
-		return FALSE;
+	document = g_object_new (document_type, NULL);
 
 	if (!ev_document_load (document, uri, &error)) {
 		if (error->domain == EV_DOCUMENT_ERROR &&
@@ -56,30 +53,44 @@ evince_thumbnail_pngenc_get (const char *uri, const char *thumbnail)
 		return FALSE;
 	}
 
+	if (!EV_IS_DOCUMENT_THUMBNAILS (document)) {
+		return FALSE;
+	}
+
 	pixbuf = ev_document_thumbnails_get_thumbnail
-			(EV_DOCUMENT_THUMBNAILS (document), 0, THUMBNAIL_SIZE);
+			(EV_DOCUMENT_THUMBNAILS (document), 0, size, FALSE);
 	
 	if (pixbuf != NULL) {
-		GdkPixbuf *pdflogo;
-
-		pdflogo = gdk_pixbuf_new_from_file (DATADIR"/pdf-icon.png", NULL);
-		if (pdflogo != NULL) {
-			int delta_height, delta_width;
-
-			delta_width = gdk_pixbuf_get_width (pixbuf) -
-			              gdk_pixbuf_get_width (pdflogo);
-			delta_height = gdk_pixbuf_get_height (pixbuf) -
-			               gdk_pixbuf_get_height (pdflogo);
-
-			gdk_pixbuf_composite (pdflogo, pixbuf,
-					      delta_width, delta_height,
-					      gdk_pixbuf_get_width (pdflogo),
-					      gdk_pixbuf_get_height (pdflogo),
-					      delta_width, delta_height,
-					      1, 1,
-					      GDK_INTERP_NEAREST, 100);
-
-			gdk_pixbuf_unref  (pdflogo);
+		const char *overlaid_icon_name = NULL;
+
+		if (strcmp (mime_type, "application/pdf") == 0) {
+			overlaid_icon_name = "pdf-icon.png";
+		}
+
+		if (overlaid_icon_name) {
+			GdkPixbuf *overlaid_pixbuf;
+
+			gchar *overlaid_icon_path = g_strdup_printf ("%s/%s", DATADIR, overlaid_icon_name);
+			overlaid_pixbuf = gdk_pixbuf_new_from_file (overlaid_icon_path, NULL);
+			g_free (overlaid_icon_path);
+			if (overlaid_pixbuf != NULL) {
+				int delta_height, delta_width;
+				
+				delta_width = gdk_pixbuf_get_width (pixbuf) -
+					gdk_pixbuf_get_width (overlaid_pixbuf);
+				delta_height = gdk_pixbuf_get_height (pixbuf) -
+					gdk_pixbuf_get_height (overlaid_pixbuf);
+				
+				gdk_pixbuf_composite (overlaid_pixbuf, pixbuf,
+						      delta_width, delta_height,
+						      gdk_pixbuf_get_width (overlaid_pixbuf),
+						      gdk_pixbuf_get_height (overlaid_pixbuf),
+						      delta_width, delta_height,
+						      1, 1,
+						      GDK_INTERP_NEAREST, 100);
+				
+				gdk_pixbuf_unref  (overlaid_pixbuf);
+			}
 		}
 		if (gdk_pixbuf_save (pixbuf, thumbnail, "png", NULL, NULL)) {
 			gdk_pixbuf_unref  (pixbuf);
@@ -97,19 +108,36 @@ int
 main (int argc, char *argv[])
 {
 	int res;
+	char *input, *output;
+	int size;
 	char *uri;
 
-	if (argc != 3) {
-		g_print ("%s: thumbnailer for Nautilus\n", argv[0]);
-		g_print ("usage: %s <input-filename> <output-filename>\n", argv[0]);
+	if (argc <= 2 || argc > 5 || strcmp (argv[1], "-h") == 0 ||
+	    strcmp (argv[1], "--help") == 0) {
+		g_print ("Usage: %s [-s <size>] <input> <output>\n", argv[0]);
 		return -1;
 	}
 
 	res = gnome_vfs_init ();
 
-	uri = gnome_vfs_make_uri_from_shell_arg (argv[1]);
+	if (!strcmp (argv[1], "-s")) {
+		input = argv[3];
+		output = argv[4];
+		size = g_strtod (argv[2], NULL);
+	} else {
+		input = argv[1];
+		output = argv[2];
+		size = THUMBNAIL_SIZE;
+	}
+
+	if (size < 40) {
+		g_print ("Size cannot be smaller than 40 pixels\n");
+		return -1;
+	}
+
+	uri = gnome_vfs_make_uri_from_shell_arg (input);
 
-	if (evince_thumbnail_pngenc_get (uri, argv[2])) {
+	if (evince_thumbnail_pngenc_get (uri, output, size)) {
 		g_free (uri);
 		return 0;
 	} else {