X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=tiff%2Ftiff-document.c;h=36847aa45f3173cdd2fd79bf6cafdf016654336a;hb=848665b157185945d190a7a746d054d7f5d5e6e0;hp=f2ed498651d58e51232608a3b474025ead415e0e;hpb=e93b3a265bbc02546d230204402e3f41e83d6ab5;p=evince.git

diff --git a/tiff/tiff-document.c b/tiff/tiff-document.c
index f2ed4986..36847aa4 100644
--- a/tiff/tiff-document.c
+++ b/tiff/tiff-document.c
@@ -1,4 +1,3 @@
-
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; c-indent-level: 8 -*- */
 /*
  * Copyright (C) 2005, Jonathan Blandford <jrb@gnome.org>
@@ -18,12 +17,18 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* FIXME: Shoudl probably buffer calls to libtiff with TIFFSetWarningHandler
+/* FIXME: Should probably buffer calls to libtiff with TIFFSetWarningHandler
  */
+
+#include <stdio.h>
+#include <glib.h>
+
 #include "tiffio.h"
+#include "tiff2ps.h"
 #include "tiff-document.h"
-#include "ev-document-thumbnails.h"
 #include "ev-document-misc.h"
+#include "ev-document-thumbnails.h"
+#include "ev-ps-exporter.h"
 
 struct _TiffDocumentClass
 {
@@ -37,18 +42,22 @@ struct _TiffDocument
   TIFF *tiff;
   gint n_pages;
   EvOrientation orientation;
+  TIFF2PSContext *ps_export_ctx;
 };
 
 typedef struct _TiffDocumentClass TiffDocumentClass;
 
 static void tiff_document_document_iface_init (EvDocumentIface *iface);
 static void tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface);
+static void tiff_document_document_ps_exporter_iface_init (EvPSExporterIface *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_PS_EXPORTER,
+						  tiff_document_document_ps_exporter_iface_init);
 			 });
 
 static TIFFErrorHandler orig_error_handler = NULL;
@@ -90,7 +99,7 @@ tiff_document_load (EvDocument  *document,
   if (tiff)
     {
       guint32 w, h;
-      
+      /* FIXME: unused data? why bother here */
       TIFFGetField(tiff, TIFFTAG_IMAGEWIDTH, &w);
       TIFFGetField(tiff, TIFFTAG_IMAGELENGTH, &h);
     }
@@ -143,6 +152,7 @@ tiff_document_get_page_size (EvDocument   *document,
 			     double       *height)
 {
   guint32 w, h;
+  gfloat x_res, y_res;
   TiffDocument *tiff_document = TIFF_DOCUMENT (document);
 
   g_return_if_fail (TIFF_IS_DOCUMENT (document));
@@ -157,6 +167,9 @@ tiff_document_get_page_size (EvDocument   *document,
 
   TIFFGetField (tiff_document->tiff, TIFFTAG_IMAGEWIDTH, &w);
   TIFFGetField (tiff_document->tiff, TIFFTAG_IMAGELENGTH, &h);
+  TIFFGetField (tiff_document->tiff, TIFFTAG_XRESOLUTION, &x_res);
+  TIFFGetField (tiff_document->tiff, TIFFTAG_YRESOLUTION, &y_res);
+  h = h * (x_res / y_res);
 
   if (tiff_document->orientation == EV_ORIENTATION_PORTRAIT ||
       tiff_document->orientation ==  EV_ORIENTATION_UPSIDEDOWN) {
@@ -210,6 +223,7 @@ tiff_document_render_pixbuf (EvDocument      *document,
 {
   TiffDocument *tiff_document = TIFF_DOCUMENT (document);
   int width, height;
+  float x_res, y_res;
   gint rowstride, bytes;
   guchar *pixels = NULL;
   GdkPixbuf *pixbuf;
@@ -238,6 +252,18 @@ tiff_document_render_pixbuf (EvDocument      *document,
       return NULL;
     }
 
+  if (!TIFFGetField (tiff_document->tiff, TIFFTAG_XRESOLUTION, &x_res))
+    {
+      pop_handlers ();
+      return NULL;
+    }
+
+  if (! TIFFGetField (tiff_document->tiff, TIFFTAG_YRESOLUTION, &y_res))
+    {
+      pop_handlers ();
+      return NULL;
+    }
+
   pop_handlers ();
 
   /* Sanity check the doc */
@@ -268,7 +294,7 @@ tiff_document_render_pixbuf (EvDocument      *document,
 
   scaled_pixbuf = gdk_pixbuf_scale_simple (pixbuf,
 					   width * rc->scale,
-					   height * rc->scale,
+					   height * rc->scale * (x_res/y_res),
 					   GDK_INTERP_BILINEAR);
   g_object_unref (pixbuf);
 
@@ -381,6 +407,47 @@ tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface)
   iface->get_dimensions = tiff_document_thumbnails_get_dimensions;
 }
 
+/* postscript exporter implementation */
+
+static void
+tiff_document_ps_export_begin (EvPSExporter *exporter, const char *filename,
+			       int first_page, int last_page)
+{
+	TiffDocument *document = TIFF_DOCUMENT (exporter);
+
+	document->ps_export_ctx = tiff2ps_context_new(filename);
+}
+
+static void
+tiff_document_ps_export_do_page (EvPSExporter *exporter, int page)
+{
+	TiffDocument *document = TIFF_DOCUMENT (exporter);
+
+	if (document->ps_export_ctx == NULL)
+		return;
+	if (TIFFSetDirectory (document->tiff, page) != 1)
+		return;
+	tiff2ps_process_page (document->ps_export_ctx, document->tiff,
+			      0, 0, 0, 0, 0);
+}
+
+static void
+tiff_document_ps_export_end (EvPSExporter *exporter)
+{
+	TiffDocument *document = TIFF_DOCUMENT (exporter);
+
+	if (document->ps_export_ctx == NULL)
+		return;
+	tiff2ps_context_finalize(document->ps_export_ctx);
+}
+
+static void
+tiff_document_document_ps_exporter_iface_init (EvPSExporterIface *iface)
+{
+	iface->begin = tiff_document_ps_export_begin;
+	iface->do_page = tiff_document_ps_export_do_page;
+	iface->end = tiff_document_ps_export_end;
+}
 
 static void
 tiff_document_init (TiffDocument *tiff_document)