Use an specific lock for FontConfig. Hopefully it fixes some crashes

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

diff --git a/backend/ev-document.c b/backend/ev-document.c
index 714becb19140c9f9cc139f25bd0794403e22acf0..a951bfa3fa83560534e113ba24ddbe38acc34112 100644 (file)
--- a/backend/ev-document.c
+++ b/backend/ev-document.c
@@ -23,12 +23,12 @@
 #include "ev-document.h"
 
 #include "ev-backend-marshalers.h"
-#include "ev-job-queue.h"
 
 static void ev_document_class_init (gpointer g_class);
 
 
 GMutex *ev_doc_mutex = NULL;
+GMutex *ev_fc_mutex = NULL;
 
 #define LOG(x) 
 GType
@@ -38,7 +38,7 @@ ev_document_get_type (void)
 
        if (G_UNLIKELY (type == 0))
        {
-               static const GTypeInfo our_info =
+               const GTypeInfo our_info =
                {
                        sizeof (EvDocumentIface),
                        NULL,
@@ -69,24 +69,6 @@ ev_document_class_init (gpointer g_class)
 {
 }
 
-#define PAGE_CACHE_STRING "ev-page-cache"
-
-EvPageCache *
-ev_document_get_page_cache (EvDocument *document)
-{
-       EvPageCache *page_cache;
-
-       g_return_val_if_fail (EV_IS_DOCUMENT (document), NULL);
-
-       page_cache = g_object_get_data (G_OBJECT (document), PAGE_CACHE_STRING);
-       if (page_cache == NULL) {
-               page_cache = _ev_page_cache_new (document);
-               g_object_set_data_full (G_OBJECT (document), PAGE_CACHE_STRING, page_cache, g_object_unref);
-       }
-
-       return page_cache;
-}
-
 GMutex *
 ev_document_get_doc_mutex (void)
 {
@@ -108,7 +90,26 @@ ev_document_doc_mutex_unlock (void)
        g_mutex_unlock (ev_document_get_doc_mutex ());
 }
 
+GMutex *
+ev_document_get_fc_mutex (void)
+{
+       if (ev_fc_mutex == NULL) {
+               ev_fc_mutex = g_mutex_new ();
+       }
+       return ev_fc_mutex;
+}
 
+void
+ev_document_fc_mutex_lock (void)
+{
+       g_mutex_lock (ev_document_get_fc_mutex ());
+}
+
+void
+ev_document_fc_mutex_unlock (void)
+{
+       g_mutex_unlock (ev_document_get_fc_mutex ());
+}
 
 gboolean
 ev_document_load (EvDocument  *document,
@@ -120,10 +121,6 @@ ev_document_load (EvDocument  *document,
        LOG ("ev_document_load");
        retval = iface->load (document, uri, error);
 
-       /* Call this to make the initial cached copy */
-       if (retval)
-               ev_document_get_page_cache (document);
-
        return retval;
 }
 
@@ -208,27 +205,34 @@ ev_document_get_text (EvDocument  *document,
        return retval;
 }
 
+gboolean
+ev_document_has_attachments (EvDocument *document)
+{
+       EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
+
+       if (iface->has_attachments == NULL)
+               return FALSE;
+       
+       return iface->has_attachments (document);
+}
+
 GList *
-ev_document_get_links (EvDocument *document,
-                      int         page)
+ev_document_get_attachments (EvDocument *document)
 {
        EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
        GList *retval;
 
-       LOG ("ev_document_get_link");
-       if (iface->get_links == NULL)
+       LOG ("ev_document_get_attachments");
+       if (iface->get_attachments == NULL)
                return NULL;
-       retval = iface->get_links (document, page);
+       retval = iface->get_attachments (document);
 
        return retval;
 }
 
-
-
 GdkPixbuf *
-ev_document_render_pixbuf (EvDocument *document,
-                          int         page,
-                          double      scale)
+ev_document_render_pixbuf (EvDocument      *document,
+                          EvRenderContext *rc)
 {
        EvDocumentIface *iface = EV_DOCUMENT_GET_IFACE (document);
        GdkPixbuf *retval;
@@ -236,7 +240,7 @@ ev_document_render_pixbuf (EvDocument *document,
        LOG ("ev_document_render_pixbuf");
        g_assert (iface->render_pixbuf);
 
-       retval = iface->render_pixbuf (document, page, scale);
+       retval = iface->render_pixbuf (document, rc);
 
        return retval;
 }
@@ -252,6 +256,26 @@ ev_document_info_free (EvDocumentInfo *info)
        g_free (info->author);
        g_free (info->subject);
        g_free (info->keywords);
+       g_free (info->security);
 
        g_free (info);
 }
+
+
+/* Compares two rects.  returns 0 if they're equal */
+#define EPSILON 0.0000001
+
+gint
+ev_rect_cmp (EvRectangle *a,
+            EvRectangle *b)
+{
+       if (a == b)
+               return 0;
+       if (a == NULL || b == NULL)
+               return 1;
+
+       return ! ((ABS (a->x1 - b->x1) < EPSILON) &&
+                 (ABS (a->y1 - b->y1) < EPSILON) &&
+                 (ABS (a->x2 - b->x2) < EPSILON) &&
+                 (ABS (a->y2 - b->y2) < EPSILON));
+}