Updated Ukrainian translation.

[evince.git] / djvu / djvu-document.c

diff --git a/djvu/djvu-document.c b/djvu/djvu-document.c
index d82a643f799d4e42a0aa4bbe431fb5a1c087c39d..19452499df704b0f4ad47d659034c75612ea84df 100644 (file)
--- a/djvu/djvu-document.c
+++ b/djvu/djvu-document.c
@@ -125,18 +125,17 @@ djvu_document_get_page_size (EvDocument   *document,
                    ddjvu_message_pop (djvu_document->d_context);       
        }
 
-       if (width)
-               *width = info.width * SCALE_FACTOR;
-       if (height)
-               *height = info.height * SCALE_FACTOR;
+        *width = info.width * SCALE_FACTOR; 
+        *height = info.height * SCALE_FACTOR;
 }
 
 static GdkPixbuf *
 djvu_document_render_pixbuf (EvDocument  *document, 
-                            int page, gdouble scale)
+                            EvRenderContext *rc)
 {
        DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
        GdkPixbuf *pixbuf;
+       GdkPixbuf *rotated_pixbuf;
        
        ddjvu_rect_t rrect;
        ddjvu_rect_t prect;
@@ -144,15 +143,15 @@ djvu_document_render_pixbuf (EvDocument  *document,
        
        double page_width, page_height;
 
-       d_page = ddjvu_page_create_by_pageno (djvu_document->d_document, page);
+       d_page = ddjvu_page_create_by_pageno (djvu_document->d_document, rc->page);
        
        while (!ddjvu_page_decoding_done (d_page)) {
                    ddjvu_message_wait (djvu_document->d_context);
                    ddjvu_message_pop (djvu_document->d_context);       
        }
        
-       page_width = ddjvu_page_get_width (d_page) * scale * SCALE_FACTOR;
-       page_height = ddjvu_page_get_height (d_page) * scale * SCALE_FACTOR;
+       page_width = ddjvu_page_get_width (d_page) * rc->scale * SCALE_FACTOR;
+       page_height = ddjvu_page_get_height (d_page) * rc->scale * SCALE_FACTOR;
 
        pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, page_width, page_height);
 
@@ -167,8 +166,10 @@ djvu_document_render_pixbuf (EvDocument  *document,
                          gdk_pixbuf_get_rowstride (pixbuf),
                           (gchar *)gdk_pixbuf_get_pixels (pixbuf));
        
-    
-       return pixbuf;
+       rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, rc->rotation);
+       g_object_unref (pixbuf);
+       
+       return rotated_pixbuf;
 }
 
 static void
@@ -244,11 +245,12 @@ djvu_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
 static GdkPixbuf *
 djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
                                          gint                   page,
+                                         gint                   rotation,
                                          gint                   width,
                                          gboolean               border)
 {
        DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
-       GdkPixbuf *pixbuf;
+       GdkPixbuf *pixbuf, *rotated_pixbuf;
        gint thumb_width, thumb_height;
 
        guchar *pixels;
@@ -277,8 +279,11 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
                                djvu_document->d_format,
                                gdk_pixbuf_get_rowstride (pixbuf), 
                                (gchar *)pixels);
+
+       rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, rotation);
+       g_object_unref (pixbuf);
        
-       return pixbuf;
+       return rotated_pixbuf;
 }
 
 static void