]> www.fi.muni.cz Git - evince.git/blobdiff - pdf/ev-poppler.cc
Fixed distcheck and moved uk figure to correct folder
[evince.git] / pdf / ev-poppler.cc
index 08b811b3418079d2526b8ef40dc9428dc49c5b8b..bbcb978120ff4a82f2025302ede323cab6803b71 100644 (file)
@@ -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)
 {
@@ -204,24 +218,6 @@ pdf_document_save (EvDocument  *document,
        return retval;
 }
 
-static PopplerOrientation
-get_document_orientation (PdfDocument *pdf_document)
-{
-       PopplerOrientation orientation;
-       PopplerPage *page;
-
-       /* Should prolly be smarter here and check more than first page */
-       page = poppler_document_get_page (pdf_document->document, 0);
-       if (page) {
-               orientation = poppler_page_get_orientation (page);
-       } else {
-               orientation = POPPLER_ORIENTATION_PORTRAIT;
-       }
-       g_object_unref (page);
-
-       return orientation;
-}
-
 static gboolean
 pdf_document_load (EvDocument   *document,
                   const char   *uri,
@@ -247,32 +243,6 @@ pdf_document_get_n_pages (EvDocument *document)
        return poppler_document_get_n_pages (PDF_DOCUMENT (document)->document);
 }
 
-/* FIXME This should not be necessary, poppler should rember it */
-static void
-set_page_orientation (PdfDocument *pdf_document, PopplerPage *page, EvOrientation orientation)
-{
-       PopplerOrientation poppler_orientation;
-
-       switch (orientation) {
-               case EV_ORIENTATION_PORTRAIT:
-                       poppler_orientation = POPPLER_ORIENTATION_PORTRAIT;
-                       break;
-               case EV_ORIENTATION_LANDSCAPE:
-                       poppler_orientation = POPPLER_ORIENTATION_LANDSCAPE;
-                       break;
-               case EV_ORIENTATION_UPSIDEDOWN:
-                       poppler_orientation = POPPLER_ORIENTATION_UPSIDEDOWN;
-                       break;
-               case EV_ORIENTATION_SEASCAPE:
-                       poppler_orientation = POPPLER_ORIENTATION_SEASCAPE;
-                       break;
-               default:
-                       g_assert_not_reached ();
-       }
-
-       poppler_page_set_orientation (page, poppler_orientation);
-}
-
 static void
 pdf_document_get_page_size (EvDocument   *document,
                            int           page,
@@ -350,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->orientation);
 
-       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;
 }
@@ -568,32 +542,6 @@ pdf_document_get_text (EvDocument *document, int page, EvRectangle *rect)
        return text;
 }
 
-static EvOrientation
-pdf_document_get_orientation (EvDocument *document)
-{
-       EvOrientation result;
-       PdfDocument *pdf_document = PDF_DOCUMENT (document);
-
-       switch (get_document_orientation (pdf_document)) {
-       case POPPLER_ORIENTATION_PORTRAIT:
-               result = EV_ORIENTATION_PORTRAIT;
-               break;
-       case POPPLER_ORIENTATION_LANDSCAPE:
-               result = EV_ORIENTATION_LANDSCAPE;
-               break;
-       case POPPLER_ORIENTATION_UPSIDEDOWN:
-               result = EV_ORIENTATION_UPSIDEDOWN;
-               break;
-       case POPPLER_ORIENTATION_SEASCAPE:
-               result = EV_ORIENTATION_SEASCAPE;
-               break;
-       default:
-               g_assert_not_reached ();
-       }
-
-       return result;
-}
-
 static void
 pdf_document_document_iface_init (EvDocumentIface *iface)
 {
@@ -607,7 +555,6 @@ pdf_document_document_iface_init (EvDocumentIface *iface)
        iface->get_text = pdf_document_get_text;
        iface->can_get_text = pdf_document_can_get_text;
        iface->get_info = pdf_document_get_info;
-       iface->get_orientation = pdf_document_get_orientation;
 };
 
 static void
@@ -843,7 +790,7 @@ pdf_document_document_links_iface_init (EvDocumentLinksIface *iface)
 static GdkPixbuf *
 make_thumbnail_for_size (PdfDocument   *pdf_document,
                         gint           page,
-                        EvOrientation  orientation,
+                        int            rotation,
                         gint           size,
                         gboolean       border)
 {
@@ -854,7 +801,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, orientation);
        g_return_val_if_fail (poppler_page != NULL, NULL);
 
        pdf_document_thumbnails_get_dimensions (EV_DOCUMENT_THUMBNAILS (pdf_document), page,
@@ -863,12 +809,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);
@@ -879,7 +835,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));
 
@@ -890,7 +846,7 @@ make_thumbnail_for_size (PdfDocument   *pdf_document,
 static GdkPixbuf *
 pdf_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document_thumbnails,
                                       gint                  page,
-                                      EvOrientation         orientation,
+                                      gint                  rotation,
                                       gint                  size,
                                       gboolean              border)
 {
@@ -901,7 +857,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, orientation);
        g_return_val_if_fail (poppler_page != NULL, NULL);
 
        pixbuf = poppler_page_get_thumbnail (poppler_page);
@@ -911,13 +866,13 @@ 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;
                }
        } else {
                /* There is no provided thumbnail.  We need to make one. */
-               pixbuf = make_thumbnail_for_size (pdf_document, page, orientation, size, border);
+               pixbuf = make_thumbnail_for_size (pdf_document, page, rotation, size, border);
        }
 
        g_object_unref (poppler_page);
@@ -1188,7 +1143,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->orientation);
        poppler_page_render_to_ps (poppler_page, pdf_document->ps_file);
        g_object_unref (poppler_page);
 }
@@ -1216,19 +1170,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->orientation);
+       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);
 
@@ -1238,12 +1191,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);
 }
 
 
@@ -1253,16 +1206,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->orientation);
 
-       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;
 }
@@ -1279,7 +1229,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->orientation);
 
        points.x1 = 0.0;
        points.y1 = 0.0;