X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=tiff%2Ftiff-document.c;h=9f465a7c5fc2293aa381cec4e530edc5e30fa259;hb=2fcdb759f53fee8ccca7eaa3d67743cc8d42b0fc;hp=aef7aaac3bf82b6fb9f9bfc70d2ac697c40c3574;hpb=c0ff60cfe9747401b11eaae97a220c16aab3ddd5;p=evince.git

diff --git a/tiff/tiff-document.c b/tiff/tiff-document.c
index aef7aaac..9f465a7c 100644
--- a/tiff/tiff-document.c
+++ b/tiff/tiff-document.c
@@ -41,8 +41,9 @@ struct _TiffDocument
 
   TIFF *tiff;
   gint n_pages;
-  EvOrientation orientation;
   TIFF2PSContext *ps_export_ctx;
+  
+  gchar *uri;
 };
 
 typedef struct _TiffDocumentClass TiffDocumentClass;
@@ -87,7 +88,6 @@ tiff_document_load (EvDocument  *document,
   TIFF *tiff;
 
   push_handlers ();
-  /* FIXME: We could actually load uris  */
   filename = g_filename_from_uri (uri, NULL, error);
   if (!filename)
     {
@@ -109,6 +109,9 @@ tiff_document_load (EvDocument  *document,
       return FALSE;
     }
   tiff_document->tiff = tiff;
+  g_free (tiff_document->uri);
+  g_free (filename);
+  tiff_document->uri = g_strdup (uri);
 
   pop_handlers ();
   return TRUE;
@@ -118,8 +121,10 @@ static gboolean
 tiff_document_save (EvDocument  *document,
 		      const char  *uri,
 		      GError     **error)
-{
-	return FALSE;
+{		
+	TiffDocument *tiff_document = TIFF_DOCUMENT (document);
+
+	return ev_xfer_uri_simple (tiff_document->uri, uri, error); 
 }
 
 static int
@@ -171,50 +176,10 @@ tiff_document_get_page_size (EvDocument   *document,
   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) {
-    *width = w;
-    *height = h;
-  } else {
-    *width = h;
-    *height = w;
-  }
-  pop_handlers ();
-}
-
-static EvOrientation
-tiff_document_get_orientation (EvDocument *document)
-{
-	TiffDocument *tiff_document = TIFF_DOCUMENT (document);
-
-	return tiff_document->orientation;
-}
-
-static void
-tiff_document_set_orientation (EvDocument *document,
-			     EvOrientation   orientation)
-{
-	TiffDocument *tiff_document = TIFF_DOCUMENT (document);
-
-	tiff_document->orientation = orientation;
-}
-
-static GdkPixbuf *
-rotate_pixbuf (EvDocument *document, GdkPixbuf *pixbuf)
-{
-	TiffDocument *tiff_document = TIFF_DOCUMENT (document);
+  *width = w;
+  *height = h;
 
-	switch (tiff_document->orientation)
-	{
-		case EV_ORIENTATION_LANDSCAPE:
-			return gdk_pixbuf_rotate_simple (pixbuf, 90);
-		case EV_ORIENTATION_UPSIDEDOWN:
-			return gdk_pixbuf_rotate_simple (pixbuf, 180);
-		case EV_ORIENTATION_SEASCAPE:
-			return gdk_pixbuf_rotate_simple (pixbuf, 270);
-		default:
-			return g_object_ref (pixbuf);
-	}
+  pop_handlers ();
 }
 
 static GdkPixbuf *
@@ -298,7 +263,7 @@ tiff_document_render_pixbuf (EvDocument      *document,
 					   GDK_INTERP_BILINEAR);
   g_object_unref (pixbuf);
 
-  rotated_pixbuf = rotate_pixbuf (document, scaled_pixbuf);
+  rotated_pixbuf = gdk_pixbuf_rotate_simple (scaled_pixbuf, 360 - rc->rotation);
   g_object_unref (scaled_pixbuf);
 
   return rotated_pixbuf;
@@ -310,6 +275,7 @@ tiff_document_finalize (GObject *object)
 	TiffDocument *tiff_document = TIFF_DOCUMENT (object);
 
 	TIFFClose (tiff_document->tiff);
+	g_free (tiff_document->uri);
 
 	G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object);
 }
@@ -349,13 +315,12 @@ tiff_document_document_iface_init (EvDocumentIface *iface)
 	iface->get_page_size = tiff_document_get_page_size;
 	iface->render_pixbuf = tiff_document_render_pixbuf;
 	iface->get_info = tiff_document_get_info;
-	iface->get_orientation = tiff_document_get_orientation;
-	iface->set_orientation = tiff_document_set_orientation;
 }
 
 static GdkPixbuf *
 tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
 					gint 		      page,
+					gint	              rotation,
 					gint                  size,
 					gboolean              border)
 {
@@ -367,14 +332,14 @@ tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
 			       page,
 			       &w, &h);
 
-  rc = ev_render_context_new (EV_ORIENTATION_PORTRAIT, page, size/w);
+  rc = ev_render_context_new (rotation, page, size/w);
   pixbuf = tiff_document_render_pixbuf (EV_DOCUMENT (document), rc);
   g_object_unref (G_OBJECT (rc));
 
   if (border)
     {
       GdkPixbuf *tmp_pixbuf = pixbuf;
-      pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, tmp_pixbuf);
+      pixbuf = ev_document_misc_get_thumbnail_frame (-1, -1, 0, tmp_pixbuf);
       g_object_unref (tmp_pixbuf);
     }
 
@@ -420,13 +385,13 @@ tiff_document_ps_export_begin (EvPSExporter *exporter, const char *filename,
 }
 
 static void
-tiff_document_ps_export_do_page (EvPSExporter *exporter, int page)
+tiff_document_ps_export_do_page (EvPSExporter *exporter, EvRenderContext *rc)
 {
 	TiffDocument *document = TIFF_DOCUMENT (exporter);
 
 	if (document->ps_export_ctx == NULL)
 		return;
-	if (TIFFSetDirectory (document->tiff, page) != 1)
+	if (TIFFSetDirectory (document->tiff, rc->page) != 1)
 		return;
 	tiff2ps_process_page (document->ps_export_ctx, document->tiff,
 			      0, 0, 0, 0, 0);
@@ -454,5 +419,4 @@ static void
 tiff_document_init (TiffDocument *tiff_document)
 {
   tiff_document->n_pages = -1;
-  tiff_document->orientation = EV_ORIENTATION_PORTRAIT;
 }