Changeset 256

Timestamp:

10/17/06 11:55:46 (2 years ago)

Author:

jordi

Message:

I did a kludge that seems to fix some problems while rendering pages... seems to fix bug #32.

Files:

• trunk/src/PDFDocument.cxx (modified) (9 diffs)
• trunk/src/main.cxx (modified) (3 diffs)

trunk/src/PDFDocument.cxx

@@ -17 +17 @@
-
-#include <config.h>
+#include <gdk/gdk.h>
-#include <time.h>
-#include <poppler.h>
@@ -159 +160 @@
-        {
-            PopplerRectangle *matchRect = (PopplerRectangle *)match->data;
- 
+
-                new DocumentRectangle (matchRect->x1,
-                                       (height - matchRect->y2),
@@ -222 +223 @@
-        if ( POPPLER_ERROR == loadError->domain )
-        {
- 
+
-        }
-        else
@@ -231 +232 @@
-            // Maybe I'm wrong (very probable) but that's a wrong way.
-            // So I'm reading the error code from the error string...
- 
+
-                    (gint *)&errorCode);
-        }
@@ -237 +238 @@
-        // Get our error message.
-        gchar *errorMessage = IDocument::getErrorMessage (errorCode);
- 
+
-                     EPDFVIEW_DOCUMENT_ERROR, errorCode,
-                     _("Failed to load document '%s'.\n%s\n"),
@@ -261 +262 @@
-    m_Outline = new DocumentOutline ();
-    setOutline (m_Outline, outline);
+    // XXX: I still don't know why, but it seems that if I don't request
+    // a page here, when rendering a page Glib tells me
+    // that cannot register existing type `PopplerPage'... Yes, this
+    // is a kludge, but I don't know enough to check it why it does that.
+    PopplerPage *page = poppler_document_get_page (m_Document, 0);
+    if ( NULL != page )
+    {
+        g_object_unref (G_OBJECT (page));
+    }
-
-    return TRUE;
@@ -402 +412 @@
-        do
-        {
- 
+
-                poppler_index_iter_get_action (childrenList);
-            if ( POPPLER_ACTION_GOTO_DEST == action->type )
@@ -469 +479 @@
-            poppler_page_get_size (page, &pageHeight, &pageWidth);
-        }
- 
+
-        {
-            poppler_page_get_size (page, &pageWidth, &pageHeight);
@@ -529 +539 @@
-    }
-}
-
-
-///

trunk/src/main.cxx

@@ -45 +45 @@
-        exit (EXIT_FAILURE);
-    }
+    // Initialise the working thread.
+    IJob::init ();
-    // Initialise the GTK library.
-    gtk_init (&argc, &argv);
-    g_set_application_name (_("PDF Viewer"));
-    // Initialise the working thread.
-    IJob::init ();
-    // Create the main presenter.
-    PDFDocument *document = new PDFDocument;
@@ -65 +65 @@
-        document->load (argv[1], NULL);
-    }
+
-    gtk_main();
-
+
-    // There's no need for us to delete the main view, as it's
-    // the presenter's responsibility.
@@ -73 +74 @@
-    // Save the configuration.
-    Config::getConfig().save ();
-
+
-    // All done!.
-    return EXIT_SUCCESS;