Text search in djvu. Fix for the bug #303415.

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

diff --git a/tiff/tiff-document.c b/tiff/tiff-document.c
index 137833be58cf98c48a871706467bfdf79f8cad34..9f465a7c5fc2293aa381cec4e530edc5e30fa259 100644 (file)
--- a/tiff/tiff-document.c
+++ b/tiff/tiff-document.c
@@ -22,7 +22,6 @@
 
 #include <stdio.h>
 #include <glib.h>
 
 #include <stdio.h>
 #include <glib.h>

-#include <glib/gstdio.h>

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


@@ -42,9 +41,9 @@ struct _TiffDocument
 
   TIFF *tiff;
   gint n_pages;
 
   TIFF *tiff;
   gint n_pages;

-  EvOrientation orientation;
-  FILE *ps_export_file;
-  gint ps_export_pages;
+  TIFF2PSContext *ps_export_ctx;
+  
+  gchar *uri;

 };
 
 typedef struct _TiffDocumentClass TiffDocumentClass;
 };
 
 typedef struct _TiffDocumentClass TiffDocumentClass;


@@ -89,7 +88,6 @@ tiff_document_load (EvDocument  *document,
   TIFF *tiff;
 
   push_handlers ();
   TIFF *tiff;
 
   push_handlers ();

-  /* FIXME: We could actually load uris  */

   filename = g_filename_from_uri (uri, NULL, error);
   if (!filename)
     {
   filename = g_filename_from_uri (uri, NULL, error);
   if (!filename)
     {


@@ -111,6 +109,9 @@ tiff_document_load (EvDocument  *document,
       return FALSE;
     }
   tiff_document->tiff = tiff;
       return FALSE;
     }
   tiff_document->tiff = tiff;

+  g_free (tiff_document->uri);
+  g_free (filename);
+  tiff_document->uri = g_strdup (uri);

 
   pop_handlers ();
   return TRUE;
 
   pop_handlers ();
   return TRUE;


@@ -120,8 +121,10 @@ static gboolean
 tiff_document_save (EvDocument  *document,
                      const char  *uri,
                      GError     **error)
 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
 }
 
 static int


@@ -173,50 +176,10 @@ tiff_document_get_page_size (EvDocument   *document,
   TIFFGetField (tiff_document->tiff, TIFFTAG_YRESOLUTION, &y_res);
   h = h * (x_res / y_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) {
-    *width = w;
-    *height = h;
-  } else {
-    *width = h;
-    *height = w;
-  }
-  pop_handlers ();
-}
+  *width = w;
+  *height = h;

 
 

-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);
-
-       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 *
 }
 
 static GdkPixbuf *


@@ -300,7 +263,7 @@ tiff_document_render_pixbuf (EvDocument      *document,
                                           GDK_INTERP_BILINEAR);
   g_object_unref (pixbuf);
 
                                           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;
   g_object_unref (scaled_pixbuf);
 
   return rotated_pixbuf;


@@ -312,6 +275,7 @@ tiff_document_finalize (GObject *object)
        TiffDocument *tiff_document = TIFF_DOCUMENT (object);
 
        TIFFClose (tiff_document->tiff);
        TiffDocument *tiff_document = TIFF_DOCUMENT (object);
 
        TIFFClose (tiff_document->tiff);

+       g_free (tiff_document->uri);

 
        G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object);
 }
 
        G_OBJECT_CLASS (tiff_document_parent_class)->finalize (object);
 }


@@ -351,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_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,
 }
 
 static GdkPixbuf *
 tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
                                        gint                  page,

+                                       gint                  rotation,

                                        gint                  size,
                                        gboolean              border)
 {
                                        gint                  size,
                                        gboolean              border)
 {


@@ -369,14 +332,14 @@ tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
                               page,
                               &w, &h);
 
                               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 = 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);
     }
 
       g_object_unref (tmp_pixbuf);
     }
 


@@ -413,29 +376,25 @@ tiff_document_document_thumbnails_iface_init (EvDocumentThumbnailsIface *iface)
 
 static void
 tiff_document_ps_export_begin (EvPSExporter *exporter, const char *filename,
 
 static void
 tiff_document_ps_export_begin (EvPSExporter *exporter, const char *filename,

-                              int first_page, int last_page)
+                              int first_page, int last_page,
+                              double width, double height, gboolean duplex)

 {
        TiffDocument *document = TIFF_DOCUMENT (exporter);
 
 {
        TiffDocument *document = TIFF_DOCUMENT (exporter);
 

-       document->ps_export_file = g_fopen (filename, "w");
-       if (document->ps_export_file == NULL)
-               return;
-       document->ps_export_pages = 0;
+       document->ps_export_ctx = tiff2ps_context_new(filename);

 }
 
 static void
 }
 
 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);
 
 {
        TiffDocument *document = TIFF_DOCUMENT (exporter);
 

-       if (document->ps_export_file == NULL)
+       if (document->ps_export_ctx == NULL)

                return;
                return;

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

                return;
                return;

-       TIFF2PS (document->ps_export_file,
-                document->tiff,
-                0, 0, 0, 0, 0,
-                &document->ps_export_pages);
+       tiff2ps_process_page (document->ps_export_ctx, document->tiff,
+                             0, 0, 0, 0, 0);

 }
 
 static void
 }
 
 static void


@@ -443,12 +402,9 @@ tiff_document_ps_export_end (EvPSExporter *exporter)
 {
        TiffDocument *document = TIFF_DOCUMENT (exporter);
 
 {
        TiffDocument *document = TIFF_DOCUMENT (exporter);
 

-       if (document->ps_export_file == NULL)
+       if (document->ps_export_ctx == NULL)

                return;
                return;

-       if (document->ps_export_pages)
-               TIFFPSTail (document->ps_export_file,
-                           document->ps_export_pages);
-       fclose (document->ps_export_file);
+       tiff2ps_context_finalize(document->ps_export_ctx);

 }
 
 static void
 }
 
 static void


@@ -463,5 +419,4 @@ static void
 tiff_document_init (TiffDocument *tiff_document)
 {
   tiff_document->n_pages = -1;
 tiff_document_init (TiffDocument *tiff_document)
 {
   tiff_document->n_pages = -1;

-  tiff_document->orientation = EV_ORIENTATION_PORTRAIT;

 }
 }