Changeset 204

Timestamp:

06/10/06 04:36:58 (2 years ago)

Author:

jordi

Message:

The functions I used to fix ticket #28 (named links in some PDF's) where only available in Poppler versions 0.5.2 and upper. Since Poppler versions 0.5.0 and 0.5.1 also works with those documents I added a check for the current version of poppler and made to conditionaly compile the named links part based on the version found.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• src/PDFDocument.cxx (modified) (4 diffs)

trunk/configure.ac

@@ -40 +40 @@
 AC_SUBST([POPPLER_CFLAGS])
 AC_SUBST([POPPLER_LIBS])
+dnl Check if we have poppler version 0.5.2 or higher.
+PKG_CHECK_EXISTS([poppler-glib >= 0.5.2], [have_popppler_052=yes])
+if test "x$have_poppler_052" = "xyes"; then
+    AC_DEFINE([HAVE_POPPLER_0_5_2], [1], [Define to 1 if you have Poppler version 0.5.2 or higher.])
+fi
+
 
 dnl CPPUnit library

trunk/src/PDFDocument.cxx

@@ -86 +86 @@
         {
             PopplerActionGotoDest *actionGoTo = (PopplerActionGotoDest *)action;
-            int pageNum = 0;
             PopplerDest *destination = actionGoTo->dest;
+            int pageNum = destination->page_num;
+#if defined (HAVE_POPPLER_0_5_2)
             if ( POPPLER_DEST_NAMED == destination->type )
             {
@@ -99 +100 @@
                 }
             }
-            else
-            {
-                pageNum = destination->page_num;
-            }
+#endif // HAVE_POPPLER_0_5_2
 
             documentLink = new DocumentLinkGoto (
@@ -401 +399 @@
                 child->setTitle (actionGoTo->title);
                 PopplerDest *destination = actionGoTo->dest;
+                child->setDestination (destination->page_num);
+#if defined (HAVE_POPPLER_0_5_2)
                 if ( POPPLER_DEST_NAMED == destination->type )
                 {
@@ -413 +413 @@
                     }
                 }
-                else
-                {
-                    child->setDestination (destination->page_num);
-                }
+#endif // HAVE_POPPLER_0_5_2
 
                     outline->addChild (child);