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 aba885112d1e3a798cc144f2ec88c409fc8dcdbc..9f465a7c5fc2293aa381cec4e530edc5e30fa259 100644 (file)
--- a/tiff/tiff-document.c
+++ b/tiff/tiff-document.c
@@ -42,6 +42,8 @@ struct _TiffDocument
   TIFF *tiff;
   gint n_pages;
   TIFF2PSContext *ps_export_ctx;
   TIFF *tiff;
   gint n_pages;
   TIFF2PSContext *ps_export_ctx;

+  
+  gchar *uri;

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


@@ -86,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)
     {


@@ -108,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;


@@ -117,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


@@ -176,30 +182,6 @@ tiff_document_get_page_size (EvDocument   *document,
   pop_handlers ();
 }
 
   pop_handlers ();
 }
 

-static EvOrientation
-tiff_document_get_orientation (EvDocument *document)
-{
-       return EV_ORIENTATION_PORTRAIT;
-}
-
-static GdkPixbuf *
-rotate_pixbuf (EvDocument *document, EvOrientation orientation, GdkPixbuf *pixbuf)
-{
-       TiffDocument *tiff_document = TIFF_DOCUMENT (document);
-
-       switch (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);
-       }
-}
-

 static GdkPixbuf *
 tiff_document_render_pixbuf (EvDocument      *document,
                             EvRenderContext *rc)
 static GdkPixbuf *
 tiff_document_render_pixbuf (EvDocument      *document,
                             EvRenderContext *rc)


@@ -281,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, rc->orientation, 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;


@@ -293,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);
 }


@@ -332,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;

 }
 
 static GdkPixbuf *
 tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
                                        gint                  page,
 }
 
 static GdkPixbuf *
 tiff_document_thumbnails_get_thumbnail (EvDocumentThumbnails *document,
                                        gint                  page,

-                                       EvOrientation         orientation,
+                                       gint                  rotation,

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


@@ -350,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);
     }