Changeset 307 for trunk

Timestamp:

04/11/08 10:08:07 (8 months ago)

Author:

jordi

Message:

Based on patches sent by Rafał Mużyło and zhou sf, I've added code to be able to build ePDFView with poppler 0.8.0 due a change in the API: poppler_page_get_selection_region() returns the a Glist wherein 0.6.* it returns a GdkRegion?.

Location:

trunk

Files:

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

trunk/THANKS

@@ -18 +18 @@
     - Panchoat <panchoat@gmail.com>, for his Simplified Chinese translation.
     - Piotr Pacholak <obi_gl@o2.pl>, for corrections in the Polish translation.
+    - Rafał MuÅŒyło <galtgendo@o2.pl>, for his patches.
     - Sergey Starosek <sergey.starosek@gmail.com>, for his Russian patches.
     - Stavros Giannouris <stavrosg2002@freemail.gr>, for his Greek translation.

trunk/configure.ac

@@ -49 +49 @@
     AC_DEFINE([HAVE_POPPLER_0_6_0], [1], [Define to 1 if you have Poppler version 0.6.0 or higher.])
 fi
+PKG_CHECK_EXISTS([poppler-glib >= 0.8], [have_poppler_080=yes])
+if test "x$have_poppler_080" = "xyes"; then
+    AC_DEFINE([HAVE_POPPLER_0_8_0], [1], [Define to 1 if you have Poppler version 0.8.0 or higher.])
+fi
 
 EPDFVIEW_PATH_CUPS([CUPS], [have_cups=yes])

trunk/src/PDFDocument.cxx

@@ -192 +192 @@
 ///                 path.
 /// @param password The password to use to open @a filename.
-/// @param error Location to store the error occurring or NULL to ignore 
+/// @param error Location to store the error occurring or NULL to ignore
 ///              errors.
 ///
@@ -258 +258 @@
         {
             // OK, the glib's wrapper don't pass the error code directly
-            // from Poppler. Instead returns G_FILE_ERROR_FAILED and a 
+            // 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.
@@ -413 +413 @@
     // We'll already calculate the positions scaled.
     gdouble scale = getZoom ();
-    GList *pageLinks = poppler_page_get_link_mapping (popplerPage); 
+    GList *pageLinks = poppler_page_get_link_mapping (popplerPage);
     for (GList *pageLink = g_list_first (pageLinks) ;
          NULL != pageLink ;
@@ -441 +441 @@
 ///
 void
-PDFDocument::setOutline (DocumentOutline *outline, 
+PDFDocument::setOutline (DocumentOutline *outline,
                          PopplerIndexIter *childrenList)
 {
@@ -475 +475 @@
 
                     outline->addChild (child);
-                PopplerIndexIter *childIter = 
+                PopplerIndexIter *childIter =
                     poppler_index_iter_get_child (childrenList);
                 setOutline (child, childIter);
             }
-        } 
+        }
         while ( poppler_index_iter_next (childrenList) );
 
@@ -491 +491 @@
 /// Retrieves the width and height of a document's page before to scale, but
 /// after rotation.
-/// 
+///
 /// @param pageNum The page to get its size.
 /// @param width The output pointer to save the page's width.
@@ -667 +667 @@
 }
 
-void 
+void
 PDFDocument::setTextSelection (DocumentRectangle *rect)
 {
@@ -678 +678 @@
     gdouble pageWidth, pageHeight;
     poppler_page_get_size(page, &pageWidth, &pageHeight);
-    
+
     //for get text we must exchange y coordinate, don't ask me where logic here.
     PopplerRectangle textRect = { rect->getX1() / getZoom(),
@@ -694 +694 @@
     if(!text)
         goto cleanup;
-        
+
     for ( GList *obs = g_list_first (m_Observers) ;
           NULL != obs ;
@@ -723 +723 @@
     rect.y1 = r->getY1() / getZoom();
     rect.x2 = r->getX2() / getZoom();
-    rect.y2 = r->getY2() / getZoom();   
+    rect.y2 = r->getY2() / getZoom();
     repairEmpty(rect);
 
     //calc selection size
-#if defined (HAVE_POPPLER_0_6_0)
+#if defined (HAVE_POPPLER_0_8_0)
+    GList *selections = poppler_page_get_selection_region(page, getZoom(),
+             POPPLER_SELECTION_GLYPH, &rect);
+    res = gdk_region_new();
+    for (GList *selection = g_list_first (selections) ;
+         NULL != selection ; selection = g_list_next (selection)) {
+        PopplerRectangle *rectangle = (PopplerRectangle *)selection->data;
+        GdkRectangle rect;
+
+        rect.x = (gint)rectangle->x1;
+        rect.y = (gint)rectangle->y1;
+        rect.width  = (gint) (rectangle->x2 - rectangle->x1);
+        rect.height = (gint) (rectangle->y2 - rectangle->y1);
+
+        gdk_region_union_with_rect (res, &rect);
+    }
+    poppler_page_selection_region_free (selections);
+#elif defined (HAVE_POPPLER_0_6_0)
     res = poppler_page_get_selection_region(page, getZoom(),
             POPPLER_SELECTION_GLYPH, &rect);
@@ -733 +750 @@
     res = poppler_page_get_selection_region(page, getZoom(), &rect);
 #endif // HAVE_POPPLER_0_6_0
-                             
+
     //free some local data
     g_object_unref(page);