tiff: Set stopOnError to zero on TIFFReadRGBAImageOriented() calls

[evince.git] / backend / tiff / tiff-document.c

diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index 9c113b49638591c04fdd830eab64e278e4d1110b..ca40397111d18c8b18a52e294b27a2ca8fb8e28c 100644 (file)
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -31,7 +31,6 @@
 #include "tiff2ps.h"
 #include "tiff-document.h"
 #include "ev-document-misc.h"
-#include "ev-document-thumbnails.h"
 #include "ev-file-exporter.h"
 #include "ev-file-helpers.h"
 
@@ -53,13 +52,10 @@ struct _TiffDocument
 
 typedef struct _TiffDocumentClass TiffDocumentClass;
 
-static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface);
 static void tiff_document_document_file_exporter_iface_init (EvFileExporterInterface *iface);
 
 EV_BACKEND_REGISTER_WITH_CODE (TiffDocument, tiff_document,
                         {
-                          EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                                          tiff_document_document_thumbnails_iface_init);
                           EV_BACKEND_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
                                                           tiff_document_document_file_exporter_iface_init);
                         });
@@ -95,7 +91,21 @@ tiff_document_load (EvDocument  *document,
                return FALSE;
        
        push_handlers ();
+
+#ifdef G_OS_WIN32
+{
+       wchar_t *wfilename = g_utf8_to_utf16 (filename, -1, NULL, NULL, error);
+       if (wfilename == NULL) {
+               return FALSE;
+       }
+
+       tiff = TIFFOpenW (wfilename, "r");
+
+       g_free (wfilename);
+}
+#else
        tiff = TIFFOpen (filename, "r");
+#endif
        if (tiff) {
                guint32 w, h;
                
@@ -283,7 +293,7 @@ tiff_document_render (EvDocument      *document,
        TIFFReadRGBAImageOriented (tiff_document->tiff,
                                   width, height,
                                   (uint32 *)pixels,
-                                  orientation, 1);
+                                  orientation, 0);
        pop_handlers ();
 
        /* Convert the format returned by libtiff to
@@ -312,7 +322,7 @@ tiff_document_render (EvDocument      *document,
 }
 
 static GdkPixbuf *
-tiff_document_render_pixbuf (EvDocument      *document,
+tiff_document_get_thumbnail (EvDocument      *document,
                             EvRenderContext *rc)
 {
        TiffDocument *tiff_document = TIFF_DOCUMENT (document);
@@ -368,7 +378,7 @@ tiff_document_render_pixbuf (EvDocument      *document,
        TIFFReadRGBAImageOriented (tiff_document->tiff,
                                   width, height,
                                   (uint32 *)pixels,
-                                  ORIENTATION_TOPLEFT, 1);
+                                  ORIENTATION_TOPLEFT, 0);
        pop_handlers ();
 
        scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
@@ -424,56 +434,10 @@ tiff_document_class_init (TiffDocumentClass *klass)
        ev_document_class->get_n_pages = tiff_document_get_n_pages;
        ev_document_class->get_page_size = tiff_document_get_page_size;
        ev_document_class->render = tiff_document_render;
+       ev_document_class->get_thumbnail = tiff_document_get_thumbnail;
        ev_document_class->get_page_label = tiff_document_get_page_label;
 }
 
-static GdkPixbuf *
-tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
-                                       EvRenderContext      *rc, 
-                                       gboolean              border)
-{
-       GdkPixbuf *pixbuf;
-
-       pixbuf = tiff_document_render_pixbuf (EV_DOCUMENT (document), rc);
-       
-       if (border) {
-               GdkPixbuf *tmp_pixbuf = pixbuf;
-               
-               pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, tmp_pixbuf);
-               g_object_unref (tmp_pixbuf);
-       }
-       
-       return pixbuf;
-}
-
-static void
-tiff_document_thumbnails_get_dimensions (EvDocumentThumbnails *document,
-                                        EvRenderContext      *rc, 
-                                        gint                 *width,
-                                        gint                 *height)
-{
-       gdouble page_width, page_height;
-
-       tiff_document_get_page_size (EV_DOCUMENT (document),
-                                    rc->page,
-                                    &page_width, &page_height);
-
-       if (rc->rotation == 90 || rc->rotation == 270) {
-               *width = (gint) (page_height * rc->scale);
-               *height = (gint) (page_width * rc->scale);
-       } else {
-               *width = (gint) (page_width * rc->scale);
-               *height = (gint) (page_height * rc->scale);
-       }
-}
-
-static void
-tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsInterface *iface)
-{
-       iface->get_thumbnail = tiff_document_thumbnails_get_thumbnail;
-       iface->get_dimensions = tiff_document_thumbnails_get_dimensions;
-}
-
 /* postscript exporter implementation */
 static void
 tiff_document_file_exporter_begin (EvFileExporter        *exporter,