Fixes bug #542924. Makes enums static to fix Solaris build.

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

diff --git a/backend/tiff/tiff-document.c b/backend/tiff/tiff-document.c
index 34275c13d3886ba92b0000f27a360734362fa243..fc8f4aaad3af684f151739111c2291516c37e2d1 100644 (file)
--- a/backend/tiff/tiff-document.c
+++ b/backend/tiff/tiff-document.c
@@ -20,8 +20,12 @@
 /* FIXME: Should probably buffer calls to libtiff with TIFFSetWarningHandler
  */
 
 /* FIXME: Should probably buffer calls to libtiff with TIFFSetWarningHandler
  */
 

+#include "config.h"
+
+#include <config.h>

 #include <stdio.h>
 #include <glib.h>
 #include <stdio.h>
 #include <glib.h>

+#include <glib/gi18n.h>

 
 #include "tiffio.h"
 #include "tiff2ps.h"
 
 #include "tiffio.h"
 #include "tiff2ps.h"


@@ -29,6 +33,7 @@
 #include "ev-document-misc.h"
 #include "ev-document-thumbnails.h"
 #include "ev-file-exporter.h"
 #include "ev-document-misc.h"
 #include "ev-document-thumbnails.h"
 #include "ev-file-exporter.h"

+#include "ev-file-helpers.h"

 
 struct _TiffDocumentClass
 {
 
 struct _TiffDocumentClass
 {


@@ -52,13 +57,12 @@ static void tiff_document_document_iface_init (EvDocumentIface *iface);
 static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 static void tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface);
 
 static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
 static void tiff_document_document_file_exporter_iface_init (EvFileExporterIface *iface);
 

-G_DEFINE_TYPE_WITH_CODE (TiffDocument, tiff_document, G_TYPE_OBJECT,
-                         { G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT,
-                                                 tiff_document_document_iface_init);
-                          G_IMPLEMENT_INTERFACE (EV_TYPE_DOCUMENT_THUMBNAILS,
-                                                 tiff_document_document_thumbnails_iface_init);
-                          G_IMPLEMENT_INTERFACE (EV_TYPE_FILE_EXPORTER,
-                                                 tiff_document_document_file_exporter_iface_init);
+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);

                         });
 
 static TIFFErrorHandler orig_error_handler = NULL;
                         });
 
 static TIFFErrorHandler orig_error_handler = NULL;


@@ -172,10 +176,10 @@ tiff_document_get_resolution (TiffDocument *tiff_document,
 }
 
 static void
 }
 
 static void

-tiff_document_get_page_size (EvDocument   *document,
-                            int           page,
-                            double       *width,
-                            double       *height)
+tiff_document_get_page_size (EvDocument *document,
+                            EvPage     *page,
+                            double     *width,
+                            double     *height)

 {
        guint32 w, h;
        gfloat x_res, y_res;
 {
        guint32 w, h;
        gfloat x_res, y_res;


@@ -185,7 +189,7 @@ tiff_document_get_page_size (EvDocument   *document,
        g_return_if_fail (tiff_document->tiff != NULL);
        
        push_handlers ();
        g_return_if_fail (tiff_document->tiff != NULL);
        
        push_handlers ();

-       if (TIFFSetDirectory (tiff_document->tiff, page) != 1) {
+       if (TIFFSetDirectory (tiff_document->tiff, page->index) != 1) {

                pop_handlers ();
                return;
        }
                pop_handlers ();
                return;
        }


@@ -211,9 +215,6 @@ tiff_document_render (EvDocument      *document,
        gint rowstride, bytes;
        guchar *pixels = NULL;
        guchar *p;
        gint rowstride, bytes;
        guchar *pixels = NULL;
        guchar *p;

-       GdkPixbuf *pixbuf;
-       GdkPixbuf *scaled_pixbuf;
-       GdkPixbuf *rotated_pixbuf;

        cairo_surface_t *surface;
        cairo_surface_t *rotated_surface;
        static const cairo_user_data_key_t key;
        cairo_surface_t *surface;
        cairo_surface_t *rotated_surface;
        static const cairo_user_data_key_t key;


@@ -222,7 +223,7 @@ tiff_document_render (EvDocument      *document,
        g_return_val_if_fail (tiff_document->tiff != NULL, NULL);
   
        push_handlers ();
        g_return_val_if_fail (tiff_document->tiff != NULL, NULL);
   
        push_handlers ();

-       if (TIFFSetDirectory (tiff_document->tiff, rc->page) != 1) {
+       if (TIFFSetDirectory (tiff_document->tiff, rc->page->index) != 1) {

                pop_handlers ();
                return NULL;
        }
                pop_handlers ();
                return NULL;
        }


@@ -245,11 +246,15 @@ tiff_document_render (EvDocument      *document,
        if (width <= 0 || height <= 0)
                return NULL;                
 
        if (width <= 0 || height <= 0)
                return NULL;                
 

+#ifdef HAVE_CAIRO_FORMAT_STRIDE_FOR_WIDTH
+       rowstride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width);
+#else

        rowstride = width * 4;
        if (rowstride / 4 != width)
                /* overflow */
                return NULL;                
        rowstride = width * 4;
        if (rowstride / 4 != width)
                /* overflow */
                return NULL;                

-        
+#endif
+       

        bytes = height * rowstride;
        if (bytes / rowstride != height)
                /* overflow */
        bytes = height * rowstride;
        if (bytes / rowstride != height)
                /* overflow */


@@ -312,7 +317,7 @@ tiff_document_render_pixbuf (EvDocument      *document,
        GdkPixbuf *rotated_pixbuf;
        
        push_handlers ();
        GdkPixbuf *rotated_pixbuf;
        
        push_handlers ();

-       if (TIFFSetDirectory (tiff_document->tiff, rc->page) != 1) {
+       if (TIFFSetDirectory (tiff_document->tiff, rc->page->index) != 1) {

                pop_handlers ();
                return NULL;
        }
                pop_handlers ();
                return NULL;
        }


@@ -477,7 +482,7 @@ tiff_document_file_exporter_do_page (EvFileExporter *exporter, EvRenderContext *
 
        if (document->ps_export_ctx == NULL)
                return;
 
        if (document->ps_export_ctx == NULL)
                return;

-       if (TIFFSetDirectory (document->tiff, rc->page) != 1)
+       if (TIFFSetDirectory (document->tiff, rc->page->index) != 1)

                return;
        tiff2ps_process_page (document->ps_export_ctx, document->tiff,
                              0, 0, 0, 0, 0);
                return;
        tiff2ps_process_page (document->ps_export_ctx, document->tiff,
                              0, 0, 0, 0, 0);