X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=pdf%2Fev-poppler.cc;h=769c78a7a1f684973f1e3eaf0b1a742344e158f5;hb=9f8ec2d921de1c31da212c8486ab2bda85d51bf9;hp=07f1028c2be053e6c5c5b8828ea8507a18f29a10;hpb=41229e9ef5135c93176acb6320f96abc7d624b0a;p=evince.git diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc index 07f1028c..769c78a7 100644 --- a/pdf/ev-poppler.cc +++ b/pdf/ev-poppler.cc @@ -103,6 +103,20 @@ G_DEFINE_TYPE_WITH_CODE (PdfDocument, pdf_document, G_TYPE_OBJECT, pdf_selection_iface_init); }); + +static void +set_rc_data (PdfDocument *pdf_document, + EvRenderContext *rc) +{ + if (rc->data == NULL) { + rc->data = poppler_document_get_page (pdf_document->document, + rc->page); + rc->destroy = g_object_unref; + } else { + g_assert (rc->page == poppler_page_get_index (POPPLER_PAGE (rc->data))); + } +} + static void pdf_document_search_free (PdfDocumentSearch *search) { @@ -229,30 +243,6 @@ pdf_document_get_n_pages (EvDocument *document) return poppler_document_get_n_pages (PDF_DOCUMENT (document)->document); } -static void -set_page_orientation (PdfDocument *pdf_document, PopplerPage *page, int rotation) -{ - PopplerOrientation orientation; - int r = rotation; - - orientation = poppler_page_get_orientation (page); - - while (r > 0) { - if (orientation == POPPLER_ORIENTATION_PORTRAIT) { - orientation = POPPLER_ORIENTATION_LANDSCAPE; - } else if (orientation == POPPLER_ORIENTATION_LANDSCAPE) { - orientation = POPPLER_ORIENTATION_UPSIDEDOWN; - } else if (orientation == POPPLER_ORIENTATION_UPSIDEDOWN) { - orientation = POPPLER_ORIENTATION_SEASCAPE; - } else { - orientation = POPPLER_ORIENTATION_PORTRAIT; - } - r -= 90; - } - - poppler_page_set_orientation (page, orientation); -} - static void pdf_document_get_page_size (EvDocument *document, int page, @@ -330,31 +320,35 @@ pdf_document_render_pixbuf (EvDocument *document, EvRenderContext *rc) { PdfDocument *pdf_document; - PopplerPage *poppler_page; GdkPixbuf *pixbuf; double width_points, height_points; gint width, height; pdf_document = PDF_DOCUMENT (document); - poppler_page = poppler_document_get_page (pdf_document->document, - rc->page); - set_page_orientation (pdf_document, poppler_page, rc->rotation); - poppler_page_get_size (poppler_page, &width_points, &height_points); - width = (int) ((width_points * rc->scale) + 0.5); - height = (int) ((height_points * rc->scale) + 0.5); + set_rc_data (pdf_document, rc); + + poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points); + + if (rc->rotation == 90 || rc->rotation == 270) { + width = (int) ((height_points * rc->scale) + 0.5); + height = (int) ((width_points * rc->scale) + 0.5); + } else { + width = (int) ((width_points * rc->scale) + 0.5); + height = (int) ((height_points * rc->scale) + 0.5); + } pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height); - poppler_page_render_to_pixbuf (poppler_page, + poppler_page_render_to_pixbuf (POPPLER_PAGE (rc->data), 0, 0, width, height, rc->scale, + rc->rotation, pixbuf); - g_object_unref (poppler_page); return pixbuf; } @@ -709,18 +703,94 @@ pdf_document_links_has_document_links (EvDocumentLinks *document_links) } static EvLink * -ev_link_from_action (PopplerAction *action) +ev_link_from_dest (PopplerAction *action) { EvLink *link; + 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); + } + + 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 = 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); } @@ -807,7 +877,6 @@ make_thumbnail_for_size (PdfDocument *pdf_document, gdouble unscaled_width, unscaled_height; poppler_page = poppler_document_get_page (pdf_document->document, page); - set_page_orientation (pdf_document, poppler_page, rotation); g_return_val_if_fail (poppler_page != NULL, NULL); pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page, @@ -816,12 +885,22 @@ make_thumbnail_for_size (PdfDocument *pdf_document, scale = width / unscaled_width; if (border) { - pixbuf = ev_document_misc_get_thumbnail_frame (width, height, NULL); + 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); @@ -832,7 +911,7 @@ make_thumbnail_for_size (PdfDocument *pdf_document, poppler_page_render_to_pixbuf (poppler_page, 0, 0, width, height, - scale, sub_pixbuf); + scale, rotation, sub_pixbuf); g_object_unref (G_OBJECT (sub_pixbuf)); @@ -854,7 +933,6 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails pdf_document = PDF_DOCUMENT (document_thumbnails); poppler_page = poppler_document_get_page (pdf_document->document, page); - set_page_orientation (pdf_document, poppler_page, rotation); g_return_val_if_fail (poppler_page != NULL, NULL); pixbuf = poppler_page_get_thumbnail (poppler_page); @@ -864,7 +942,7 @@ pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails if (border) { GdkPixbuf *real_pixbuf; - real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, pixbuf); + real_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, rotation, pixbuf); g_object_unref (pixbuf); pixbuf = real_pixbuf; } @@ -1141,7 +1219,6 @@ pdf_document_ps_exporter_do_page (EvPSExporter *exporter, EvRenderContext *rc) g_return_if_fail (pdf_document->ps_file != NULL); poppler_page = poppler_document_get_page (pdf_document->document, rc->page); - set_page_orientation (pdf_document, poppler_page, rc->rotation); poppler_page_render_to_ps (poppler_page, pdf_document->ps_file); g_object_unref (poppler_page); } @@ -1169,19 +1246,18 @@ pdf_selection_render_selection (EvSelection *selection, EvRenderContext *rc, GdkPixbuf **pixbuf, EvRectangle *points, - EvRectangle *old_points) + EvRectangle *old_points, + GdkColor *text, + GdkColor *base) { PdfDocument *pdf_document; - PopplerPage *poppler_page; double width_points, height_points; gint width, height; pdf_document = PDF_DOCUMENT (selection); - poppler_page = poppler_document_get_page (pdf_document->document, - rc->page); - set_page_orientation (pdf_document, poppler_page, rc->rotation); + set_rc_data (pdf_document, rc); - poppler_page_get_size (poppler_page, &width_points, &height_points); + poppler_page_get_size (POPPLER_PAGE (rc->data), &width_points, &height_points); width = (int) ((width_points * rc->scale) + 0.5); height = (int) ((height_points * rc->scale) + 0.5); @@ -1191,12 +1267,12 @@ pdf_selection_render_selection (EvSelection *selection, width, height); } - poppler_page_render_selection (poppler_page, - rc->scale, *pixbuf, + poppler_page_render_selection (POPPLER_PAGE (rc->data), + rc->scale, rc->rotation, *pixbuf, (PopplerRectangle *)points, - (PopplerRectangle *)old_points); - g_object_unref (poppler_page); - + (PopplerRectangle *)old_points, + text, + base); } @@ -1206,16 +1282,13 @@ pdf_selection_get_selection_region (EvSelection *selection, EvRectangle *points) { PdfDocument *pdf_document; - PopplerPage *poppler_page; GdkRegion *retval; pdf_document = PDF_DOCUMENT (selection); - poppler_page = poppler_document_get_page (pdf_document->document, - rc->page); - set_page_orientation (pdf_document, poppler_page, rc->rotation); - retval = poppler_page_get_selection_region (poppler_page, rc->scale, (PopplerRectangle *) points); - g_object_unref (poppler_page); + set_rc_data (pdf_document, rc); + + retval = poppler_page_get_selection_region ((PopplerPage *)rc->data, rc->scale, (PopplerRectangle *) points); return retval; } @@ -1232,7 +1305,6 @@ pdf_selection_get_selection_map (EvSelection *selection, pdf_document = PDF_DOCUMENT (selection); poppler_page = poppler_document_get_page (pdf_document->document, rc->page); - set_page_orientation (pdf_document, poppler_page, rc->rotation); points.x1 = 0.0; points.y1 = 0.0;