X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fev-poppler.cc;h=1dcc7a5e98ac2f726a7b30da4385de692e220e18;hb=6aff12024a5c291d0eaf0dd3ab601b2a4b30d521;hp=bbcb978120ff4a82f2025302ede323cab6803b71;hpb=9a1a3b315f05568f6e28f64f685338dc120d5491;p=evince.git

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index bbcb9781..1dcc7a5e 100644
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -702,19 +702,97 @@ pdf_document_links_has_document_links (EvDocumentLinks *document_links)
 	return TRUE;
 }
 
+static EvLink *
+ev_link_from_dest (PopplerAction *action)
+{
+	EvLink *link = NULL;
+	const char *unimplemented_dest = NULL;
+
+	switch (action->goto_dest.dest->type) {
+	case POPPLER_DEST_UNKNOWN:
+		unimplemented_dest = "POPPLER_DEST_UNKNOWN";
+		break;
+	case POPPLER_DEST_XYZ:
+		link = ev_link_new_page_xyz (action->any.title,
+					     action->goto_dest.dest->page_num - 1,
+					     action->goto_dest.dest->left,
+					     action->goto_dest.dest->top,
+					     action->goto_dest.dest->zoom);
+		break;
+	case POPPLER_DEST_FIT:
+		unimplemented_dest = "POPPLER_DEST_FIT";
+		break;
+	case POPPLER_DEST_FITH:
+		unimplemented_dest = "POPPLER_DEST_FITH";
+		break;
+	case POPPLER_DEST_FITV:
+		unimplemented_dest = "POPPLER_DEST_FITV";
+		break;
+	case POPPLER_DEST_FITR:
+		unimplemented_dest = "POPPLER_DEST_FITR";
+		break;
+	case POPPLER_DEST_FITB:
+		unimplemented_dest = "POPPLER_DEST_FITB";
+		break;
+	case POPPLER_DEST_FITBH:
+		unimplemented_dest = "POPPLER_DEST_FITBH";
+		break;
+	case POPPLER_DEST_FITBV:
+		unimplemented_dest = "POPPLER_DEST_FITBV";
+		break;
+	}
+
+	if (unimplemented_dest) {
+		g_warning ("Unimplemented destination: %s, please post a bug report with a testcase.",
+			   unimplemented_dest);
+	}
+
+	if (link == NULL) {
+		link = ev_link_new_page (action->any.title, action->goto_dest.dest->page_num - 1);
+	}
+
+	return link;
+}
+
 static EvLink *
 ev_link_from_action (PopplerAction *action)
 {
-	EvLink *link;
+	EvLink *link = NULL;
 	const char *title;
+	const char *unimplemented_action = NULL;
 
 	title = action->any.title;
-	
-	if (action->type == POPPLER_ACTION_GOTO_DEST) {
-		link = ev_link_new_page (title, action->goto_dest.dest->page_num - 1);
-	} else if (action->type == POPPLER_ACTION_URI) {
+
+	switch (action->type) {
+	case POPPLER_ACTION_UNKNOWN:
+		g_warning ("Unknown action"); 
+		break;
+	case POPPLER_ACTION_GOTO_DEST:
+		link = ev_link_from_dest (action);
+		break;
+	case POPPLER_ACTION_GOTO_REMOTE:
+		unimplemented_action = "POPPLER_ACTION_GOTO_REMOTE";
+		break;
+	case POPPLER_ACTION_LAUNCH:
+		unimplemented_action = "POPPLER_ACTION_LAUNCH";
+		break;
+	case POPPLER_ACTION_URI:
 		link = ev_link_new_external (title, action->uri.uri);
-	} else {
+		break;
+	case POPPLER_ACTION_NAMED:
+		unimplemented_action = "POPPLER_ACTION_NAMED";
+		break;
+	case POPPLER_ACTION_MOVIE:
+		unimplemented_action = "POPPLER_ACTION_MOVIE";
+		break;
+	}
+
+	if (unimplemented_action) {
+		g_warning ("Unimplemented action: %s, please post a bug report with a testcase.",
+			   unimplemented_action);
+	}
+
+	if (link == NULL) {
 		link = ev_link_new_title (title);
 	}
 
@@ -795,7 +873,7 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
 			 gboolean       border)
 {
 	PopplerPage *poppler_page;
-	GdkPixbuf *pixbuf, *sub_pixbuf;
+	GdkPixbuf *pixbuf, *border_pixbuf;
 	int width, height;
 	double scale;
 	gdouble unscaled_width, unscaled_height;
@@ -808,38 +886,30 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
 	poppler_page_get_size (poppler_page, &unscaled_width, &unscaled_height);
 	scale = width / unscaled_width;
 
-	if (border) {
-		pixbuf = ev_document_misc_get_thumbnail_frame (width, height, rotation, NULL);
-
-		width = gdk_pixbuf_get_width (pixbuf);
-		height = gdk_pixbuf_get_height (pixbuf);
-		sub_pixbuf = gdk_pixbuf_new_subpixbuf (pixbuf,
-						       1, 1,
-						       width - 1, height - 1);
-	} else {
-		/* rotate */
-		if (rotation == 90 || rotation == 270) {
-			int temp;
-			temp = width;
-			width = height;
-			height = temp;
-		}
-
-		pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-					 width, height);
-		gdk_pixbuf_fill (pixbuf, 0xffffffff);
-		sub_pixbuf = gdk_pixbuf_new_subpixbuf (pixbuf,
-						       0, 0,
-						       width, height);
+	/* rotate */
+	if (rotation == 90 || rotation == 270) {
+		int temp;
+		temp = width;
+		width = height;
+		height = temp;
 	}
 
+	pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
+				 width, height);
+	gdk_pixbuf_fill (pixbuf, 0xffffffff);
+
 	poppler_page_render_to_pixbuf (poppler_page, 0, 0,
 				       width, height,
-				       scale, rotation, sub_pixbuf);
-
-	g_object_unref (G_OBJECT (sub_pixbuf));
+				       scale, rotation, pixbuf);
+       
+        if (border) {		
+		border_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf);
+		g_object_unref (pixbuf);
+		pixbuf = border_pixbuf;
+	}		
 
 	g_object_unref (poppler_page);
+
 	return pixbuf;
 }