Make CVS silent

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

diff --git a/djvu/djvu-document.c b/djvu/djvu-document.c
index 8257b3e328154aaaa693216c5f1d3ae97d5cf0e9..135d81cfa144bf97e75a5f2108f85fe00070eaf5 100644 (file)
--- a/djvu/djvu-document.c
+++ b/djvu/djvu-document.c
@@ -44,6 +44,8 @@ struct _DjvuDocument
        ddjvu_context_t  *d_context;
        ddjvu_document_t *d_document;
        ddjvu_format_t   *d_format;
        ddjvu_context_t  *d_context;
        ddjvu_document_t *d_document;
        ddjvu_format_t   *d_format;

+       
+       gchar *uri;

 };
 
 typedef struct _DjvuDocumentClass DjvuDocumentClass;
 };
 
 typedef struct _DjvuDocumentClass DjvuDocumentClass;


@@ -85,6 +87,8 @@ djvu_document_load (EvDocument  *document,
                    ddjvu_message_wait (djvu_document->d_context);
                    ddjvu_message_pop (djvu_document->d_context);       
        }
                    ddjvu_message_wait (djvu_document->d_context);
                    ddjvu_message_pop (djvu_document->d_context);       
        }

+       g_free (djvu_document->uri);
+       djvu_document->uri = g_strdup (uri);

 
        return TRUE;
 }
 
        return TRUE;
 }


@@ -95,8 +99,9 @@ djvu_document_save (EvDocument  *document,
                      const char  *uri,
                      GError     **error)
 {
                      const char  *uri,
                      GError     **error)
 {

-       g_warning ("djvu_document_save not implemented"); /* FIXME */
-       return TRUE;
+       DjvuDocument *djvu_document = DJVU_DOCUMENT (document);
+
+       return ev_xfer_uri_simple (djvu_document->uri, uri, error);

 }
 
 static int
 }
 
 static int


@@ -182,6 +187,7 @@ djvu_document_finalize (GObject *object)
 
        ddjvu_context_release (djvu_document->d_context);
        ddjvu_format_release (djvu_document->d_format);
 
        ddjvu_context_release (djvu_document->d_context);
        ddjvu_format_release (djvu_document->d_format);

+       g_free (djvu_document->uri);

        
        G_OBJECT_CLASS (djvu_document_parent_class)->finalize (object);
 }
        
        G_OBJECT_CLASS (djvu_document_parent_class)->finalize (object);
 }


@@ -259,15 +265,10 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
        
        djvu_document_thumbnails_get_dimensions (document, page, width, &thumb_width, &thumb_height);
        
        
        djvu_document_thumbnails_get_dimensions (document, page, width, &thumb_width, &thumb_height);
        

-       if (border) {
-               pixbuf = ev_document_misc_get_thumbnail_frame (thumb_width, thumb_height, NULL);
-               pixels = gdk_pixbuf_get_pixels (pixbuf) + gdk_pixbuf_get_rowstride (pixbuf) + 4;
-       } else {
-               pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
-                                        thumb_width, thumb_height);
-               gdk_pixbuf_fill (pixbuf, 0xffffffff);
-               pixels = gdk_pixbuf_get_pixels (pixbuf);
-       }
+       pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
+                                thumb_width, thumb_height);
+       gdk_pixbuf_fill (pixbuf, 0xffffffff);
+       pixels = gdk_pixbuf_get_pixels (pixbuf);

        
        while (ddjvu_thumbnail_status (djvu_document->d_document, page, 1) < DDJVU_JOB_OK) {
                    ddjvu_message_wait (djvu_document->d_context);
        
        while (ddjvu_thumbnail_status (djvu_document->d_document, page, 1) < DDJVU_JOB_OK) {
                    ddjvu_message_wait (djvu_document->d_context);


@@ -282,6 +283,12 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 
        rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rotation);
        g_object_unref (pixbuf);
 
        rotated_pixbuf = gdk_pixbuf_rotate_simple (pixbuf, 360 - rotation);
        g_object_unref (pixbuf);

+
+        if (border) {
+             GdkPixbuf *tmp_pixbuf = rotated_pixbuf;
+             rotated_pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, 0, tmp_pixbuf);
+             g_object_unref (tmp_pixbuf);
+       }

        
        return rotated_pixbuf;
 }
        
        return rotated_pixbuf;
 }