Fix rotation of thumbnails, ported to new API. Moved library dependencies

	* djvu/djvu-document.c: (djvu_document_thumbnails_get_thumbnail):
	* dvi/Makefile.am:
	* dvi/dvi-document.c: (dvi_document_thumbnails_get_thumbnail):
	* dvi/mdvi-lib/Makefile.am:

	Fix rotation of thumbnails, ported to new API. Moved library
	dependencies earlier, probably it will fix linkage problem.

diff --git a/ChangeLog b/ChangeLog
index 739d88c39d4df91b63a90da0a2cd17f259078aa3..073eafb64b151cef62b27a90d65b3428ac0465cc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2005-08-26  Nickolay V. Shmyrev  <nshmyrev@yandex.ru>
+
+       * djvu/djvu-document.c: (djvu_document_thumbnails_get_thumbnail):
+       * dvi/Makefile.am:
+       * dvi/dvi-document.c: (dvi_document_thumbnails_get_thumbnail):
+       * dvi/mdvi-lib/Makefile.am:
+       
+       Fix rotation of thumbnails, ported to new API. Moved library
+       dependencies earlier, probably it will fix linkage problem.
+
 Thu Aug 25 02:32:32 2005  Jonathan Blandford  <jrb@redhat.com>
 
        * backend/ev-document-misc.c:

diff --git a/djvu/djvu-document.c b/djvu/djvu-document.c
index 8257b3e328154aaaa693216c5f1d3ae97d5cf0e9..9f22537f3751fd76c558095c8f3ea24ab6496c09 100644 (file)
--- a/djvu/djvu-document.c
+++ b/djvu/djvu-document.c
@@ -259,15 +259,10 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
        
        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, TRUE, 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);
@@ -282,6 +277,12 @@ djvu_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
 
        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;
 }

diff --git a/dvi/Makefile.am b/dvi/Makefile.am
index efa83da87863dd611809931647f9535a828479e1..f9de1e4586063db48eb46a336415933ab47500a0 100644 (file)
--- a/dvi/Makefile.am
+++ b/dvi/Makefile.am
@@ -17,12 +17,8 @@ libgtkdvi_la_SOURCES = \
        fonts.c         \
        fonts.h
 
-libgtkdvi_la_LIBADD = mdvi-lib/libmdvi.la      \
-       $(DVI_LIBS) -lkpathsea
+libgtkdvi_la_LIBADD = mdvi-lib/libmdvi.la
 
-if WITH_TYPE1_FONTS
-libgtkdvi_la_LIBADD += -lt1lib
-endif
 
 
 

diff --git a/dvi/dvi-document.c b/dvi/dvi-document.c
index 1bb465c1c58b44d055221dace889109cb818d73a..d4627580259b966b10e0c89944db48b4fd4f3e38 100644 (file)
--- a/dvi/dvi-document.c
+++ b/dvi/dvi-document.c
@@ -310,19 +310,15 @@ dvi_document_thumbnails_get_thumbnail (EvDocumentThumbnails   *document,
        pixbuf = mdvi_pixbuf_device_get_pixbuf (&dvi_document->context->device);
 
        g_mutex_unlock (dvi_context_mutex);
-
-       if (border) {
-               border_pixbuf = ev_document_misc_get_thumbnail_frame (thumb_width, thumb_height, NULL);
-               gdk_pixbuf_copy_area (pixbuf, 0, 0, 
-                                     thumb_width - 2, thumb_height - 2,
-                                     border_pixbuf, 2, 2);
-               g_object_unref (pixbuf);
-               pixbuf = border_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;
 }

diff --git a/dvi/mdvi-lib/Makefile.am b/dvi/mdvi-lib/Makefile.am
index aa9ef94736f0159353c701930dae84ed7798de1e..4eec5093afb08a98f4b75b6d01cd7b244dafbefb 100644 (file)
--- a/dvi/mdvi-lib/Makefile.am
+++ b/dvi/mdvi-lib/Makefile.am
@@ -38,4 +38,9 @@ libmdvi_la_SOURCES = \
        util.c       \
        vf.c         
 
+libmdvi_la_LIBADD = \
+       -lkpathsea
 
+if WITH_TYPE1_FONTS
+libmdvi_la_LIBADD += -lt1lib
+endif