* shell/ev-metadata-manager.c: (ev_metadata_manager_init): *

[evince.git] / pdf / ev-poppler.cc

diff --git a/pdf/ev-poppler.cc b/pdf/ev-poppler.cc
index b4a6799521877a6c30733097665d29d4ec873e89..ef95956e6a6a2225b1b1f81dbad0571979067b01 100644 (file)
--- a/pdf/ev-poppler.cc
+++ b/pdf/ev-poppler.cc
@@ -247,21 +247,19 @@ 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;
+       switch (rotation) {
+       case 90:
+               orientation = POPPLER_ORIENTATION_LANDSCAPE;
+               break;
+       case 180:
+               orientation = POPPLER_ORIENTATION_UPSIDEDOWN;
+               break;
+       case 270:
+               orientation = POPPLER_ORIENTATION_SEASCAPE;
+               break;
+       default:
+               orientation = POPPLER_ORIENTATION_PORTRAIT;
        }
 
        poppler_page_set_orientation (page, orientation);
@@ -1182,8 +1180,8 @@ pdf_selection_render_selection (EvSelection      *selection,
                                GdkPixbuf       **pixbuf,
                                EvRectangle      *points,
                                EvRectangle      *old_points,
-                               guint             text,
-                               guint             base)
+                               GdkColor        *text,
+                               GdkColor        *base)
 {
        PdfDocument *pdf_document;
        double width_points, height_points;