Changeset 78 for trunk

Timestamp:

04/17/06 07:28:50 (3 years ago)

Author:

jordi

Message:

Since version 0.5.0 and up doesn't support the old Xpdf header files and because the CairoOutputDev?.h file is not installed on version 0.5.1, I now use Poppler's glib wrapper for PDF loading.

The glib wrapper needs an URI instead of a filename (why?), so the path to the file must be specified as an absolute path to be able to convert it to an URI (file:///dir1/dir2/file.pdf). This also means that the tests files had to be changed to use absolute paths. I added a function (that I'll change to a common utils source) that transform the filename to an absolute path.

Location:

trunk

Files:

• configure.ac (modified) (3 diffs)
• src/IDocument.cxx (modified) (13 diffs)
• src/IDocument.h (modified) (2 diffs)
• src/PDFDocument.cxx (modified) (14 diffs)
• src/PDFDocument.h (modified) (2 diffs)
• tests/DocumentOutlineTest.cxx (modified) (5 diffs)
• tests/Makefile.am (modified) (1 diff)
• tests/PDFDocumentTest.cxx (modified) (22 diffs)
• tests/main.cxx (modified) (2 diffs)

trunk/configure.ac

@@ -1 +1 @@
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([ePDFView], [0.1.1], [jordi@emma-soft.com])
+AC_INIT([ePDFView], [0.1.2], [jordi@emma-soft.com])
 AC_PREREQ([2.13])
 AC_CONFIG_HEADER([config.h])
@@ -30 +30 @@
 GLIB_REQUIRED=2.6.0
 GTK2_REQUIRED=2.6.0
-FREETYPE2_REQUIRED=2.1.9
 
 PKG_CHECK_MODULES([GLIB], [glib-2.0 >= $GLIB_REQUIRED])
@@ -38 +37 @@
 AC_SUBST([GTK2_CFLAGS])
 AC_SUBST([GTK2_LIBS])
-PKG_CHECK_MODULES([POPPLER], [poppler-cairo >= $POPPLER_REQUIRED freetype2 >= $FREETYPE2_REQUIRED])
+PKG_CHECK_MODULES([POPPLER], [poppler-glib >= $POPPLER_REQUIRED gdk-2.0 >= $GTK2_REQUIRED pango])
 AC_SUBST([POPPLER_CFLAGS])
 AC_SUBST([POPPLER_LIBS])

trunk/src/IDocument.cxx

@@ -131 +131 @@
     m_Format = NULL;
     m_Keywords = NULL;
-    m_Linearized = FALSE;
+    m_Linearized = NULL;
     m_ModifiedDate = NULL;
     m_PageLayout = PageLayoutUnset;
@@ -156 +156 @@
     g_free (m_Format);
     g_free (m_Keywords);
+    g_free (m_Linearized);
     g_free (m_ModifiedDate);
     g_free (m_Password);
@@ -182 +183 @@
 /// @brief Sets the document's title.
 ///
-/// @param title The title of the document.
-///
-void
-IDocument::setTitle (const gchar *title)
+/// @param title The title of the document. IDocument will free it.
+///
+void
+IDocument::setTitle (gchar *title)
 {
     g_free (m_Title);
-    m_Title = g_strdup (title);
+    m_Title = title;
 }
 
@@ -210 +211 @@
 /// @brief Sets the document's author.
 ///
-/// @param author The name of the document's author.
-///
-void
-IDocument::setAuthor (const gchar *author)
+/// @param author The name of the document's author. IDocument will free it.
+///
+void
+IDocument::setAuthor (gchar *author)
 {
     g_free (m_Author);
-    m_Author = g_strdup (author);
+    m_Author = author;
 }
 
@@ -238 +239 @@
 /// @brief Sets the document's subject.
 ///
-/// @param subject The subject of the document.
-///
-void
-IDocument::setSubject (const gchar *subject)
+/// @param subject The subject of the document. IDocument will free it.
+///
+void
+IDocument::setSubject (gchar *subject)
 {
     g_free (m_Subject);
-    m_Subject = g_strdup (subject);
+    m_Subject = subject;
 }
 
@@ -266 +267 @@
 /// @brief Sets the document's keywords.
 ///
-/// @param keywords A white space separated list of keywords.
-///
-void
-IDocument::setKeywords (const gchar *keywords)
+/// @param keywords A white space separated list of keywords. IDocument will
+///                 free it.
+///
+void
+IDocument::setKeywords (gchar *keywords)
 {
     g_free (m_Keywords);
-    m_Keywords = g_strdup (keywords);
+    m_Keywords = keywords;
 }
 
@@ -295 +297 @@
 ///
 /// @param creator The name of the software that created the document.
-///
-void
-IDocument::setCreator (const gchar *creator)
+///                IDocument will free it.
+///
+void
+IDocument::setCreator (gchar *creator)
 {
     g_free (m_Creator);
-    m_Creator = g_strdup (creator);
+    m_Creator = creator;
 }
 ///
@@ -322 +325 @@
 ///
 /// @param producer The name of the software that converted the document.
-///
-void
-IDocument::setProducer (const gchar *producer)
+///                 IDocument will free it.
+///
+void
+IDocument::setProducer (gchar *producer)
 {
     g_free (m_Producer);
-    m_Producer = g_strdup (producer);
+    m_Producer = producer;
 }
 
@@ -350 +354 @@
 /// @brief Sets the document's format.
 ///
-/// @param format Set the format in which the document is.
-///
-void
-IDocument::setFormat (const gchar *format)
+/// @param format Set the format in which the document is. IDocument will free
+///               it.
+///
+void
+IDocument::setFormat (gchar *format)
 {
     g_free (m_Format);
-    m_Format = g_strdup (format);
+    m_Format = format;
 }
 
@@ -369 +374 @@
 IDocument::getLinearized ()
 {
-    if ( m_Linearized )
-    {
-        return "Yes";
-    }
-    return "No";
+    if ( NULL == m_Linearized )
+    {
+        return "No";
+    }
+    return m_Linearized;
 }
 
@@ -379 +384 @@
 /// @brief Sets if the document is linearised.
 ///
-/// @param linearized Set to TRUE if the document is linearized. 
-///                   FALSE otherwise.
-///
-void
-IDocument::setLinearized (gboolean linearized)
-{
+/// @param linearized Set to "Yes" if the document is linearized. "No"
+///                   otherwise. IDocument will free it.
+///
+void
+IDocument::setLinearized (gchar *linearized)
+{
+    g_free (m_Linearized);
     m_Linearized = linearized;
 }
@@ -408 +414 @@
 ///
 /// @param date The date and time the document was created in format
-///             'Y-M-D H:M:s'.
-///
-void
-IDocument::setCreationDate (const gchar *date)
+///             'Y-M-D H:M:s'. IDocument will free it.
+///
+void
+IDocument::setCreationDate (gchar *date)
 {
     g_free (m_CreationDate);
-    m_CreationDate = g_strdup (date);
+    m_CreationDate = date;
 }
 
@@ -437 +443 @@
 ///
 /// @param date The date and time the document was modified in format 
-///             'Y-M-D H:M:s'.
-///
-void
-IDocument::setModifiedDate (const gchar *date)
+///             'Y-M-D H:M:s'. IDocument will free it.
+///
+void
+IDocument::setModifiedDate (gchar *date)
 {
     g_free (m_ModifiedDate);
-    m_ModifiedDate = g_strdup (date);
-    
+    m_ModifiedDate = date;
 }
 

trunk/src/IDocument.h

@@ -171 +171 @@
             
             const gchar *getTitle (void);
-            void setTitle (const gchar *title);
+            void setTitle (gchar *title);
             const gchar *getAuthor (void);
-            void setAuthor (const gchar *author);
+            void setAuthor (gchar *author);
             const gchar *getSubject (void);
-            void setSubject (const gchar *subject);
+            void setSubject (gchar *subject);
             const gchar *getKeywords (void);
-            void setKeywords (const gchar *keywords);
+            void setKeywords (gchar *keywords);
             const gchar *getCreator (void);
-            void setCreator (const gchar *creator);
+            void setCreator (gchar *creator);
             const gchar *getPassword (void);
             void setPassword (const gchar *password);
             const gchar *getProducer (void);
-            void setProducer (const gchar *producer);
+            void setProducer (gchar *producer);
             const gchar *getFileName (void);
             void setFileName (const gchar *fileName);
             const gchar *getFormat (void);
-            void setFormat (const gchar *format);
+            void setFormat (gchar *format);
             const gchar *getLinearized (void);
-            void setLinearized (gboolean linearized);
+            void setLinearized (gchar *linearized);
             const gchar *getCreationDate (void);
-            void setCreationDate (const gchar *date);
+            void setCreationDate (gchar *date);
             const gchar *getModifiedDate (void);
-            void setModifiedDate (const gchar *date);
+            void setModifiedDate (gchar *date);
             PageMode getPageMode (void);
             void setPageMode (PageMode mode);
@@ -239 +239 @@
             gchar *m_FileName;
             gchar *m_Keywords;
-            gboolean m_Linearized;
+            gchar *m_Linearized;
             gchar *m_ModifiedDate;
             PageLayout m_PageLayout;

trunk/src/PDFDocument.cxx

@@ -17 +17 @@
 
 #include <config.h>
-
-// Poppler headers.
-#include <goo/GooList.h>
-#include <PDFDoc.h>
-#include <CairoOutputDev.h>
-#include <ErrorCodes.h>
-#include <GlobalParams.h>
-#include <PDFDocEncoding.h>
-#include <Outline.h>
-#include <Link.h>
-
+#include <time.h>
+#include <glib/poppler.h>
 #include "epdfview.h"
 
@@ -33 +24 @@
 
 // Constants.
-static const gint CAIRO_BYTES_PER_PIXEL = 4;
+static const gint PIXBUF_BITS_PER_SAMPLE = 8;
+static const gint DATE_LENGTH = 100;
 
 // Forward declarations.
-static gchar *getDictionaryString (Object &object, const gchar *key);
-static gchar *getDictionaryDate (Object &object, const gchar *key);
-static gboolean hasUnicodeMarker (GooString *string);
-static PageLayout convertPageLayout (Catalog::PageLayout pageLayout);
-static PageMode convertPageMode (Catalog::PageMode pageMode);
+static PageLayout convertPageLayout (gint pageLayout);
+static PageMode convertPageMode (gint pageMode);
 
 ///
@@ -49 +38 @@
 {
     m_Document = NULL;
-    m_OutputDevice = NULL;
 }
 
@@ -57 +45 @@
 PDFDocument::~PDFDocument ()
 {
-    delete m_Document;
-    delete m_OutputDevice;
+    if ( NULL != m_Document )
+    {
+        g_object_unref (G_OBJECT (m_Document));
+    }
 }
 
@@ -69 +59 @@
 PDFDocument::isLoaded ()
 {
-    return (NULL != m_Document && m_Document->isOk ());
+    return (NULL != m_Document);
 }
 
@@ -77 +67 @@
 /// Tries to open the PDF file @a filename using the password in @a password.
 ///
-/// @param filename The name of the file name to open.
+/// @param filename The name of the file name to open. It must be an absolute
+///                 path.
 /// @param password The password to use to open @a filename.
 /// @param error Location to store the error occurring or NULL to ignore 
@@ -90 +81 @@
     g_assert (NULL != filename && "Tried to load a NULL file name");
 
-    // The Poppler library has a GLOBAL file for parameters.
-    // If this file isn't loaded then weird error happens.
-    if ( NULL == globalParams )
-    {
-        globalParams = new GlobalParams ("/etc/xpdfrc");
-    }
-
-    GooString *filename_g = new GooString (filename);
-    GooString *password_g = NULL;
-    if (NULL != password )
-    {
-        password_g = new GooString (password);
+    gchar *filename_uri = g_filename_to_uri (filename, NULL, error);
+    if ( NULL == filename_uri )
+    {
+        return FALSE;
     }
     // Try to open the PDF document.
-    PDFDoc *newDocument = new PDFDoc (filename_g, password_g, password_g);
-    delete password_g;
-    // The filename_g can't be deleted as PDFDoc saves the reference.
-    // deleting it will cause trouble when deleting the newDocument.
-
+    GError *loadError = NULL;
+    PopplerDocument *newDocument = 
+        poppler_document_new_from_file (filename_uri, password, &loadError);
+    g_free (filename_uri);
     // Check if the document couldn't be opened successfully and why.
-    if ( !newDocument->isOk() )
-    {
-        DocumentError errorCode = (DocumentError)newDocument->getErrorCode ();
-        delete newDocument;
+    if ( NULL == newDocument )
+    {
+        // Popller's glib wrapper passes the Poppler error code unless the
+        // error is that the file is encrypted. We want to set our own
+        // error code in this case.
+        DocumentError errorCode = DocumentErrorNone;
+        if ( POPPLER_ERROR == loadError->domain )
+        {
+            errorCode = DocumentErrorEncrypted; 
+        }
+        else
+        {
+            // OK, the glib's wrapper don't pass the error code directly
+            // from Poppler. Instead returns G_FILE_ERROR_FAILED and a 
+            // non translated string.
+            // Maybe I'm wrong (very probable) but that's a wrong way.
+            // So I'm reading the error code from the error string...
+            sscanf (loadError->message, "Failed to load document (error %d)", 
+                    (gint *)&errorCode);
+        }
+        g_error_free (loadError);
+        // Get our error message.
         gchar *errorMessage = IDocument::getErrorMessage (errorCode);
         g_set_error (error, 
@@ -124 +124 @@
     }
    
-    setFileName (filename);
+    // Set the used filename and password to let the user reload the
+    // document.
+    setFileName (filename);    
     setPassword (password);
-    delete m_Document;
+    if ( NULL != m_Document )
+    {
+        g_object_unref (G_OBJECT (m_Document));
+        m_Document = NULL;
+    }
     m_Document = newDocument;
     // Load the document's information and outline.
     loadMetadata ();
-    Outline *outline = m_Document->getOutline ();
+    PopplerIndexIter *outline = poppler_index_iter_new (m_Document);
     m_Outline = new DocumentOutline ();
-    setOutline (m_Outline, outline->getItems ());
+    setOutline (m_Outline, outline);
     // Set the current rotation angle and zoom level.
     setRotation (0);
     setZoom (1.0f);
-    // Set the output device.
-    delete m_OutputDevice;
-    m_OutputDevice = new CairoOutputDev ();
-    m_OutputDevice->startDoc (m_Document->getXRef ());
 
     return TRUE;
@@ -158 +160 @@
     g_assert (NULL != m_Document && "The document has not been loaded.");
 
-    // Retrieve the document's meta data dictionary.
-    Object dictionary;
-    m_Document->getDocInfo (&dictionary);
-
-    gchar *value = NULL;
-    // Author
-    value = getDictionaryString (dictionary, "Author");
-    setAuthor (value);
-    g_free (value);
-    // Creation date.
-    value = getDictionaryDate (dictionary, "CreationDate");
-    setCreationDate (value);
-    g_free (value);
-    // Creator
-    value = getDictionaryString (dictionary, "Creator");
-    setCreator (value);
-    g_free (value);
-    // PDF Format
-    value = g_strdup_printf ("PDF-%.2g", m_Document->getPDFVersion ());
-    setFormat (value);
-    g_free (value);
-    // Keywords
-    value = getDictionaryString (dictionary, "Keywords");
-    setKeywords (value);
-    g_free (value);
-    // Is linearised
-    setLinearized (m_Document->isLinearized ());
-    // Modified date
-    value = getDictionaryDate (dictionary, "ModDate");
-    setModifiedDate (value);
-    g_free (value);
-    // Producer
-    value = getDictionaryString (dictionary, "Producer");
-    setProducer (value);
-    g_free (value);
-    // Subject
-    value = getDictionaryString (dictionary, "Subject");
-    setSubject (value);
-    g_free (value);
-    // Title
-    value = getDictionaryString (dictionary, "Title");
-    setTitle (value);
-    g_free (value);
-
-    // For the page mode and layout we need the catalog, not the
-    // dictionary.
-    Catalog *catalog = m_Document->getCatalog ();
-    setPageLayout (convertPageLayout (catalog->getPageLayout ()));
-    setPageMode (convertPageMode (catalog->getPageMode ()));
+
+    gchar *author = NULL;
+    GTime creationDate;
+    gchar *creator = NULL;
+    gchar *format = NULL;
+    gchar *keywords = NULL;
+    PopplerPageLayout layout = POPPLER_PAGE_LAYOUT_UNSET;
+    gchar *linearized = NULL;
+    GTime modDate;
+    PopplerPageMode mode = POPPLER_PAGE_MODE_UNSET;
+    gchar *producer = NULL;
+    gchar *subject = NULL;
+    gchar *title = NULL;
+   
+    g_object_get (m_Document,
+            "author", &author,
+            "creation-date", &creationDate,
+            "creator", &creator,
+            "format", &format,
+            "keywords", &keywords,
+            "page-layout", &layout,
+            "linearized", &linearized,
+            "mod-date", &modDate,
+            "page-mode", &mode,
+            "producer", &producer,
+            "subject", &subject,
+            "title", &title,
+            NULL);
+    setAuthor (author);
+    if ( 0 < creationDate )
+    {
+        struct tm *tmpTime = localtime ((const time_t *)&creationDate);
+        gchar *date = g_strnfill (DATE_LENGTH + 1, 0);
+        strftime (date, DATE_LENGTH, "%Y-%m-%d %H:%M:%S", tmpTime);
+        setCreationDate (date);
+    }
+    else
+    {
+        setCreationDate (NULL);
+    }
+    setCreator (creator);
+    setFormat (format);
+    setKeywords (keywords);
+    setLinearized (linearized);
+    if ( 0 < modDate )
+    {
+        struct tm *tmpTime = localtime ((const time_t *)&modDate);
+        gchar *date = g_strnfill (DATE_LENGTH + 1, 0);
+        strftime (date, DATE_LENGTH, "%Y-%m-%d %H:%M:%S", tmpTime);
+        setModifiedDate (date);
+    }
+    else
+    {
+        setModifiedDate (NULL);
+    }
+    setProducer (producer);
+    setSubject (subject);
+    setTitle (title);
+
+    // For the page mode and layout we need the enumerator value
+    GEnumValue *pageLayout = g_enum_get_value (
+            (GEnumClass *)g_type_class_peek (POPPLER_TYPE_PAGE_LAYOUT), layout);
+    setPageLayout (convertPageLayout (pageLayout->value));
+    GEnumValue *pageMode = g_enum_get_value (
+            (GEnumClass *)g_type_class_peek (POPPLER_TYPE_PAGE_MODE), mode);
+    setPageMode (convertPageMode (pageMode->value));
 
     // Get the number of pages and set the current to the first.
-    setNumPages (m_Document->getNumPages ());
+    setNumPages (poppler_document_get_n_pages (m_Document));
     goToFirstPage ();
 }
@@ -222 +241 @@
 ///                call must be set to the root DocumentOutline.
 /// @param childrenList The list of children for to set to @a outline.
-///                     The first line must be a call to the getItems()
-///                     function from the PDF's outline.
+///                     The first line must be the returned valued of
+///                     poppler_index_iter_new().
 ///
 void
-PDFDocument::setOutline (DocumentOutline *outline, GooList *childrenList)
+PDFDocument::setOutline (DocumentOutline *outline, 
+                         PopplerIndexIter *childrenList)
 {
     if ( NULL != childrenList )
     {
-        int numChildren = childrenList->getLength ();
-        for ( int childIndex = 0 ; childIndex < numChildren ; childIndex++ )
+        do
         {
-            OutlineItem *item = (OutlineItem *)childrenList->get (childIndex);
-            // Get the title, create the new child outline and set the
-            // title to it.
-            gchar *title = g_ucs4_to_utf8 (item->getTitle (),
-                                           item->getTitleLength (), 
-                                           NULL, NULL, NULL);
-            DocumentOutline *child = new DocumentOutline ();
-            child->setParent (outline);
-            child->setTitle (title);
-            g_free (title);
-            /// Get the page destination.
-            gint destination = 1;
-            LinkAction *action = item->getAction ();
-            if ( NULL != action && actionGoTo == action->getKind () &&
-                 action->isOk () )
+            PopplerAction *action = 
+                poppler_index_iter_get_action (childrenList);
+            if ( POPPLER_ACTION_GOTO_DEST == action->type )
             {
-                LinkDest *linkDestination = NULL;
-                GooString *namedDest = ((LinkGoTo *)action)->getNamedDest ();
-                // getNamedDest() or getDest() will return NULL, just need to
-                // find which one.
-                if ( NULL != namedDest )
-                {
-                    linkDestination = m_Document->findDest (namedDest);
-                }
-                else
-                {
-                    linkDestination = ((LinkGoTo *)action)->getDest ();
-                }
-                if ( NULL != linkDestination && linkDestination->isOk () )
-                {
-                    if ( linkDestination->isPageRef () )
-                    {
-                        Ref pageReference = linkDestination->getPageRef ();
-                        destination = m_Document->findPage (pageReference.num,
-                                                            pageReference.gen);
-                    }
-                    else
-                    {
-                        destination = linkDestination->getPageNum ();
-                    }
-                } // if ( linkDestination->isOk () )
-            } // if ( NULL != action ... )
-            child->setDestination (destination);
-            outline->addChild (child);
-            // Add the child's children, if any.
-            if ( item->hasKids () )
-            {
-                // I need to open the outline because if it's not
-                // open then the getKids() function would return NULL.
-                item->open ();
-                setOutline (child, item->getKids ());
+                PopplerActionGotoDest *actionGoTo = 
+                    (PopplerActionGotoDest *)action;
+                DocumentOutline *child = new DocumentOutline ();
+                child->setParent (outline);
+                child->setTitle (actionGoTo->title);
+                PopplerDest *destination = actionGoTo->dest;
+                child->setDestination (destination->page_num);
+                outline->addChild (child);