tag:old.nabble.com,2006:forum-1072
Nabble - Free Desktop - poppler
2009-12-14T18:28:54Z
PDF rendering library.
tag:old.nabble.com,2006:post-26788465
Trying to extend pdftoppm to use CairoOutputDev
2009-12-14T18:28:54Z
2009-12-14T18:28:54Z
mpsuzuki
Dear Poppler developers,
<br><br>Before all, I thank poppler developers for writing excellent
<br>software. The addition of CairoOutputDev is very interesting.
<br><br>Now I'm trying to extend pdftoppm to draw on CairoOutputDev.
<br>My motivation is splitting a large table in PDF document
<br>into small PDFs for each cell.
<br><br>Recent poppler has a feature to draw on cairo surface, so
<br>I think it is possible to do such by pdftoppm draw a cell
<br>(by the specification of geometry for a cell) on cairo surface,
<br>something like:
<br><br> pdftoppm \
<br> -f [page_num] -l [page_num] \
<br> -r [dpi_to_specify_the_unit_of_geometry] \
<br> -x [cell_pos_x] -y [cell_pos_y] \
<br> -w [cell_width] -h [cell_height] \
<br> -pdf [input_table.pdf] [output_cell_prefix]
<br><br>Attached patch is an experiment doing such, please comment
<br>what should be improved for the official adoption.
<br><br>By default, "-r" option for "pdftoppm -pdf" is used only
<br>as an unit to calculate the geometry to be cropped, and
<br>it does not change the resolution of output PDF. This is
<br>inconsistent with "-r" option for SplashOutputDev cases.
<br>If MODIFY_RESOLUTION_IN_PDF2CAIRO is defined in the compilation,
<br>the behaviour of "-r" is consistent with the case of
<br>SplashOutputDev.
<br><br>The problems that I've already recognized are:
<br><br>* If a PDF including large image (e.g. PDF generated by
<br> image scanners) is given, the cropped PDF includes
<br> whole image object, not cropped image object.
<br> The filesize of cropped PDF is not reduced.
<br><br>* When multiple pages are rendered (e.g. pdftoppm -pdf
<br> -f 1 -l 100 ...), startDoc() is invoked for each
<br> output file. As a result, the rendering speed is
<br> slower than that of SplashOutputDev.
<br><br>Regards,
<br>mpsuzuki
<br><br /><tt>[pdftoppm-cairo.patch]</tt><br /><hr align="left" width="300" /><tt>diff --git a/utils/Makefile.am b/utils/Makefile.am
<br>index e57c71b..48bb7a7 100644
<br>--- a/utils/Makefile.am
<br>+++ b/utils/Makefile.am
<br>@@ -4,6 +4,11 @@ pdftoppm_SOURCES = \
<br> pdftoppm.cc \
<br> $(common)
<br>
<br>+pdftoppm_LDADD = \
<br>+ $(LDADD) \
<br>+ $(top_builddir)/poppler/libpoppler-cairo.la \
<br>+ $(CAIRO_LIBS)
<br>+
<br> pdftoppm_binary = pdftoppm
<br>
<br> pdftoppm_manpage = pdftoppm.1
<br>@@ -17,6 +22,7 @@ INCLUDES = \
<br> -I$(top_srcdir)/poppler \
<br> $(UTILS_CFLAGS) \
<br> $(FONTCONFIG_CFLAGS) \
<br>+ $(CAIRO_CFLAGS) \
<br> $(ABIWORD_CFLAGS)
<br>
<br> LDADD = \
<br>diff --git a/utils/pdftoppm.cc b/utils/pdftoppm.cc
<br>index e27aa44..8d486df 100644
<br>--- a/utils/pdftoppm.cc
<br>+++ b/utils/pdftoppm.cc
<br>@@ -37,6 +37,8 @@
<br> #include "splash/SplashBitmap.h"
<br> #include "splash/Splash.h"
<br> #include "SplashOutputDev.h"
<br>+#include "CairoOutputDev.h"
<br>+#include <cairo-pdf.h>
<br>
<br> #define PPM_FILE_SZ 512
<br>
<br>@@ -58,6 +60,7 @@ static GBool mono = gFalse;
<br> static GBool gray = gFalse;
<br> static GBool png = gFalse;
<br> static GBool jpeg = gFalse;
<br>+static GBool pdf = gFalse;
<br> static char enableFreeTypeStr[16] = "";
<br> static char antialiasStr[16] = "";
<br> static char vectorAntialiasStr[16] = "";
<br>@@ -111,6 +114,10 @@ static const ArgDesc argDesc[] = {
<br> {"-jpeg", argFlag, &jpeg, 0,
<br> "generate a JPEG file"},
<br> #endif
<br>+#if HAVE_CAIRO
<br>+ {"-pdf", argFlag, &pdf, 0,
<br>+ "generate a PDF file"},
<br>+#endif
<br> #if HAVE_FREETYPE_FREETYPE_H | HAVE_FREETYPE_H
<br> {"-freetype", argString, enableFreeTypeStr, sizeof(enableFreeTypeStr),
<br> "enable FreeType font rasterizer: yes, no"},
<br>@@ -177,6 +184,22 @@ static void savePageSlice(PDFDoc *doc,
<br> }
<br> }
<br>
<br>+static void savePageSliceCairo(PDFDoc *doc,
<br>+ CairoOutputDev *cairoOut,
<br>+ int pg, int x, int y, int w, int h,
<br>+ double pg_w, double pg_h) {
<br>+ if (w == 0) w = (int)ceil(pg_w);
<br>+ if (h == 0) h = (int)ceil(pg_h);
<br>+ w = (x+w > pg_w ? (int)ceil(pg_w-x) : w);
<br>+ h = (y+h > pg_h ? (int)ceil(pg_h-y) : h);
<br>+
<br>+#ifdef MODIFY_RESOLUTION_IN_PDF2CAIRO
<br>+ doc->displayPageSlice(cairoOut, pg, x_resolution, y_resolution, 0, !useCropBox, gFalse, gFalse, x, y, w, h);
<br>+#else
<br>+ doc->displayPageSlice(cairoOut, pg, 72, 72, 0, !useCropBox, gFalse, gFalse, x, y, w, h);
<br>+#endif
<br>+}
<br>+
<br> int main(int argc, char *argv[]) {
<br> PDFDoc *doc;
<br> GooString *fileName = NULL;
<br>@@ -185,6 +208,11 @@ int main(int argc, char *argv[]) {
<br> GooString *ownerPW, *userPW;
<br> SplashColor paperColor;
<br> SplashOutputDev *splashOut;
<br>+
<br>+ cairo_surface_t *surface = NULL;
<br>+ cairo_t* cr = NULL;
<br>+ CairoOutputDev *cairoOut = NULL;
<br>+
<br> GBool ok;
<br> int exitCode;
<br> int pg, pg_num_len;
<br>@@ -272,15 +300,18 @@ int main(int argc, char *argv[]) {
<br> if (lastPage < 1 || lastPage > doc->getNumPages())
<br> lastPage = doc->getNumPages();
<br>
<br>- // write PPM files
<br>- paperColor[0] = 255;
<br>- paperColor[1] = 255;
<br>- paperColor[2] = 255;
<br>- splashOut = new SplashOutputDev(mono ? splashModeMono1 :
<br>+ // CairoOutputDev is bound to output file,
<br>+ // initialization for PDF is postponed.
<br>+ if (!pdf) {
<br>+ paperColor[0] = 255;
<br>+ paperColor[1] = 255;
<br>+ paperColor[2] = 255;
<br>+ splashOut = new SplashOutputDev(mono ? splashModeMono1 :
<br> gray ? splashModeMono8 :
<br> splashModeRGB8, 4,
<br> gFalse, paperColor);
<br>- splashOut->startDoc(doc->getXRef());
<br>+ splashOut->startDoc(doc->getXRef());
<br>+ }
<br> if (sz != 0) w = h = sz;
<br> pg_num_len = (int)ceil(log((double)doc->getNumPages()) / log((double)10));
<br> for (pg = firstPage; pg <= lastPage; ++pg) {
<br>@@ -310,16 +341,46 @@ int main(int argc, char *argv[]) {
<br> pg_w = pg_h;
<br> pg_h = tmp;
<br> }
<br>+
<br> if (ppmRoot != NULL) {
<br> snprintf(ppmFile, PPM_FILE_SZ, "%.*s-%0*d.%s",
<br> PPM_FILE_SZ - 32, ppmRoot, pg_num_len, pg,
<br>- png ? "png" : jpeg ? "jpg" : mono ? "pbm" : gray ? "pgm" : "ppm");
<br>- savePageSlice(doc, splashOut, pg, x, y, w, h, pg_w, pg_h, ppmFile);
<br>- } else {
<br>- savePageSlice(doc, splashOut, pg, x, y, w, h, pg_w, pg_h, NULL);
<br>+ pdf ? "pdf" : png ? "png" : jpeg ? "jpg" : mono ? "pbm" : gray ? "pgm" : "ppm");
<br> }
<br>+
<br>+
<br>+ if (pdf) {
<br>+ // postponed initialization for cairo output device
<br>+#ifdef MODIFY_RESOLUTION_IN_PDF2CAIRO
<br>+ surface = cairo_pdf_surface_create( ppmFile, w, h );
<br>+#else
<br>+ surface = cairo_pdf_surface_create( ppmFile,
<br>+ 72 * w / x_resolution,
<br>+ 72 * h / y_resolution );
<br>+#endif
<br>+ cr = cairo_create( surface );
<br>+ cairo_surface_destroy( surface );
<br>+ cairoOut = new CairoOutputDev;
<br>+ cairoOut->setCairo( cr );
<br>+ cairo_destroy( cr );
<br>+ cairoOut->startDoc( doc->getXRef(), doc->getCatalog() );
<br>+#ifdef MODIFY_RESOLUTION_IN_PDF2CAIRO
<br>+ savePageSliceCairo(doc, cairoOut, pg, x, y, w, h, pg_w, pg_h);
<br>+#else
<br>+ savePageSliceCairo(doc, cairoOut, pg,
<br>+ 72 * x / x_resolution,
<br>+ 72 * y / y_resolution,
<br>+ 72 * w / x_resolution,
<br>+ 72 * h / y_resolution,
<br>+ pg_w, pg_h);
<br>+#endif
<br>+ cairoOut->setCairo( NULL );
<br>+ delete cairoOut;
<br>+ } else
<br>+ savePageSlice(doc, splashOut, pg, x, y, w, h, pg_w, pg_h, ppmFile);
<br> }
<br>- delete splashOut;
<br>+ if (!pdf)
<br>+ delete splashOut;
<br>
<br> exitCode = 0;
<br>
<br></tt><hr align="left" width="300" /><br />_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26788465&i=0" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26787250
Branch 'cpp-frontend' - cpp/poppler-global.cpp cpp/poppler-private.cpp
2009-12-14T15:55:55Z
2009-12-14T15:55:55Z
Pino Toscano-2
cpp/poppler-global.cpp | 2 +-
<br> cpp/poppler-private.cpp | 2 +-
<br> 2 files changed, 2 insertions(+), 2 deletions(-)
<br><br>New commits:
<br>commit ca1d2ec4588b2437b58b4448ae2fc5ebd0f130d3
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26787250&i=0" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Tue Dec 15 00:54:29 2009 +0100
<br><br> [cpp] fix the reference to the vector data
<br><br>diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp
<br>index cc52b55..424f947 100644
<br>--- a/cpp/poppler-global.cpp
<br>+++ b/cpp/poppler-global.cpp
<br>@@ -161,7 +161,7 @@ std::ostream& poppler::operator<<(std::ostream& stream, const byte_array &array)
<br> stream << "[";
<br> const std::ios_base::fmtflags f = stream.flags();
<br> std::hex(stream);
<br>- const char *data = array.data();
<br>+ const char *data = &array[0];
<br> const byte_array::size_type out_len = std::min<byte_array::size_type>(array.size(), 50);
<br> for (byte_array::size_type i = 0; i < out_len; ++i)
<br> {
<br>diff --git a/cpp/poppler-private.cpp b/cpp/poppler-private.cpp
<br>index 6ab3b6c..1ba3433 100644
<br>--- a/cpp/poppler-private.cpp
<br>+++ b/cpp/poppler-private.cpp
<br>@@ -64,6 +64,6 @@ ustring detail::unicode_to_ustring(const Unicode *u, int length)
<br> GooString* detail::ustring_to_unicode_GooString(const ustring &str)
<br> {
<br> const byte_array utf8_data = str.to_utf_8();
<br>- GooString *goo = new GooString(utf8_data.data());
<br>+ GooString *goo = new GooString(&utf8_data[0]);
<br> return goo;
<br> }
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26787250&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26787038
Branch 'cpp-frontend' - cpp/poppler-document.cpp
2009-12-14T15:37:41Z
2009-12-14T15:37:41Z
Pino Toscano-2
cpp/poppler-document.cpp | 2 +-
<br> 1 file changed, 1 insertion(+), 1 deletion(-)
<br><br>New commits:
<br>commit 16c946e7658b0e9cff701ce1d6bbf7d3828cbe08
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26787038&i=0" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Tue Dec 15 00:35:25 2009 +0100
<br><br> [cpp] fix the reference to the vector data
<br><br>diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
<br>index 0ff526f..ab3939b 100644
<br>--- a/cpp/poppler-document.cpp
<br>+++ b/cpp/poppler-document.cpp
<br>@@ -58,7 +58,7 @@ document_private::document_private(byte_array *file_data,
<br> Object obj;
<br> obj.initNull();
<br> file_data->swap(doc_data);
<br>- MemStream *memstr = new MemStream(doc_data.data(), 0, doc_data.size(), &obj);
<br>+ MemStream *memstr = new MemStream(&doc_data[0], 0, doc_data.size(), &obj);
<br> GooString goo_owner_password(owner_password.c_str());
<br> GooString goo_user_password(user_password.c_str());
<br> doc = new PDFDoc(memstr, &goo_owner_password, &goo_user_password);
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26787038&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26786508
Branch 'cpp-frontend' - 11 commits - cpp/CMakeLists.txt cpp/Makefile.am cpp/poppler-document.cpp cpp/poppler-document.h cpp/poppler-document-private.h cpp/poppler-embedded-file.cpp cpp/poppler-embedded-file.h cpp/poppler-global.cpp cpp/poppler-global.h cpp/poppler-private.cpp cpp/poppler-rectangle.cpp cpp/poppler-rectangle.h cpp/poppler-version.cpp
2009-12-14T14:57:43Z
2009-12-14T14:57:43Z
Pino Toscano-2
cpp/CMakeLists.txt | 1
<br> cpp/Makefile.am | 1
<br> cpp/poppler-document-private.h | 5 ++
<br> cpp/poppler-document.cpp | 77 ++++++++++++++++++++++++++++++++++++++++-
<br> cpp/poppler-document.h | 11 ++++-
<br> cpp/poppler-embedded-file.cpp | 6 +--
<br> cpp/poppler-embedded-file.h | 2 -
<br> cpp/poppler-global.cpp | 37 ++++++++++++++-----
<br> cpp/poppler-global.h | 12 +++++-
<br> cpp/poppler-private.cpp | 5 +-
<br> cpp/poppler-rectangle.cpp | 35 ++++++++++++++++++
<br> cpp/poppler-rectangle.h | 8 +++-
<br> cpp/poppler-version.cpp | 8 ++--
<br> 13 files changed, 182 insertions(+), 26 deletions(-)
<br><br>New commits:
<br>commit 9bb90c99b65e0e9d9b65c7dbeb5b4d66377ceb21
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=0" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 23:43:12 2009 +0100
<br><br> [cpp] add destructor for 'rectangle'
<br><br>diff --git a/cpp/poppler-rectangle.h b/cpp/poppler-rectangle.h
<br>index a2b7c10..18674b2 100644
<br>--- a/cpp/poppler-rectangle.h
<br>+++ b/cpp/poppler-rectangle.h
<br>@@ -33,7 +33,8 @@ public:
<br> rectangle(T _x, T _y, T w, T h)
<br> : x1(_x), y1(_y), x2(x1 + w), y2(y1 + h)
<br> {}
<br>- ~rectangle();
<br>+ ~rectangle()
<br>+ {}
<br>
<br> bool is_empty() const
<br> { return (x1 == x2) && (y1 == y2); }
<br>commit 61ccdc9ab3b816174896fcae0899ff34f11eee80
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=1" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 23:40:51 2009 +0100
<br><br> [cpp] add out stream operators for rect and rectf
<br><br>diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
<br>index 3f8e9d9..0a0c6f0 100644
<br>--- a/cpp/CMakeLists.txt
<br>+++ b/cpp/CMakeLists.txt
<br>@@ -13,6 +13,7 @@ set(poppler_cpp_SRCS
<br> poppler-page.cpp
<br> poppler-page-transition.cpp
<br> poppler-private.cpp
<br>+ poppler-rectangle.cpp
<br> poppler-toc.cpp
<br> poppler-version.cpp
<br> )
<br>diff --git a/cpp/Makefile.am b/cpp/Makefile.am
<br>index b6c2d8e..6259770 100644
<br>--- a/cpp/Makefile.am
<br>+++ b/cpp/Makefile.am
<br>@@ -25,6 +25,7 @@ libpoppler_cpp_la_SOURCES = \
<br> poppler-page.cpp \
<br> poppler-page-transition.cpp \
<br> poppler-private.cpp \
<br>+ poppler-rectangle.cpp \
<br> poppler-toc.cpp \
<br> poppler-version.cpp
<br>
<br>diff --git a/cpp/poppler-rectangle.cpp b/cpp/poppler-rectangle.cpp
<br>new file mode 100644
<br>index 0000000..57fd859
<br>--- /dev/null
<br>+++ b/cpp/poppler-rectangle.cpp
<br>@@ -0,0 +1,35 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=2" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-rectangle.h"
<br>+
<br>+#include <iostream>
<br>+
<br>+using namespace poppler;
<br>+
<br>+std::ostream& poppler::operator<<(std::ostream& stream, const rect &r)
<br>+{
<br>+ stream << "[" << r.x() << "," << r.y() << " " << r.width() << "+" << r.height() << "]";
<br>+ return stream;
<br>+}
<br>+
<br>+std::ostream& poppler::operator<<(std::ostream& stream, const rectf &r)
<br>+{
<br>+ stream << "[" << r.x() << "," << r.y() << " " << r.width() << "+" << r.height() << "]";
<br>+ return stream;
<br>+}
<br>diff --git a/cpp/poppler-rectangle.h b/cpp/poppler-rectangle.h
<br>index 7465edc..a2b7c10 100644
<br>--- a/cpp/poppler-rectangle.h
<br>+++ b/cpp/poppler-rectangle.h
<br>@@ -19,6 +19,8 @@
<br> #ifndef POPPLER_RECTANGLE_H
<br> #define POPPLER_RECTANGLE_H
<br>
<br>+#include "poppler-global.h"
<br>+
<br> namespace poppler
<br> {
<br>
<br>@@ -55,6 +57,9 @@ private:
<br> typedef rectangle<int> rect;
<br> typedef rectangle<double> rectf;
<br>
<br>+POPPLER_CPP_EXPORT std::ostream& operator<<(std::ostream& stream, const rect &r);
<br>+POPPLER_CPP_EXPORT std::ostream& operator<<(std::ostream& stream, const rectf &r);
<br>+
<br> }
<br>
<br> #endif
<br>commit 69dd51fed3de41f8b799b811ae5ee59c0d5f59c2
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=3" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 22:24:07 2009 +0100
<br><br> [cpp] add namespace to namespace functiond to link properly
<br><br>diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp
<br>index 9ce7641..cc52b55 100644
<br>--- a/cpp/poppler-global.cpp
<br>+++ b/cpp/poppler-global.cpp
<br>@@ -133,7 +133,7 @@ ustring ustring::from_latin1(const std::string &str)
<br> }
<br>
<br>
<br>-unsigned int convert_date(const std::string &date)
<br>+unsigned int poppler::convert_date(const std::string &date)
<br> {
<br> int year, mon, day, hour, min, sec, tzHours, tzMins;
<br> char tz;
<br>@@ -156,7 +156,7 @@ unsigned int convert_date(const std::string &date)
<br> return mktime(&time);
<br> }
<br>
<br>-std::ostream& operator<<(std::ostream& stream, const byte_array &array)
<br>+std::ostream& poppler::operator<<(std::ostream& stream, const byte_array &array)
<br> {
<br> stream << "[";
<br> const std::ios_base::fmtflags f = stream.flags();
<br>diff --git a/cpp/poppler-version.cpp b/cpp/poppler-version.cpp
<br>index 89f95a3..b39af53 100644
<br>--- a/cpp/poppler-version.cpp
<br>+++ b/cpp/poppler-version.cpp
<br>@@ -20,22 +20,22 @@
<br>
<br> using namespace poppler;
<br>
<br>-std::string version_string()
<br>+std::string poppler::version_string()
<br> {
<br> return std::string(POPPLER_VERSION);
<br> }
<br>
<br>-unsigned int version_major()
<br>+unsigned int poppler::version_major()
<br> {
<br> return POPPLER_VERSION_MAJOR;
<br> }
<br>
<br>-unsigned int version_minor()
<br>+unsigned int poppler::version_minor()
<br> {
<br> return POPPLER_VERSION_MINOR;
<br> }
<br>
<br>-unsigned int version_micro()
<br>+unsigned int poppler::version_micro()
<br> {
<br> return POPPLER_VERSION_MICRO;
<br> }
<br>commit 3923fa4890984d8616d86016f4f4a94e8ef3e992
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=4" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 22:23:15 2009 +0100
<br><br> [cpp] add default empty parameters for the passwords of the document loading functions
<br><br>diff --git a/cpp/poppler-document.h b/cpp/poppler-document.h
<br>index ab6eb27..5d394bb 100644
<br>--- a/cpp/poppler-document.h
<br>+++ b/cpp/poppler-document.h
<br>@@ -81,11 +81,11 @@ public:
<br> std::vector<embedded_file *> embedded_files() const;
<br>
<br> static document* load_from_file(const std::string &file_name,
<br>- const std::string &owner_password,
<br>- const std::string &user_password);
<br>+ const std::string &owner_password = std::string(),
<br>+ const std::string &user_password = std::string());
<br> static document* load_from_data(byte_array *file_data,
<br>- const std::string &owner_password,
<br>- const std::string &user_password);
<br>+ const std::string &owner_password = std::string(),
<br>+ const std::string &user_password = std::string());
<br>
<br> private:
<br> document(document_private &dd);
<br>commit 1d23cc677e9b0a9f61c53e0ea365537f33abe5bf
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=5" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 21:44:56 2009 +0100
<br><br> [cpp] add "human friendly" output representation for byte_array
<br><br>diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp
<br>index cc15bce..9ce7641 100644
<br>--- a/cpp/poppler-global.cpp
<br>+++ b/cpp/poppler-global.cpp
<br>@@ -22,6 +22,7 @@
<br>
<br> #include <ctime>
<br> #include <cstring>
<br>+#include <iostream>
<br>
<br> using namespace poppler;
<br>
<br>@@ -154,3 +155,25 @@ unsigned int convert_date(const std::string &date)
<br> time.tm_isdst = -1;
<br> return mktime(&time);
<br> }
<br>+
<br>+std::ostream& operator<<(std::ostream& stream, const byte_array &array)
<br>+{
<br>+ stream << "[";
<br>+ const std::ios_base::fmtflags f = stream.flags();
<br>+ std::hex(stream);
<br>+ const char *data = array.data();
<br>+ const byte_array::size_type out_len = std::min<byte_array::size_type>(array.size(), 50);
<br>+ for (byte_array::size_type i = 0; i < out_len; ++i)
<br>+ {
<br>+ if (i != 0) {
<br>+ stream << " ";
<br>+ }
<br>+ stream << ((data[i] & 0xf0) >> 4) << (data[i] & 0xf);
<br>+ }
<br>+ stream.flags(f);
<br>+ if (out_len < array.size()) {
<br>+ stream << " ...";
<br>+ }
<br>+ stream << "]";
<br>+ return stream;
<br>+}
<br>diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
<br>index da7c295..4b08e8d 100644
<br>--- a/cpp/poppler-global.h
<br>+++ b/cpp/poppler-global.h
<br>@@ -33,6 +33,7 @@
<br> # define POPPLER_CPP_EXPORT LIB_IMPORT
<br> #endif
<br>
<br>+#include <iosfwd>
<br> #include <string>
<br> #include <vector>
<br>
<br>@@ -88,6 +89,8 @@ private:
<br>
<br> POPPLER_CPP_EXPORT unsigned int /*time_t*/ convert_date(const std::string &date);
<br>
<br>+POPPLER_CPP_EXPORT std::ostream& operator<<(std::ostream& stream, const byte_array &array);
<br>+
<br> }
<br>
<br> #endif
<br>commit a337c1d757d52c1c238229d2f0cd3a41694b0e08
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=6" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 16:18:22 2009 +0100
<br><br> [cpp] add document metadata reading
<br><br>diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
<br>index ab14bf9..0ff526f 100644
<br>--- a/cpp/poppler-document.cpp
<br>+++ b/cpp/poppler-document.cpp
<br>@@ -294,6 +294,15 @@ bool document::has_permission(permission_enum which) const
<br> return true;
<br> }
<br>
<br>+ustring document::metadata() const
<br>+{
<br>+ std::auto_ptr<GooString> md(d->doc->getCatalog()->readMetadata());
<br>+ if (md.get()) {
<br>+ return detail::unicode_GooString_to_ustring(md.get());
<br>+ }
<br>+ return ustring();
<br>+}
<br>+
<br> int document::pages() const
<br> {
<br> return d->doc->getNumPages();
<br>diff --git a/cpp/poppler-document.h b/cpp/poppler-document.h
<br>index 66abe87..ab6eb27 100644
<br>--- a/cpp/poppler-document.h
<br>+++ b/cpp/poppler-document.h
<br>@@ -66,6 +66,7 @@ public:
<br> bool is_encrypted() const;
<br> bool is_linearized() const;
<br> bool has_permission(permission_enum which) const;
<br>+ ustring metadata() const;
<br>
<br> int pages() const;
<br> page* create_page(const ustring &label) const;
<br>commit c9cb6353ad5279d09615eb2c944b2b053cdf5ccc
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=7" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 15:52:25 2009 +0100
<br><br> [cpp] add function to query for document "permissions"
<br><br>diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
<br>index 908d4d2..ab14bf9 100644
<br>--- a/cpp/poppler-document.cpp
<br>+++ b/cpp/poppler-document.cpp
<br>@@ -271,6 +271,29 @@ bool document::is_linearized() const
<br> return d->doc->isLinearized();
<br> }
<br>
<br>+bool document::has_permission(permission_enum which) const
<br>+{
<br>+ switch (which) {
<br>+ case perm_print:
<br>+ return d->doc->okToPrint();
<br>+ case perm_change:
<br>+ return d->doc->okToChange();
<br>+ case perm_copy:
<br>+ return d->doc->okToCopy();
<br>+ case perm_add_notes:
<br>+ return d->doc->okToAddNotes();
<br>+ case perm_fill_forms:
<br>+ return d->doc->okToFillForm();
<br>+ case perm_accessibility:
<br>+ return d->doc->okToAccessibility();
<br>+ case perm_assemble:
<br>+ return d->doc->okToAssemble();
<br>+ case perm_print_high_resolution:
<br>+ return d->doc->okToPrintHighRes();
<br>+ }
<br>+ return true;
<br>+}
<br>+
<br> int document::pages() const
<br> {
<br> return d->doc->getNumPages();
<br>diff --git a/cpp/poppler-document.h b/cpp/poppler-document.h
<br>index cc3c10d..66abe87 100644
<br>--- a/cpp/poppler-document.h
<br>+++ b/cpp/poppler-document.h
<br>@@ -65,6 +65,7 @@ public:
<br> unsigned int /*time_t*/ info_date(const std::string &key) const;
<br> bool is_encrypted() const;
<br> bool is_linearized() const;
<br>+ bool has_permission(permission_enum which) const;
<br>
<br> int pages() const;
<br> page* create_page(const ustring &label) const;
<br>diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
<br>index a6a9146..da7c295 100644
<br>--- a/cpp/poppler-global.h
<br>+++ b/cpp/poppler-global.h
<br>@@ -60,6 +60,10 @@ enum rotation_enum { rotate_0, rotate_90, rotate_180, rotate_270 };
<br>
<br> enum page_box_enum { media_box, crop_box, bleed_box, trim_box, art_box };
<br>
<br>+enum permission_enum { perm_print, perm_change, perm_copy, perm_add_notes,
<br>+ perm_fill_forms, perm_accessibility, perm_assemble,
<br>+ perm_print_high_resolution };
<br>+
<br> typedef std::vector<char> byte_array;
<br>
<br> class POPPLER_CPP_EXPORT ustring : public std::basic_string<unsigned short>
<br>commit 30e90c7c1b41c62ddc21905e7ccdea4c95547e80
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=8" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 15:33:36 2009 +0100
<br><br> [cpp] add is_encrypted and is_linearized for document
<br><br>diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
<br>index d1bc026..908d4d2 100644
<br>--- a/cpp/poppler-document.cpp
<br>+++ b/cpp/poppler-document.cpp
<br>@@ -261,6 +261,16 @@ unsigned int document::info_date(const std::string &key) const
<br> return result;
<br> }
<br>
<br>+bool document::is_encrypted() const
<br>+{
<br>+ return d->doc->isEncrypted();
<br>+}
<br>+
<br>+bool document::is_linearized() const
<br>+{
<br>+ return d->doc->isLinearized();
<br>+}
<br>+
<br> int document::pages() const
<br> {
<br> return d->doc->getNumPages();
<br>diff --git a/cpp/poppler-document.h b/cpp/poppler-document.h
<br>index 213a81a..cc3c10d 100644
<br>--- a/cpp/poppler-document.h
<br>+++ b/cpp/poppler-document.h
<br>@@ -63,6 +63,8 @@ public:
<br> std::vector<std::string> info_keys() const;
<br> ustring info_key(const std::string &key) const;
<br> unsigned int /*time_t*/ info_date(const std::string &key) const;
<br>+ bool is_encrypted() const;
<br>+ bool is_linearized() const;
<br>
<br> int pages() const;
<br> page* create_page(const ustring &label) const;
<br>commit 93fd588c519958a1f66231c111ea8a6b0a759be1
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=9" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 13:19:24 2009 +0100
<br><br> [cpp] add the possibility to load a document from raw data
<br><br>diff --git a/cpp/poppler-document-private.h b/cpp/poppler-document-private.h
<br>index 52ed935..9820603 100644
<br>--- a/cpp/poppler-document-private.h
<br>+++ b/cpp/poppler-document-private.h
<br>@@ -19,6 +19,8 @@
<br> #ifndef POPPLER_DOCUMENT_PRIVATE_H
<br> #define POPPLER_DOCUMENT_PRIVATE_H
<br>
<br>+#include "poppler-global.h"
<br>+
<br> #include "poppler-config.h"
<br> #include "GooString.h"
<br> #include "PDFDoc.h"
<br>@@ -36,11 +38,14 @@ class document_private
<br> public:
<br> document_private(GooString *file_path, const std::string &owner_password,
<br> const std::string &user_password);
<br>+ document_private(byte_array *file_data, const std::string &owner_password,
<br>+ const std::string &user_password);
<br> ~document_private();
<br>
<br> static document* check_document(document_private *doc);
<br>
<br> PDFDoc *doc;
<br>+ byte_array doc_data;
<br> bool is_locked;
<br> std::vector<embedded_file *> embedded_files;
<br>
<br>diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
<br>index 46f52b9..d1bc026 100644
<br>--- a/cpp/poppler-document.cpp
<br>+++ b/cpp/poppler-document.cpp
<br>@@ -49,6 +49,22 @@ document_private::document_private(GooString *file_path, const std::string &owne
<br> init();
<br> }
<br>
<br>+document_private::document_private(byte_array *file_data,
<br>+ const std::string &owner_password,
<br>+ const std::string &user_password)
<br>+ : doc(0)
<br>+ , is_locked(false)
<br>+{
<br>+ Object obj;
<br>+ obj.initNull();
<br>+ file_data->swap(doc_data);
<br>+ MemStream *memstr = new MemStream(doc_data.data(), 0, doc_data.size(), &obj);
<br>+ GooString goo_owner_password(owner_password.c_str());
<br>+ GooString goo_user_password(user_password.c_str());
<br>+ doc = new PDFDoc(memstr, &goo_owner_password, &goo_user_password);
<br>+ init();
<br>+}
<br>+
<br> document_private::~document_private()
<br> {
<br> delete_all(embedded_files);
<br>@@ -106,11 +122,15 @@ bool document::unlock(const std::string &owner_password, const std::string &user
<br> {
<br> if (d->is_locked) {
<br> document_private *newdoc = 0;
<br>- {
<br>+ if (d->doc_data.size() > 0) {
<br>+ newdoc = new document_private(&d->doc_data,
<br>+ owner_password, user_password);
<br>+ } else {
<br> newdoc = new document_private(new GooString(d->doc->getFileName()),
<br> owner_password, user_password);
<br> }
<br> if (!newdoc->doc->isOk()) {
<br>+ d->doc_data.swap(newdoc->doc_data);
<br> delete newdoc;
<br> } else {
<br> delete d;
<br>@@ -314,3 +334,16 @@ document* document::load_from_file(const std::string &file_name,
<br> owner_password, user_password);
<br> return document_private::check_document(doc);
<br> }
<br>+
<br>+document* document::load_from_data(byte_array *file_data,
<br>+ const std::string &owner_password,
<br>+ const std::string &user_password)
<br>+{
<br>+ if (!file_data || file_data->size() < 10) {
<br>+ return 0;
<br>+ }
<br>+
<br>+ document_private *doc = new document_private(
<br>+ file_data, owner_password, user_password);
<br>+ return document_private::check_document(doc);
<br>+}
<br>diff --git a/cpp/poppler-document.h b/cpp/poppler-document.h
<br>index 7ff4337..213a81a 100644
<br>--- a/cpp/poppler-document.h
<br>+++ b/cpp/poppler-document.h
<br>@@ -79,6 +79,9 @@ public:
<br> static document* load_from_file(const std::string &file_name,
<br> const std::string &owner_password,
<br> const std::string &user_password);
<br>+ static document* load_from_data(byte_array *file_data,
<br>+ const std::string &owner_password,
<br>+ const std::string &user_password);
<br>
<br> private:
<br> document(document_private &dd);
<br>commit 53996365b159cf84adf2cac56c76b8bda8dfb12e
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=10" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 12:57:41 2009 +0100
<br><br> [cpp] use the byte_array typedef
<br><br>diff --git a/cpp/poppler-embedded-file.cpp b/cpp/poppler-embedded-file.cpp
<br>index 487b32d..6dfe321 100644
<br>--- a/cpp/poppler-embedded-file.cpp
<br>+++ b/cpp/poppler-embedded-file.cpp
<br>@@ -93,15 +93,15 @@ std::string embedded_file::mime_type() const
<br> return std::string(d->emb_file->mimeType()->getCString());
<br> }
<br>
<br>-std::vector<char> embedded_file::data() const
<br>+byte_array embedded_file::data() const
<br> {
<br> if (!is_valid()) {
<br>- return std::vector<char>();
<br>+ return byte_array();
<br> }
<br>
<br> Stream *stream = d->emb_file->streamObject().getStream();
<br> stream->reset();
<br>- std::vector<char> ret(1024);
<br>+ byte_array ret(1024);
<br> size_t data_len = 0;
<br> int i;
<br> while ((i = stream->getChar()) != EOF) {
<br>diff --git a/cpp/poppler-embedded-file.h b/cpp/poppler-embedded-file.h
<br>index 250b84a..04ad7be 100644
<br>--- a/cpp/poppler-embedded-file.h
<br>+++ b/cpp/poppler-embedded-file.h
<br>@@ -41,7 +41,7 @@ public:
<br> unsigned int /*time_t*/ creation_date() const;
<br> std::string checksum() const;
<br> std::string mime_type() const;
<br>- std::vector<char> data() const;
<br>+ byte_array data() const;
<br>
<br> private:
<br> embedded_file(embedded_file_private &dd);
<br>commit cfb4f5dfabf31de22d68aa0d5796cb7a33d8b462
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=11" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 11:06:36 2009 +0100
<br><br> [cpp] add a byte_array typedef, and use it for utf8 string data
<br><br>diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp
<br>index ce27061..cc15bce 100644
<br>--- a/cpp/poppler-global.cpp
<br>+++ b/cpp/poppler-global.cpp
<br>@@ -47,27 +47,21 @@ ustring::~ustring()
<br> {
<br> }
<br>
<br>-char* ustring::to_utf_8(int *length) const
<br>+byte_array ustring::to_utf_8() const
<br> {
<br> if (!size()) {
<br>- if (length) {
<br>- *length = 0;
<br>- }
<br>- return 0;
<br>+ return byte_array();
<br> }
<br>
<br> const value_type *me = data();
<br> const size_t len = size() * 2 + 2;
<br>- char *str = new char[len];
<br>+ byte_array str(len);
<br> str[0] = 0xfe;
<br> str[1] = 0xff;
<br> for (size_t i = 0; i < size(); ++i, ++me) {
<br> str[i * 2 + 2] = (*me & 0xff);
<br> str[i * 2 + 3] = ((*me >> 8) & 0xff);
<br> }
<br>- if (length) {
<br>- *length = len;
<br>- }
<br> return str;
<br> }
<br>
<br>diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
<br>index e51878c..a6a9146 100644
<br>--- a/cpp/poppler-global.h
<br>+++ b/cpp/poppler-global.h
<br>@@ -34,6 +34,7 @@
<br> #endif
<br>
<br> #include <string>
<br>+#include <vector>
<br>
<br> namespace poppler
<br> {
<br>@@ -59,6 +60,8 @@ enum rotation_enum { rotate_0, rotate_90, rotate_180, rotate_270 };
<br>
<br> enum page_box_enum { media_box, crop_box, bleed_box, trim_box, art_box };
<br>
<br>+typedef std::vector<char> byte_array;
<br>+
<br> class POPPLER_CPP_EXPORT ustring : public std::basic_string<unsigned short>
<br> {
<br> public:
<br>@@ -66,7 +69,7 @@ public:
<br> ustring(size_type len, value_type ch);
<br> ~ustring();
<br>
<br>- char* to_utf_8(int *length = 0) const;
<br>+ byte_array to_utf_8() const;
<br> std::string to_latin1() const;
<br>
<br> static ustring from_utf_8(const char *str, int len = -1);
<br>diff --git a/cpp/poppler-private.cpp b/cpp/poppler-private.cpp
<br>index 16ba370..6ab3b6c 100644
<br>--- a/cpp/poppler-private.cpp
<br>+++ b/cpp/poppler-private.cpp
<br>@@ -63,8 +63,7 @@ ustring detail::unicode_to_ustring(const Unicode *u, int length)
<br>
<br> GooString* detail::ustring_to_unicode_GooString(const ustring &str)
<br> {
<br>- char *u = str.to_utf_8();
<br>- GooString *goo = new GooString(u);
<br>- delete [] u;
<br>+ const byte_array utf8_data = str.to_utf_8();
<br>+ GooString *goo = new GooString(utf8_data.data());
<br> return goo;
<br> }
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26786508&i=12" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26771855
Branch 'cpp-frontend' - 2 commits - configure.ac cpp/CMakeLists.txt cpp/.gitignore cpp/Makefile.am cpp/poppler-version.cpp cpp/poppler-version.h.in .gitignore
2009-12-13T17:30:42Z
2009-12-13T17:30:42Z
Pino Toscano-2
.gitignore | 1 +
<br> configure.ac | 2 ++
<br> cpp/.gitignore | 1 +
<br> cpp/CMakeLists.txt | 5 +++++
<br> cpp/Makefile.am | 6 ++++--
<br> cpp/poppler-version.cpp | 41 +++++++++++++++++++++++++++++++++++++++++
<br> cpp/poppler-version.h.in | 39 +++++++++++++++++++++++++++++++++++++++
<br> 7 files changed, 93 insertions(+), 2 deletions(-)
<br><br>New commits:
<br>commit 2d13ac31671b2007e44a90f45a82cb3adfa9c80c
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771855&i=0" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 02:30:06 2009 +0100
<br><br> update ignore files
<br><br>diff --git a/.gitignore b/.gitignore
<br>index 11d96b9..d000352 100644
<br>--- a/.gitignore
<br>+++ b/.gitignore
<br>@@ -16,6 +16,7 @@ libtool
<br> ltmain.sh
<br> missing
<br> poppler-cairo.pc
<br>+poppler-cpp.pc
<br> poppler-glib.pc
<br> poppler-qt.pc
<br> poppler-qt4.pc
<br>diff --git a/cpp/.gitignore b/cpp/.gitignore
<br>index 62535c7..0556b92 100644
<br>--- a/cpp/.gitignore
<br>+++ b/cpp/.gitignore
<br>@@ -4,3 +4,4 @@
<br> *.lo
<br> Makefile
<br> Makefile.in
<br>+poppler-version.h
<br>commit 01e902e40ca15acf0319e37d39a271d6875bfce9
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771855&i=1" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 02:02:47 2009 +0100
<br><br> [cpp] add a version header+functions
<br>
<br> this way, it is possible to get (either at build time and at runtime)
<br> the version of the current poppler-cpp library
<br>
<br> poppler-config.h is generated by the build system (autotools or cmake)
<br> with the correct version information
<br><br>diff --git a/configure.ac b/configure.ac
<br>index a7d61f7..70bac6c 100644
<br>--- a/configure.ac
<br>+++ b/configure.ac
<br>@@ -547,6 +547,7 @@ AC_SUBST(PC_REQUIRES_PRIVATE)
<br> AC_SUBST([POPPLER_MAJOR_VERSION],[poppler_version_major])
<br> AC_SUBST([POPPLER_MINOR_VERSION],[poppler_version_minor])
<br> AC_SUBST([POPPLER_MICRO_VERSION],[poppler_version_micro])
<br>+AC_SUBST([POPPLER_VERSION],[poppler_version])
<br>
<br> AC_OUTPUT([
<br> Makefile
<br>@@ -566,6 +567,7 @@ qt4/src/Makefile
<br> qt4/tests/Makefile
<br> qt4/demos/Makefile
<br> cpp/Makefile
<br>+cpp/poppler-version.h
<br> poppler.pc
<br> poppler-cairo.pc
<br> poppler-splash.pc
<br>diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
<br>index 42fbca2..3f8e9d9 100644
<br>--- a/cpp/CMakeLists.txt
<br>+++ b/cpp/CMakeLists.txt
<br>@@ -1,7 +1,10 @@
<br> include_directories(
<br>+ ${CMAKE_CURRENT_SOURCE_DIR}
<br> ${CMAKE_CURRENT_BINARY_DIR}
<br> )
<br>
<br>+configure_file(poppler-version.h.in ${CMAKE_CURRENT_BINARY_DIR}/poppler-version.h @ONLY)
<br>+
<br> set(poppler_cpp_SRCS
<br> poppler-document.cpp
<br> poppler-embedded-file.cpp
<br>@@ -11,6 +14,7 @@ set(poppler_cpp_SRCS
<br> poppler-page-transition.cpp
<br> poppler-private.cpp
<br> poppler-toc.cpp
<br>+ poppler-version.cpp
<br> )
<br>
<br> add_library(poppler-cpp SHARED ${poppler_cpp_SRCS})
<br>@@ -30,5 +34,6 @@ install(FILES
<br> poppler-page-transition.h
<br> poppler-rectangle.h
<br> poppler-toc.h
<br>+ ${CMAKE_CURRENT_BINARY_DIR}/poppler-version.h
<br> DESTINATION include/poppler/cpp)
<br>
<br>diff --git a/cpp/Makefile.am b/cpp/Makefile.am
<br>index 58b8dd1..b6c2d8e 100644
<br>--- a/cpp/Makefile.am
<br>+++ b/cpp/Makefile.am
<br>@@ -13,7 +13,8 @@ poppler_include_HEADERS = \
<br> poppler-page.h \
<br> poppler-page-transition.h \
<br> poppler-rectangle.h \
<br>- poppler-toc.h
<br>+ poppler-toc.h \
<br>+ poppler-version.h
<br>
<br> lib_LTLIBRARIES = libpoppler-cpp.la
<br> libpoppler_cpp_la_SOURCES = \
<br>@@ -24,7 +25,8 @@ libpoppler_cpp_la_SOURCES = \
<br> poppler-page.cpp \
<br> poppler-page-transition.cpp \
<br> poppler-private.cpp \
<br>- poppler-toc.cpp
<br>+ poppler-toc.cpp \
<br>+ poppler-version.cpp
<br>
<br> libpoppler_cpp_la_LIBADD = \
<br> $(top_builddir)/poppler/libpoppler.la
<br>diff --git a/cpp/poppler-version.cpp b/cpp/poppler-version.cpp
<br>new file mode 100644
<br>index 0000000..89f95a3
<br>--- /dev/null
<br>+++ b/cpp/poppler-version.cpp
<br>@@ -0,0 +1,41 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771855&i=2" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-version.h"
<br>+
<br>+using namespace poppler;
<br>+
<br>+std::string version_string()
<br>+{
<br>+ return std::string(POPPLER_VERSION);
<br>+}
<br>+
<br>+unsigned int version_major()
<br>+{
<br>+ return POPPLER_VERSION_MAJOR;
<br>+}
<br>+
<br>+unsigned int version_minor()
<br>+{
<br>+ return POPPLER_VERSION_MINOR;
<br>+}
<br>+
<br>+unsigned int version_micro()
<br>+{
<br>+ return POPPLER_VERSION_MICRO;
<br>+}
<br>diff --git a/cpp/poppler-version.h.in b/cpp/poppler-version.h.in
<br>new file mode 100644
<br>index 0000000..cf6bce6
<br>--- /dev/null
<br>+++ b/cpp/poppler-version.h.in
<br>@@ -0,0 +1,39 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771855&i=3" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_VERSION_H
<br>+#define POPPLER_VERSION_H
<br>+
<br>+#include "poppler-global.h"
<br>+
<br>+#define POPPLER_VERSION "@POPPLER_VERSION@"
<br>+#define POPPLER_VERSION_MAJOR @POPPLER_MAJOR_VERSION@
<br>+#define POPPLER_VERSION_MINOR @POPPLER_MINOR_VERSION@
<br>+#define POPPLER_VERSION_MICRO @POPPLER_MICRO_VERSION@
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+POPPLER_CPP_EXPORT std::string version_string();
<br>+POPPLER_CPP_EXPORT unsigned int version_major();
<br>+POPPLER_CPP_EXPORT unsigned int version_minor();
<br>+POPPLER_CPP_EXPORT unsigned int version_micro();
<br>+
<br>+}
<br>+
<br>+#endif
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771855&i=4" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26771789
Re: Testing Re: Multicolumn select
2009-12-13T17:21:54Z
2009-12-13T17:21:54Z
Baz-4
2009/12/12 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771789&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<div class='shrinkable-quote'><br>> A Dimecres 09 Desembre 2009 23:22:09, Baz va escriure:
<br>>> 2009/12/9 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771789&i=1" target="_top" rel="nofollow">aacid@...</a>>:
<br>>> > A Dimecres 09 Desembre 2009 14:51:59, Baz va escriure:
<br>>> >> 2009/12/8 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771789&i=2" target="_top" rel="nofollow">aacid@...</a>>:
<br>>> >> > What we want is something that makes text extraction/selection better,
<br>>> >> > the definition of better is the problem here :D
<br>>> >>
<br>>> >> Ok. So it sounds like it would be worth adding tests in, so we can be
<br>>> >> explicit about what we want text extraction to do.
<br>>> >>
<br>>> >> I could do this in two ways:
<br>>> >> - write a test harness that calls the apis directly (following the
<br>>> >> example of cairo). This has the advantage that more apis could be
<br>>> >> tested later, but complicates writing the tests; and in any case most
<br>>> >> other tests will be about rendering not text extraction. Since this
<br>>> >> would be a unit test, its also fragile to API changes.
<br>>> >> - extend pdftotext to allow me to specify start and end points for
<br>>> >> text extraction (page,x,y). This would make writing tests easy - just
<br>>> >> simple shell scripts along the lines of the git test suite. This
<br>>> >> feature could be useful to end users too, I guess.
<br>>> >>
<br>>> >> I like the second plan better, since it supports building ad-hoc tests
<br>>> >> with pdfs attached to bugs. Since we already have -f and -l, (and -x,
<br>>> >> -y do something unrelated to the selection) I'm thinking of int args
<br>>> >> -fx, -fy, -lx, -ly, which default to (0,0) (pageWidth, pageHeight).
<br>>> >
<br>>> > Why isn't x,y,W,H enough? AFAIR they define which area gets extracted.
<br>>>
<br>>> Its not the same area. That mechanism crops every page from start to
<br>>> finish to the same x,y,W,H box before dumping the text. Its useful for
<br>>> removing header/footer sections in a whole-document dump. It also
<br>>> doesn't hit the text selection code at all.
<br>>
<br>> I'm lost now, you originally said pdftotext was using your new code and now
<br>> you say it doesn't?
</div><br>I am talking about how pdftotext works, whether or not you have my changes.
<br><br>pdftotext does not use xyWH for *selection* (the way it would work in
<br>evince) it uses it to *crop*.
<br><br>However the text that it does ouput is in the same order as it would
<br>be if you selected *all the text on the cropped page*.
<br><br>Ok it was misleading to say 'It also doesn't hit the text selection
<br>code at all' I should have said 'it never passes text selection
<br>coordinates other than those that would select *everything*'. So it
<br>tests reading order but not the selection points in any meaningful
<br>way.
<br><br>Does this make it clearer?
<br><div class='shrinkable-quote'><br>>
<br>> Albert
<br>>
<br>>>
<br>>> By contrast, a reading-order selection, even on a single page, may
<br>>> include text that lies outside the rectangle from the startpoint to
<br>>> the endpoint. Also, the xyWH mechanism applies the start/end points to
<br>>> every page, instead of only the start/end page as you would with a
<br>>> selection.
<br>>>
<br>>> -Baz
<br>>>
<br>>> > Albert
<br>>> >
<br>>> >> Does this sound useful to you?
<br>>> >>
<br>>> >> -Baz
<br>>> >> _______________________________________________
<br>>> >> poppler mailing list
<br>>> >> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771789&i=3" target="_top" rel="nofollow">poppler@...</a>
<br>>> >> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>> >
<br>>> > _______________________________________________
<br>>> > poppler mailing list
<br>>> > <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771789&i=4" target="_top" rel="nofollow">poppler@...</a>
<br>>> > <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>>
<br>>> _______________________________________________
<br>>> poppler mailing list
<br>>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771789&i=5" target="_top" rel="nofollow">poppler@...</a>
<br>>> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>>
<br>> _______________________________________________
<br>> poppler mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771789&i=6" target="_top" rel="nofollow">poppler@...</a>
<br>> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>
</div>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771789&i=7" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26771144
7 commits - cmake/modules config.h.cmake ConfigureChecks.cmake
2009-12-13T15:58:19Z
2009-12-13T15:58:19Z
Pino Toscano-2
ConfigureChecks.cmake | 4 ++++
<br> cmake/modules/FindCairo.cmake | 18 ++++++++++++++++++
<br> config.h.cmake | 36 +++++++++++++++++++++++++++++-------
<br> 3 files changed, 51 insertions(+), 7 deletions(-)
<br><br>New commits:
<br>commit b3f5e5d60bc9109da961940f6216722f9db4a87b
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771144&i=0" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 00:56:15 2009 +0100
<br><br> [CMake] add the configure check for the Cairo blend modes support (as in autotools)
<br><br>diff --git a/cmake/modules/FindCairo.cmake b/cmake/modules/FindCairo.cmake
<br>index a0a8400..ccf8208 100644
<br>--- a/cmake/modules/FindCairo.cmake
<br>+++ b/cmake/modules/FindCairo.cmake
<br>@@ -37,6 +37,24 @@ if (NOT WIN32)
<br>
<br> endif(NOT WIN32)
<br>
<br>+if (CAIRO_FOUND)
<br>+ include(MacroPushRequiredVars)
<br>+ include(CheckCSourceCompiles)
<br>+
<br>+ macro_push_required_vars()
<br>+ set(CMAKE_REQUIRED_DEFINITIONS ${CAIRO_CFLAGS})
<br>+ set(CMAKE_REQUIRED_LIBRARIES ${CAIRO_LIBRARIES})
<br>+ check_c_source_compiles("
<br>+#include <cairo.h>
<br>+int main() {
<br>+ cairo_t *cr;
<br>+ cairo_set_operator(cr, CAIRO_OPERATOR_MULTIPLY);
<br>+ return 0;
<br>+}
<br>+" CAIRO_HAS_BLEND_MODES)
<br>+ macro_pop_required_vars()
<br>+endif (CAIRO_FOUND)
<br>+
<br> mark_as_advanced(
<br> CAIRO_CFLAGS
<br> CAIRO_LIBRARIES
<br>diff --git a/config.h.cmake b/config.h.cmake
<br>index 60547ea..7145e6a 100644
<br>--- a/config.h.cmake
<br>+++ b/config.h.cmake
<br>@@ -1,5 +1,8 @@
<br> /* config.h. Generated from config.h.cmake by cmake. */
<br>
<br>+/* Whether cairo has blend modes support */
<br>+#cmakedefine CAIRO_HAS_BLEND_MODES 1
<br>+
<br> /* Use libjpeg instead of builtin jpeg decoder. */
<br> #cmakedefine ENABLE_LIBJPEG 1
<br>
<br>commit f6ba877e0c22538cfe34d32d69814f660de59d2c
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771144&i=1" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 00:44:55 2009 +0100
<br><br> [CMake] add configure check for sys/mman.h (as in autotools)
<br><br>diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
<br>index 04c87af..6049c9a 100644
<br>--- a/ConfigureChecks.cmake
<br>+++ b/ConfigureChecks.cmake
<br>@@ -19,6 +19,7 @@ check_include_files(stdint.h HAVE_STDINT_H)
<br> check_include_files(stdlib.h HAVE_STDLIB_H)
<br> check_include_files(strings.h HAVE_STRINGS_H)
<br> check_include_files(string.h HAVE_STRING_H)
<br>+check_include_files(sys/mman.h HAVE_SYS_MMAN_H)
<br> check_include_files(sys/stat.h HAVE_SYS_STAT_H)
<br> check_include_files(sys/types.h HAVE_SYS_TYPES_H)
<br> check_include_files(unistd.h HAVE_UNISTD_H)
<br>diff --git a/config.h.cmake b/config.h.cmake
<br>index dfd4c69..60547ea 100644
<br>--- a/config.h.cmake
<br>+++ b/config.h.cmake
<br>@@ -85,6 +85,9 @@
<br> /* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'. */
<br> #cmakedefine HAVE_SYS_DIR_H 1
<br>
<br>+/* Define to 1 if you have the <sys/mman.h> header file. */
<br>+#cmakedefine HAVE_SYS_MMAN_H 1
<br>+
<br> /* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'. */
<br> #cmakedefine HAVE_SYS_NDIR_H 1
<br>
<br>commit e12801320ae030628fc62c073983c06b39ee13d7
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771144&i=2" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 00:42:20 2009 +0100
<br><br> minor spello
<br><br>diff --git a/config.h.cmake b/config.h.cmake
<br>index 52f8c67..dfd4c69 100644
<br>--- a/config.h.cmake
<br>+++ b/config.h.cmake
<br>@@ -139,7 +139,7 @@
<br> /* Enable word list support. */
<br> #cmakedefine TEXTOUT_WORD_LIST 1
<br>
<br>-/* Defines if use cms. */
<br>+/* Defines if use cms */
<br> #cmakedefine USE_CMS 1
<br>
<br> /* Throw exceptions to deal with not enough memory and similar problems */
<br>commit 6428907ebcf33d4391673aadcfa71c3061f6d352
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771144&i=3" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 00:41:49 2009 +0100
<br><br> [CMake] add configure check for fcntl.h (as in autotools)
<br><br>diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
<br>index 827fa15..04c87af 100644
<br>--- a/ConfigureChecks.cmake
<br>+++ b/ConfigureChecks.cmake
<br>@@ -12,6 +12,7 @@ include(CheckTypeSize)
<br> include(CheckCSourceCompiles)
<br>
<br> check_include_files(dlfcn.h HAVE_DLFCN_H)
<br>+check_include_files(fcntl.h HAVE_FCNTL_H)
<br> check_include_files(inttypes.h HAVE_INTTYPES_H)
<br> check_include_files(memory.h HAVE_MEMORY_H)
<br> check_include_files(stdint.h HAVE_STDINT_H)
<br>diff --git a/config.h.cmake b/config.h.cmake
<br>index 6486d67..52f8c67 100644
<br>--- a/config.h.cmake
<br>+++ b/config.h.cmake
<br>@@ -22,6 +22,9 @@
<br> /* Define to 1 if you have the <dlfcn.h> header file. */
<br> #cmakedefine HAVE_DLFCN_H 1
<br>
<br>+/* Define to 1 if you have the <fcntl.h> header file. */
<br>+#cmakedefine HAVE_FCNTL_H 1
<br>+
<br> /* Have FreeType2 include files */
<br> #cmakedefine HAVE_FREETYPE_H 1
<br>
<br>commit 916ab7163249e23bd5ba00922fdcad9caaf92c75
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771144&i=4" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 00:34:59 2009 +0100
<br><br> [CMake] oops, those should have been '#cmakedefine' and not '#define'
<br><br>diff --git a/config.h.cmake b/config.h.cmake
<br>index d59e367..6486d67 100644
<br>--- a/config.h.cmake
<br>+++ b/config.h.cmake
<br>@@ -38,7 +38,7 @@
<br> #cmakedefine HAVE_GETTIMEOFDAY 1
<br>
<br> /* Defines if gmtime_r is available on your system */
<br>-#define HAVE_GMTIME_R 1
<br>+#cmakedefine HAVE_GMTIME_R 1
<br>
<br> /* Define to 1 if you have the <inttypes.h> header file. */
<br> #cmakedefine HAVE_INTTYPES_H 1
<br>@@ -47,7 +47,7 @@
<br> #cmakedefine HAVE_LIBZ 1
<br>
<br> /* Defines if localtime_r is available on your system */
<br>-#define HAVE_LOCALTIME_R 1
<br>+#cmakedefine HAVE_LOCALTIME_R 1
<br>
<br> /* Define to 1 if you have the <memory.h> header file. */
<br> #cmakedefine HAVE_MEMORY_H 1
<br>commit ea655d8c7e24e97ee710110a783ed9c209cf76e3
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771144&i=5" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 00:33:51 2009 +0100
<br><br> [CMake] move and rename to match more the autotools output
<br><br>diff --git a/config.h.cmake b/config.h.cmake
<br>index 8945568..d59e367 100644
<br>--- a/config.h.cmake
<br>+++ b/config.h.cmake
<br>@@ -3,19 +3,20 @@
<br> /* Use libjpeg instead of builtin jpeg decoder. */
<br> #cmakedefine ENABLE_LIBJPEG 1
<br>
<br>-/* Use zlib instead of builtin zlib decoder. */
<br>-#cmakedefine ENABLE_ZLIB 1
<br>+/* Use libopenjpeg instead of builtin jpeg2000 decoder. */
<br>+#cmakedefine ENABLE_LIBOPENJPEG 1
<br>
<br>-/* Use libpng to export images in pdftohtml. */
<br>+/* Build against libpng. */
<br> #cmakedefine ENABLE_LIBPNG 1
<br>
<br>-/* Use liblcms for color management. */
<br>-#cmakedefine USE_CMS 1
<br>+/* Use zlib instead of builtin zlib decoder. */
<br>+#cmakedefine ENABLE_ZLIB 1
<br>
<br> /* Use cairo for rendering. */
<br> #cmakedefine HAVE_CAIRO 1
<br>
<br>-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'. */
<br>+/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
<br>+ */
<br> #cmakedefine HAVE_DIRENT_H 1
<br>
<br> /* Define to 1 if you have the <dlfcn.h> header file. */
<br>@@ -109,7 +110,7 @@
<br> #define PACKAGE "poppler"
<br>
<br> /* Define to the address where bug reports for this package should be sent. */
<br>-#define PACKAGE_BUGREPORT ""
<br>+#define PACKAGE_BUGREPORT "<a href="https://bugs.freedesktop.org/enter_bug.cgi?product=poppler" target="_top" rel="nofollow">https://bugs.freedesktop.org/enter_bug.cgi?product=poppler</a>"
<br>
<br> /* Define to the full name of this package. */
<br> #define PACKAGE_NAME "poppler"
<br>@@ -120,6 +121,9 @@
<br> /* Define to the one symbol short name of this package. */
<br> #define PACKAGE_TARNAME "poppler"
<br>
<br>+/* Define to the home page for this package. */
<br>+#define PACKAGE_URL ""
<br>+
<br> /* Define to the version of this package. */
<br> #define PACKAGE_VERSION "${POPPLER_VERSION}"
<br>
<br>@@ -132,6 +136,9 @@
<br> /* Enable word list support. */
<br> #cmakedefine TEXTOUT_WORD_LIST 1
<br>
<br>+/* Defines if use cms. */
<br>+#cmakedefine USE_CMS 1
<br>+
<br> /* Throw exceptions to deal with not enough memory and similar problems */
<br> #cmakedefine USE_EXCEPTIONS 1
<br>
<br>commit 9f0146c5b2f9326e834104b89791f66b18f85adc
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771144&i=6" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Mon Dec 14 00:28:04 2009 +0100
<br><br> [CMake] add checks for gmtime_r and localtime_r
<br><br>diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
<br>index 1ba656a..827fa15 100644
<br>--- a/ConfigureChecks.cmake
<br>+++ b/ConfigureChecks.cmake
<br>@@ -25,7 +25,9 @@ check_include_files(unistd.h HAVE_UNISTD_H)
<br> check_function_exists(fseek64 HAVE_FSEEK64)
<br> check_function_exists(fseeko HAVE_FSEEKO)
<br> check_function_exists(ftell64 HAVE_FTELL64)
<br>+check_function_exists(gmtime_r HAVE_GMTIME_R)
<br> check_function_exists(gettimeofday HAVE_GETTIMEOFDAY)
<br>+check_function_exists(localtime_r HAVE_LOCALTIME_R)
<br> check_function_exists(popen HAVE_POPEN)
<br> check_function_exists(mkstemp HAVE_MKSTEMP)
<br> check_function_exists(mkstemps HAVE_MKSTEMPS)
<br>diff --git a/config.h.cmake b/config.h.cmake
<br>index 7b57de0..8945568 100644
<br>--- a/config.h.cmake
<br>+++ b/config.h.cmake
<br>@@ -36,12 +36,18 @@
<br> /* Defines if gettimeofday is available on your system */
<br> #cmakedefine HAVE_GETTIMEOFDAY 1
<br>
<br>+/* Defines if gmtime_r is available on your system */
<br>+#define HAVE_GMTIME_R 1
<br>+
<br> /* Define to 1 if you have the <inttypes.h> header file. */
<br> #cmakedefine HAVE_INTTYPES_H 1
<br>
<br> /* Define to 1 if you have the `z' library (-lz). */
<br> #cmakedefine HAVE_LIBZ 1
<br>
<br>+/* Defines if localtime_r is available on your system */
<br>+#define HAVE_LOCALTIME_R 1
<br>+
<br> /* Define to 1 if you have the <memory.h> header file. */
<br> #cmakedefine HAVE_MEMORY_H 1
<br>
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26771144&i=7" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26770585
Branch 'cpp-frontend' - 6 commits - CMakeLists.txt configure.ac cpp/CMakeLists.txt cpp/.gitignore cpp/Makefile.am cpp/poppler-document.cpp cpp/poppler-document.h cpp/poppler-document-private.h cpp/poppler-embedded-file.cpp cpp/poppler-embedded-file.h cpp/poppler-embedded-file-private.h cpp/poppler-font.cpp cpp/poppler-font.h cpp/poppler-global.cpp cpp/poppler-global.h cpp/poppler-page.cpp cpp/poppler-page.h cpp/poppler-page-private.h cpp/poppler-page-transition.cpp cpp/poppler-page-transition.h cpp/poppler-private.cpp cpp/poppler-private.h cpp/poppler-rectangle.h cpp/poppler-toc.cpp cpp/poppler-toc.h cpp/poppler-toc-private.h Makefile.am poppler-cpp.pc.cmake poppler-cpp.pc.in
2009-12-13T14:46:56Z
2009-12-13T14:46:56Z
Pino Toscano-2
CMakeLists.txt | 8
<br> Makefile.am | 15 +
<br> configure.ac | 18 +-
<br> cpp/.gitignore | 6
<br> cpp/CMakeLists.txt | 34 +++
<br> cpp/Makefile.am | 32 +++
<br> cpp/poppler-document-private.h | 55 ++++++
<br> cpp/poppler-document.cpp | 316 ++++++++++++++++++++++++++++++++++++
<br> cpp/poppler-document.h | 92 ++++++++++
<br> cpp/poppler-embedded-file-private.h | 40 ++++
<br> cpp/poppler-embedded-file.cpp | 116 +++++++++++++
<br> cpp/poppler-embedded-file.h | 55 ++++++
<br> cpp/poppler-font.cpp | 166 ++++++++++++++++++
<br> cpp/poppler-font.h | 91 ++++++++++
<br> cpp/poppler-global.cpp | 162 ++++++++++++++++++
<br> cpp/poppler-global.h | 86 +++++++++
<br> cpp/poppler-page-private.h | 44 +++++
<br> cpp/poppler-page-transition.cpp | 95 ++++++++++
<br> cpp/poppler-page-transition.h | 82 +++++++++
<br> cpp/poppler-page.cpp | 121 +++++++++++++
<br> cpp/poppler-page.h | 62 +++++++
<br> cpp/poppler-private.cpp | 70 +++++++
<br> cpp/poppler-private.h | 66 +++++++
<br> cpp/poppler-rectangle.h | 60 ++++++
<br> cpp/poppler-toc-private.h | 62 +++++++
<br> cpp/poppler-toc.cpp | 136 +++++++++++++++
<br> cpp/poppler-toc.h | 74 ++++++++
<br> poppler-cpp.pc.cmake | 9 +
<br> poppler-cpp.pc.in | 9 +
<br> 29 files changed, 2178 insertions(+), 4 deletions(-)
<br><br>New commits:
<br>commit 9d0cf201e96044dd679c26bea6255d986a6cd246
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=0" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Sun Dec 13 23:45:39 2009 +0100
<br><br> [cpp] add ignore file
<br><br>diff --git a/cpp/.gitignore b/cpp/.gitignore
<br>new file mode 100644
<br>index 0000000..62535c7
<br>--- /dev/null
<br>+++ b/cpp/.gitignore
<br>@@ -0,0 +1,6 @@
<br>+.deps
<br>+.libs
<br>+*.la
<br>+*.lo
<br>+Makefile
<br>+Makefile.in
<br>commit d783e92b863d8b22de6ca326328115fec63193ed
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=1" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Sun Dec 13 23:42:33 2009 +0100
<br><br> [cpp] don't forget the cmake stuff when packing with the autotools
<br><br>diff --git a/Makefile.am b/Makefile.am
<br>index 59544e4..6d279ad 100644
<br>--- a/Makefile.am
<br>+++ b/Makefile.am
<br>@@ -56,6 +56,7 @@ pkgconfig_DATA = \
<br>
<br> # Add CMake buildsystem files here so they get added on make dist
<br> EXTRA_DIST += \
<br>+ cpp/CMakeLists.txt \
<br> glib/demo/CMakeLists.txt \
<br> glib/CMakeLists.txt \
<br> glib/poppler-features.h.cmake \
<br>@@ -85,6 +86,7 @@ EXTRA_DIST += \
<br> config.h.cmake \
<br> poppler-cairo.pc.cmake \
<br> poppler-config.h.cmake \
<br>+ poppler-cpp.pc.cmake \
<br> poppler-glib.pc.cmake \
<br> poppler-qt.pc.cmake \
<br> poppler-qt4.pc.cmake \
<br>commit 0105caefe860e7a45fc7d3a1bd1162fe56bcfe6a
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=2" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Sun Dec 13 23:40:55 2009 +0100
<br><br> [cpp] add the pkg-config stuff
<br><br>diff --git a/CMakeLists.txt b/CMakeLists.txt
<br>index f6cf57c..023229c 100644
<br>--- a/CMakeLists.txt
<br>+++ b/CMakeLists.txt
<br>@@ -452,6 +452,9 @@ endif(GLIB_FOUND)
<br> if(CAIRO_FOUND)
<br> poppler_create_install_pkgconfig(poppler-cairo.pc lib${LIB_SUFFIX}/pkgconfig)
<br> endif(CAIRO_FOUND)
<br>+if(ENABLE_CPP)
<br>+ poppler_create_install_pkgconfig(poppler-cpp.pc lib${LIB_SUFFIX}/pkgconfig)
<br>+endif(ENABLE_CPP)
<br>
<br>
<br> message("Building Poppler with support for:")
<br>diff --git a/Makefile.am b/Makefile.am
<br>index 87209a6..59544e4 100644
<br>--- a/Makefile.am
<br>+++ b/Makefile.am
<br>@@ -27,6 +27,7 @@ endif
<br>
<br> if BUILD_POPPLER_CPP
<br> cpp_subdir = cpp
<br>+cpp_pc_file = poppler-cpp.pc
<br> endif
<br>
<br> if BUILD_UTILS
<br>@@ -40,7 +41,8 @@ EXTRA_DIST = \
<br> poppler.pc.in \
<br> poppler-cairo.pc.in \
<br> poppler-splash.pc.in \
<br>- poppler-qt.pc.in
<br>+ poppler-qt.pc.in \
<br>+ poppler-cpp.pc.in
<br>
<br> pkgconfigdir = $(libdir)/pkgconfig
<br> pkgconfig_DATA = \
<br>@@ -49,7 +51,8 @@ pkgconfig_DATA = \
<br> $(splash_pc_file) \
<br> $(glib_pc_file) \
<br> $(qt_pc_file) \
<br>- $(qt4_pc_file)
<br>+ $(qt4_pc_file) \
<br>+ $(cpp_pc_file)
<br>
<br> # Add CMake buildsystem files here so they get added on make dist
<br> EXTRA_DIST += \
<br>diff --git a/configure.ac b/configure.ac
<br>index 28d1b67..a7d61f7 100644
<br>--- a/configure.ac
<br>+++ b/configure.ac
<br>@@ -571,7 +571,8 @@ poppler-cairo.pc
<br> poppler-splash.pc
<br> poppler-glib.pc
<br> poppler-qt.pc
<br>-poppler-qt4.pc])
<br>+poppler-qt4.pc
<br>+poppler-cpp.pc])
<br>
<br>
<br> echo ""
<br>diff --git a/poppler-cpp.pc.cmake b/poppler-cpp.pc.cmake
<br>new file mode 100644
<br>index 0000000..eeb11cc
<br>--- /dev/null
<br>+++ b/poppler-cpp.pc.cmake
<br>@@ -0,0 +1,9 @@
<br>+prefix=@CMAKE_INSTALL_PREFIX@
<br>+exec_prefix=${prefix}
<br>+libdir=${exec_prefix}/lib@LIB_SUFFIX@
<br>+includedir=${prefix}/include
<br>+
<br>+Name: poppler-cpp
<br>+Description: cpp backend for Poppler PDF rendering library
<br>+Version: @POPPLER_VERSION@
<br>+Requires: poppler = @POPPLER_VERSION@
<br>diff --git a/poppler-cpp.pc.in b/poppler-cpp.pc.in
<br>new file mode 100644
<br>index 0000000..309f070
<br>--- /dev/null
<br>+++ b/poppler-cpp.pc.in
<br>@@ -0,0 +1,9 @@
<br>+prefix=@prefix@
<br>+exec_prefix=@exec_prefix@
<br>+libdir=@libdir@
<br>+includedir=@includedir@
<br>+
<br>+Name: poppler-cpp
<br>+Description: cpp backend for Poppler PDF rendering library
<br>+Version: @VERSION@
<br>+Requires: poppler = @VERSION@
<br>commit d5a74f78df0dca24fd537b30424fd2ebb3efe3e2
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=3" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Sun Dec 13 23:35:06 2009 +0100
<br><br> [cpp] add the (rest of the) CMake build system for it
<br><br>diff --git a/CMakeLists.txt b/CMakeLists.txt
<br>index ae5f8d6..f6cf57c 100644
<br>--- a/CMakeLists.txt
<br>+++ b/CMakeLists.txt
<br>@@ -23,6 +23,7 @@ option(BUILD_QT3_TESTS "Whether compile the Qt3 test programs." ON)
<br> option(BUILD_QT4_TESTS "Whether compile the Qt4 test programs." ON)
<br> option(ENABLE_SPLASH "Build the Splash graphics backend." ON)
<br> option(ENABLE_UTILS "Compile poppler command line utils." ON)
<br>+option(ENABLE_CPP "Compile poppler cpp wrapper." ON)
<br> option(ENABLE_ABIWORD "Build the Abiword backend." ON)
<br> option(ENABLE_LIBOPENJPEG "Use libopenjpeg for JPX streams." ON)
<br> option(ENABLE_LCMS "Use liblcms for color management." ON)
<br>@@ -418,6 +419,9 @@ add_subdirectory(test)
<br> if(QT4_FOUND)
<br> add_subdirectory(qt4)
<br> endif(QT4_FOUND)
<br>+if(ENABLE_CPP)
<br>+ add_subdirectory(cpp)
<br>+endif(ENABLE_CPP)
<br>
<br> set(PKG_CONFIG_VERSION_0_18 TRUE)
<br> if(PKGCONFIG_EXECUTABLE)
<br>@@ -458,6 +462,7 @@ show_end_message("qt wrapper" QT3_FOUND)
<br> show_end_message("qt4 wrapper" QT4_FOUND)
<br> show_end_message("glib wrapper" GLIB_FOUND)
<br> # message(" use gtk-doc: $enable_gtk_doc") # TODO
<br>+show_end_message("cpp wrapper" ENABLE_CPP)
<br> show_end_message("use libjpeg" ENABLE_LIBJPEG)
<br> show_end_message("use libpng" ENABLE_LIBPNG)
<br> show_end_message("use zlib" ENABLE_ZLIB)
<br>commit 0e41f937946e4e4c1b660406bd74e4afe8825b5f
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=4" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Sun Dec 13 23:31:46 2009 +0100
<br><br> [cpp] add the autotools buildsystem for it
<br><br>diff --git a/Makefile.am b/Makefile.am
<br>index 2a75262..87209a6 100644
<br>--- a/Makefile.am
<br>+++ b/Makefile.am
<br>@@ -25,11 +25,15 @@ qt4_subdir = qt4
<br> qt4_pc_file = poppler-qt4.pc
<br> endif
<br>
<br>+if BUILD_POPPLER_CPP
<br>+cpp_subdir = cpp
<br>+endif
<br>+
<br> if BUILD_UTILS
<br> utils_subdir = utils
<br> endif
<br>
<br>-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir)
<br>+SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) $(cpp_subdir)
<br>
<br> EXTRA_DIST = \
<br> README-XPDF \
<br>diff --git a/configure.ac b/configure.ac
<br>index 7a8ca19..28d1b67 100644
<br>--- a/configure.ac
<br>+++ b/configure.ac
<br>@@ -444,6 +444,19 @@ fi
<br>
<br> AM_CONDITIONAL(BUILD_POPPLER_QT4, test "x$enable_poppler_qt4" = "xyes")
<br>
<br>+dnl
<br>+dnl CPP frontend
<br>+dnl
<br>+
<br>+AC_ARG_ENABLE(poppler-cpp,
<br>+ AC_HELP_STRING([--disable-poppler-cpp],
<br>+ [Don't compile poppler cpp wrapper.]),
<br>+ enable_poppler_cpp=$enableval,
<br>+ enable_poppler_cpp="yes")
<br>+
<br>+AM_CONDITIONAL(BUILD_POPPLER_CPP, test "x$enable_poppler_cpp" = "xyes")
<br>+
<br>+
<br> AC_ARG_ENABLE(gtk-test,
<br> AC_HELP_STRING([--disable-gtk-test],
<br> [Don't compile GTK+ test program.]),
<br>@@ -552,6 +565,7 @@ qt4/Makefile
<br> qt4/src/Makefile
<br> qt4/tests/Makefile
<br> qt4/demos/Makefile
<br>+cpp/Makefile
<br> poppler.pc
<br> poppler-cairo.pc
<br> poppler-splash.pc
<br>@@ -569,6 +583,7 @@ echo " qt wrapper: $enable_poppler_qt"
<br> echo " qt4 wrapper: $enable_poppler_qt4"
<br> echo " glib wrapper: $enable_poppler_glib"
<br> echo " use GDK: $enable_gdk"
<br>+echo " cpp wrapper: $enable_poppler_cpp"
<br> echo " use gtk-doc: $enable_gtk_doc"
<br> echo " use libjpeg: $enable_libjpeg"
<br> echo " use libpng: $enable_libpng"
<br>diff --git a/cpp/Makefile.am b/cpp/Makefile.am
<br>new file mode 100644
<br>index 0000000..58b8dd1
<br>--- /dev/null
<br>+++ b/cpp/Makefile.am
<br>@@ -0,0 +1,32 @@
<br>+INCLUDES = \
<br>+ -I$(top_srcdir) \
<br>+ -I$(top_srcdir)/goo \
<br>+ -I$(top_srcdir)/poppler
<br>+
<br>+
<br>+poppler_includedir = $(includedir)/poppler/cpp
<br>+poppler_include_HEADERS = \
<br>+ poppler-document.h \
<br>+ poppler-embedded-file.h \
<br>+ poppler-font.h \
<br>+ poppler-global.h \
<br>+ poppler-page.h \
<br>+ poppler-page-transition.h \
<br>+ poppler-rectangle.h \
<br>+ poppler-toc.h
<br>+
<br>+lib_LTLIBRARIES = libpoppler-cpp.la
<br>+libpoppler_cpp_la_SOURCES = \
<br>+ poppler-document.cpp \
<br>+ poppler-embedded-file.cpp \
<br>+ poppler-font.cpp \
<br>+ poppler-global.cpp \
<br>+ poppler-page.cpp \
<br>+ poppler-page-transition.cpp \
<br>+ poppler-private.cpp \
<br>+ poppler-toc.cpp
<br>+
<br>+libpoppler_cpp_la_LIBADD = \
<br>+ $(top_builddir)/poppler/libpoppler.la
<br>+
<br>+libpoppler_cpp_la_LDFLAGS = -version-info 1:0:1 @create_shared_lib@
<br>commit 9727fdc0c682742335e44ddc2f32d60e4c59983a
<br>Author: Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=5" target="_top" rel="nofollow">pino@...</a>>
<br>Date: Sun Dec 13 22:55:28 2009 +0100
<br><br> Start of a pure C++ frontend for Poppler.
<br>
<br> This initial version (called 'poppler-cpp') includes preliminary support for:
<br> - document (loading from file name, some query methods, unlocking, font listing, embedded files)
<br> - page (some query methods) with page transitions
<br> - TOC
<br>
<br> Modelled a bit on the Qt4 API, it provides also an own "ustring" typedef representing UTF-16 strings,
<br> with methods to convert back/to UTF-8 and Latin 1.
<br>
<br> Most probably it has bugs, but nevertheless worth testing and developing.
<br><br>diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
<br>new file mode 100644
<br>index 0000000..42fbca2
<br>--- /dev/null
<br>+++ b/cpp/CMakeLists.txt
<br>@@ -0,0 +1,34 @@
<br>+include_directories(
<br>+ ${CMAKE_CURRENT_BINARY_DIR}
<br>+)
<br>+
<br>+set(poppler_cpp_SRCS
<br>+ poppler-document.cpp
<br>+ poppler-embedded-file.cpp
<br>+ poppler-font.cpp
<br>+ poppler-global.cpp
<br>+ poppler-page.cpp
<br>+ poppler-page-transition.cpp
<br>+ poppler-private.cpp
<br>+ poppler-toc.cpp
<br>+)
<br>+
<br>+add_library(poppler-cpp SHARED ${poppler_cpp_SRCS})
<br>+set_target_properties(poppler-cpp PROPERTIES VERSION 0.1.0 SOVERSION 0)
<br>+target_link_libraries(poppler-cpp poppler)
<br>+if(MSVC)
<br>+target_link_libraries(poppler-cpp ${poppler_LIBS})
<br>+endif(MSVC)
<br>+install(TARGETS poppler-cpp RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
<br>+
<br>+install(FILES
<br>+ poppler-document.h
<br>+ poppler-embedded-file.h
<br>+ poppler-font.h
<br>+ poppler-global.h
<br>+ poppler-page.h
<br>+ poppler-page-transition.h
<br>+ poppler-rectangle.h
<br>+ poppler-toc.h
<br>+ DESTINATION include/poppler/cpp)
<br>+
<br>diff --git a/cpp/poppler-document-private.h b/cpp/poppler-document-private.h
<br>new file mode 100644
<br>index 0000000..52ed935
<br>--- /dev/null
<br>+++ b/cpp/poppler-document-private.h
<br>@@ -0,0 +1,55 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=6" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_DOCUMENT_PRIVATE_H
<br>+#define POPPLER_DOCUMENT_PRIVATE_H
<br>+
<br>+#include "poppler-config.h"
<br>+#include "GooString.h"
<br>+#include "PDFDoc.h"
<br>+
<br>+#include <vector>
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class document;
<br>+class embedded_file;
<br>+
<br>+class document_private
<br>+{
<br>+public:
<br>+ document_private(GooString *file_path, const std::string &owner_password,
<br>+ const std::string &user_password);
<br>+ ~document_private();
<br>+
<br>+ static document* check_document(document_private *doc);
<br>+
<br>+ PDFDoc *doc;
<br>+ bool is_locked;
<br>+ std::vector<embedded_file *> embedded_files;
<br>+
<br>+private:
<br>+ void init();
<br>+
<br>+ static unsigned int count;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-document.cpp b/cpp/poppler-document.cpp
<br>new file mode 100644
<br>index 0000000..46f52b9
<br>--- /dev/null
<br>+++ b/cpp/poppler-document.cpp
<br>@@ -0,0 +1,316 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=7" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-document.h"
<br>+#include "poppler-embedded-file.h"
<br>+#include "poppler-page.h"
<br>+#include "poppler-toc.h"
<br>+
<br>+#include "poppler-document-private.h"
<br>+#include "poppler-embedded-file-private.h"
<br>+#include "poppler-private.h"
<br>+#include "poppler-toc-private.h"
<br>+
<br>+#include "Catalog.h"
<br>+#include "ErrorCodes.h"
<br>+#include "GlobalParams.h"
<br>+#include "Outline.h"
<br>+
<br>+#include <algorithm>
<br>+#include <memory>
<br>+
<br>+using namespace poppler;
<br>+
<br>+unsigned int poppler::document_private::count = 0U;
<br>+
<br>+document_private::document_private(GooString *file_path, const std::string &owner_password,
<br>+ const std::string &user_password)
<br>+ : doc(0)
<br>+ , is_locked(false)
<br>+{
<br>+ GooString goo_owner_password(owner_password.c_str());
<br>+ GooString goo_user_password(user_password.c_str());
<br>+ doc = new PDFDoc(file_path, &goo_owner_password, &goo_user_password);
<br>+ init();
<br>+}
<br>+
<br>+document_private::~document_private()
<br>+{
<br>+ delete_all(embedded_files);
<br>+
<br>+ delete doc;
<br>+
<br>+ if (count > 0) {
<br>+ --count;
<br>+ if (!count) {
<br>+ delete globalParams;
<br>+ globalParams = 0;
<br>+ }
<br>+ }
<br>+}
<br>+
<br>+void document_private::init()
<br>+{
<br>+ if (!count) {
<br>+ globalParams = new GlobalParams();
<br>+ setErrorFunction(detail::error_function);
<br>+ }
<br>+ count++;
<br>+}
<br>+
<br>+document* document_private::check_document(document_private *doc)
<br>+{
<br>+ if (doc->doc->isOk() || doc->doc->getErrorCode() == errEncrypted) {
<br>+ if (doc->doc->getErrorCode() == errEncrypted) {
<br>+ doc->is_locked = true;
<br>+ }
<br>+ return new document(*doc);
<br>+ } else {
<br>+ delete doc;
<br>+ }
<br>+ return 0;
<br>+}
<br>+
<br>+
<br>+document::document(document_private &dd)
<br>+ : d(&dd)
<br>+{
<br>+}
<br>+
<br>+document::~document()
<br>+{
<br>+ delete d;
<br>+}
<br>+
<br>+bool document::is_locked() const
<br>+{
<br>+ return d->is_locked;
<br>+}
<br>+
<br>+bool document::unlock(const std::string &owner_password, const std::string &user_password)
<br>+{
<br>+ if (d->is_locked) {
<br>+ document_private *newdoc = 0;
<br>+ {
<br>+ newdoc = new document_private(new GooString(d->doc->getFileName()),
<br>+ owner_password, user_password);
<br>+ }
<br>+ if (!newdoc->doc->isOk()) {
<br>+ delete newdoc;
<br>+ } else {
<br>+ delete d;
<br>+ d = newdoc;
<br>+ d->is_locked = false;
<br>+ }
<br>+ }
<br>+ return d->is_locked;
<br>+}
<br>+
<br>+document::page_mode_enum document::page_mode() const
<br>+{
<br>+ switch (d->doc->getCatalog()->getPageMode()) {
<br>+ case Catalog::pageModeNone:
<br>+ return use_none;
<br>+ case Catalog::pageModeOutlines:
<br>+ return use_outlines;
<br>+ case Catalog::pageModeThumbs:
<br>+ return use_thumbs;
<br>+ case Catalog::pageModeFullScreen:
<br>+ return fullscreen;
<br>+ case Catalog::pageModeOC:
<br>+ return use_oc;
<br>+ case Catalog::pageModeAttach:
<br>+ return use_attach;
<br>+ default:
<br>+ return use_none;
<br>+ }
<br>+}
<br>+
<br>+document::page_layout_enum document::page_layout() const
<br>+{
<br>+ switch (d->doc->getCatalog()->getPageLayout()) {
<br>+ case Catalog::pageLayoutNone:
<br>+ return no_layout;
<br>+ case Catalog::pageLayoutSinglePage:
<br>+ return single_page;
<br>+ case Catalog::pageLayoutOneColumn:
<br>+ return one_column;
<br>+ case Catalog::pageLayoutTwoColumnLeft:
<br>+ return two_column_left;
<br>+ case Catalog::pageLayoutTwoColumnRight:
<br>+ return two_column_right;
<br>+ case Catalog::pageLayoutTwoPageLeft:
<br>+ return two_page_left;
<br>+ case Catalog::pageLayoutTwoPageRight:
<br>+ return two_page_right;
<br>+ default:
<br>+ return no_layout;
<br>+ }
<br>+}
<br>+
<br>+void document::get_pdf_version(int *major, int *minor) const
<br>+{
<br>+ if (major) {
<br>+ *major = d->doc->getPDFMajorVersion();
<br>+ }
<br>+ if (minor) {
<br>+ *minor = d->doc->getPDFMinorVersion();
<br>+ }
<br>+}
<br>+
<br>+std::vector<std::string> document::info_keys() const
<br>+{
<br>+ if (d->is_locked) {
<br>+ return std::vector<std::string>();
<br>+ }
<br>+
<br>+ Object info;
<br>+ if (!d->doc->getDocInfo(&info)->isDict()) {
<br>+ info.free();
<br>+ return std::vector<std::string>();
<br>+ }
<br>+
<br>+ Dict *info_dict = info.getDict();
<br>+ std::vector<std::string> keys(info_dict->getLength());
<br>+ for (int i = 0; i < info_dict->getLength(); ++i) {
<br>+ keys[i] = std::string(info_dict->getKey(i));
<br>+ }
<br>+
<br>+ info.free();
<br>+ return keys;
<br>+}
<br>+
<br>+ustring document::info_key(const std::string &key) const
<br>+{
<br>+ if (d->is_locked) {
<br>+ return ustring();
<br>+ }
<br>+
<br>+ Object info;
<br>+ if (!d->doc->getDocInfo(&info)->isDict()) {
<br>+ info.free();
<br>+ return ustring();
<br>+ }
<br>+
<br>+ Dict *info_dict = info.getDict();
<br>+ Object obj;
<br>+ ustring result;
<br>+ if (info_dict->lookup(PSTR(key.c_str()), &obj)->isString()) {
<br>+ result = detail::unicode_GooString_to_ustring(obj.getString());
<br>+ }
<br>+ obj.free();
<br>+ info.free();
<br>+ return result;
<br>+}
<br>+
<br>+unsigned int document::info_date(const std::string &key) const
<br>+{
<br>+ if (d->is_locked) {
<br>+ return (unsigned int)(-1);
<br>+ }
<br>+
<br>+ Object info;
<br>+ if (!d->doc->getDocInfo(&info)->isDict()) {
<br>+ info.free();
<br>+ return (unsigned int)(-1);
<br>+ }
<br>+
<br>+ Dict *info_dict = info.getDict();
<br>+ Object obj;
<br>+ unsigned int result = (unsigned int)(-1);
<br>+ if (info_dict->lookup(PSTR(key.c_str()), &obj)->isString()) {
<br>+ result = convert_date(obj.getString()->getCString());
<br>+ }
<br>+ obj.free();
<br>+ info.free();
<br>+ return result;
<br>+}
<br>+
<br>+int document::pages() const
<br>+{
<br>+ return d->doc->getNumPages();
<br>+}
<br>+
<br>+page* document::create_page(const ustring &label) const
<br>+{
<br>+ std::auto_ptr<GooString> goolabel(detail::ustring_to_unicode_GooString(label));
<br>+ int index = 0;
<br>+
<br>+ if (!d->doc->getCatalog()->labelToIndex(goolabel.get(), &index)) {
<br>+ return 0;
<br>+ }
<br>+ return create_page(index);
<br>+}
<br>+
<br>+page* document::create_page(int index) const
<br>+{
<br>+ return index >= 0 && index < d->doc->getNumPages() ? new page(d, index) : 0;
<br>+}
<br>+
<br>+std::vector<font_info> document::fonts() const
<br>+{
<br>+ std::vector<font_info> result;
<br>+ font_iterator it(0, d);
<br>+ while (it.has_next()) {
<br>+ const std::vector<font_info> l = it.next();
<br>+ std::copy(l.begin(), l.end(), std::back_inserter(result));
<br>+ }
<br>+ return result;
<br>+}
<br>+
<br>+font_iterator* document::create_font_iterator(int start_page) const
<br>+{
<br>+ return new font_iterator(start_page, d);
<br>+}
<br>+
<br>+toc* document::create_toc() const
<br>+{
<br>+ return toc_private::load_from_outline(d->doc->getOutline());
<br>+}
<br>+
<br>+bool document::has_embedded_files() const
<br>+{
<br>+ return d->doc->getCatalog()->numEmbeddedFiles() > 0;
<br>+}
<br>+
<br>+std::vector<embedded_file *> document::embedded_files() const
<br>+{
<br>+ if (d->is_locked) {
<br>+ return std::vector<embedded_file *>();
<br>+ }
<br>+
<br>+ if (d->embedded_files.empty() && d->doc->getCatalog()->numEmbeddedFiles() > 0) {
<br>+ const int num = d->doc->getCatalog()->numEmbeddedFiles();
<br>+ d->embedded_files.resize(num);
<br>+ for (int i = 0; i < num; ++i) {
<br>+ EmbFile *ef = d->doc->getCatalog()->embeddedFile(i);
<br>+ d->embedded_files[i] = embedded_file_private::create(ef);
<br>+ }
<br>+ }
<br>+ return d->embedded_files;
<br>+}
<br>+
<br>+document* document::load_from_file(const std::string &file_name,
<br>+ const std::string &owner_password,
<br>+ const std::string &user_password)
<br>+{
<br>+ document_private *doc = new document_private(
<br>+ new GooString(file_name.c_str()),
<br>+ owner_password, user_password);
<br>+ return document_private::check_document(doc);
<br>+}
<br>diff --git a/cpp/poppler-document.h b/cpp/poppler-document.h
<br>new file mode 100644
<br>index 0000000..7ff4337
<br>--- /dev/null
<br>+++ b/cpp/poppler-document.h
<br>@@ -0,0 +1,92 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=8" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_DOCUMENT_H
<br>+#define POPPLER_DOCUMENT_H
<br>+
<br>+#include "poppler-global.h"
<br>+#include "poppler-font.h"
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class document_private;
<br>+class embedded_file;
<br>+class page;
<br>+class toc;
<br>+
<br>+class POPPLER_CPP_EXPORT document : public poppler::noncopyable
<br>+{
<br>+public:
<br>+ enum page_mode_enum {
<br>+ use_none,
<br>+ use_outlines,
<br>+ use_thumbs,
<br>+ fullscreen,
<br>+ use_oc,
<br>+ use_attach
<br>+ };
<br>+
<br>+ enum page_layout_enum {
<br>+ no_layout,
<br>+ single_page,
<br>+ one_column,
<br>+ two_column_left,
<br>+ two_column_right,
<br>+ two_page_left,
<br>+ two_page_right
<br>+ };
<br>+
<br>+ ~document();
<br>+
<br>+ bool is_locked() const;
<br>+ bool unlock(const std::string &owner_password, const std::string &user_password);
<br>+
<br>+ page_mode_enum page_mode() const;
<br>+ page_layout_enum page_layout() const;
<br>+ void get_pdf_version(int *major, int *minor) const;
<br>+ std::vector<std::string> info_keys() const;
<br>+ ustring info_key(const std::string &key) const;
<br>+ unsigned int /*time_t*/ info_date(const std::string &key) const;
<br>+
<br>+ int pages() const;
<br>+ page* create_page(const ustring &label) const;
<br>+ page* create_page(int index) const;
<br>+
<br>+ std::vector<font_info> fonts() const;
<br>+ font_iterator* create_font_iterator(int start_page = 0) const;
<br>+
<br>+ toc* create_toc() const;
<br>+
<br>+ bool has_embedded_files() const;
<br>+ std::vector<embedded_file *> embedded_files() const;
<br>+
<br>+ static document* load_from_file(const std::string &file_name,
<br>+ const std::string &owner_password,
<br>+ const std::string &user_password);
<br>+
<br>+private:
<br>+ document(document_private &dd);
<br>+
<br>+ document_private *d;
<br>+ friend class document_private;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-embedded-file-private.h b/cpp/poppler-embedded-file-private.h
<br>new file mode 100644
<br>index 0000000..2acea65
<br>--- /dev/null
<br>+++ b/cpp/poppler-embedded-file-private.h
<br>@@ -0,0 +1,40 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=9" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_EMBEDDED_FILE_PRIVATE_H
<br>+#define POPPLER_EMBEDDED_FILE_PRIVATE_H
<br>+
<br>+class EmbFile;
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class embedded_file_private
<br>+{
<br>+public:
<br>+ embedded_file_private(EmbFile *ef);
<br>+ ~embedded_file_private();
<br>+
<br>+ static embedded_file* create(EmbFile *ef);
<br>+
<br>+ EmbFile *emb_file;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-embedded-file.cpp b/cpp/poppler-embedded-file.cpp
<br>new file mode 100644
<br>index 0000000..487b32d
<br>--- /dev/null
<br>+++ b/cpp/poppler-embedded-file.cpp
<br>@@ -0,0 +1,116 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=10" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-embedded-file.h"
<br>+
<br>+#include "poppler-embedded-file-private.h"
<br>+#include "poppler-private.h"
<br>+
<br>+#include "Object.h"
<br>+#include "Stream.h"
<br>+#include "Catalog.h"
<br>+
<br>+using namespace poppler;
<br>+
<br>+embedded_file_private::embedded_file_private(EmbFile *ef)
<br>+ : emb_file(ef)
<br>+{
<br>+}
<br>+
<br>+embedded_file_private::~embedded_file_private()
<br>+{
<br>+ delete emb_file;
<br>+}
<br>+
<br>+embedded_file* embedded_file_private::create(EmbFile *ef)
<br>+{
<br>+ return new embedded_file(*new embedded_file_private(ef));
<br>+}
<br>+
<br>+
<br>+embedded_file::embedded_file(embedded_file_private &dd)
<br>+ : d(&dd)
<br>+{
<br>+}
<br>+
<br>+embedded_file::~embedded_file()
<br>+{
<br>+ delete d;
<br>+}
<br>+
<br>+bool embedded_file::is_valid() const
<br>+{
<br>+ return d->emb_file->isOk();
<br>+}
<br>+
<br>+std::string embedded_file::name() const
<br>+{
<br>+ return std::string(d->emb_file->name()->getCString());
<br>+}
<br>+
<br>+ustring embedded_file::description() const
<br>+{
<br>+ return detail::unicode_GooString_to_ustring(d->emb_file->description());
<br>+}
<br>+
<br>+int embedded_file::size() const
<br>+{
<br>+ return d->emb_file->size();
<br>+}
<br>+
<br>+unsigned int embedded_file::modification_date() const
<br>+{
<br>+ return convert_date(d->emb_file->modDate()->getCString());
<br>+}
<br>+
<br>+unsigned int embedded_file::creation_date() const
<br>+{
<br>+ return convert_date(d->emb_file->createDate()->getCString());
<br>+}
<br>+
<br>+std::string embedded_file::checksum() const
<br>+{
<br>+ return std::string(d->emb_file->checksum()->getCString());
<br>+}
<br>+
<br>+std::string embedded_file::mime_type() const
<br>+{
<br>+ return std::string(d->emb_file->mimeType()->getCString());
<br>+}
<br>+
<br>+std::vector<char> embedded_file::data() const
<br>+{
<br>+ if (!is_valid()) {
<br>+ return std::vector<char>();
<br>+ }
<br>+
<br>+ Stream *stream = d->emb_file->streamObject().getStream();
<br>+ stream->reset();
<br>+ std::vector<char> ret(1024);
<br>+ size_t data_len = 0;
<br>+ int i;
<br>+ while ((i = stream->getChar()) != EOF) {
<br>+ if (data_len == ret.size()) {
<br>+ ret.resize(ret.size() * 2);
<br>+ }
<br>+ ret[data_len] = (char)i;
<br>+ ++data_len;
<br>+ }
<br>+ ret.resize(data_len);
<br>+ return ret;
<br>+}
<br>diff --git a/cpp/poppler-embedded-file.h b/cpp/poppler-embedded-file.h
<br>new file mode 100644
<br>index 0000000..250b84a
<br>--- /dev/null
<br>+++ b/cpp/poppler-embedded-file.h
<br>@@ -0,0 +1,55 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=11" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_EMBEDDED_FILE_H
<br>+#define POPPLER_EMBEDDED_FILE_H
<br>+
<br>+#include "poppler-global.h"
<br>+
<br>+#include <vector>
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class embedded_file_private;
<br>+
<br>+class POPPLER_CPP_EXPORT embedded_file : public poppler::noncopyable
<br>+{
<br>+public:
<br>+ ~embedded_file();
<br>+
<br>+ bool is_valid() const;
<br>+ std::string name() const;
<br>+ ustring description() const;
<br>+ int size() const;
<br>+ unsigned int /*time_t*/ modification_date() const;
<br>+ unsigned int /*time_t*/ creation_date() const;
<br>+ std::string checksum() const;
<br>+ std::string mime_type() const;
<br>+ std::vector<char> data() const;
<br>+
<br>+private:
<br>+ embedded_file(embedded_file_private &dd);
<br>+
<br>+ embedded_file_private *d;
<br>+ friend class embedded_file_private;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-font.cpp b/cpp/poppler-font.cpp
<br>new file mode 100644
<br>index 0000000..5c3221b
<br>--- /dev/null
<br>+++ b/cpp/poppler-font.cpp
<br>@@ -0,0 +1,166 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=12" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-font.h"
<br>+
<br>+#include "poppler-document-private.h"
<br>+
<br>+#include "FontInfo.h"
<br>+
<br>+using namespace poppler;
<br>+
<br>+class poppler::font_info_private
<br>+{
<br>+public:
<br>+ font_info_private()
<br>+ : type(font_info::unknown)
<br>+ , is_embedded(false)
<br>+ , is_subset(false)
<br>+ {
<br>+ }
<br>+ font_info_private(FontInfo *fi)
<br>+ : type((font_info::type_enum)fi->getType())
<br>+ , is_embedded(fi->getEmbedded())
<br>+ , is_subset(fi->getSubset())
<br>+ , emb_ref(fi->getEmbRef())
<br>+ {
<br>+ if (fi->getName()) {
<br>+ font_name = fi->getName()->getCString();
<br>+ }
<br>+ if (fi->getFile()) {
<br>+ font_file = fi->getFile()->getCString();
<br>+ }
<br>+ }
<br>+
<br>+ std::string font_name;
<br>+ std::string font_file;
<br>+ font_info::type_enum type : 5;
<br>+ bool is_embedded : 1;
<br>+ bool is_subset : 1;
<br>+ Ref emb_ref;
<br>+};
<br>+
<br>+
<br>+class poppler::font_iterator_private
<br>+{
<br>+public:
<br>+ font_iterator_private(int start_page, document_private *dd)
<br>+ : font_info_scanner(dd->doc, start_page)
<br>+ , total_pages(dd->doc->getNumPages())
<br>+ , current_page((std::max)(start_page, 0) - 1)
<br>+ {
<br>+ }
<br>+ ~font_iterator_private()
<br>+ {
<br>+ }
<br>+
<br>+ FontInfoScanner font_info_scanner;
<br>+ int total_pages;
<br>+ int current_page;
<br>+};
<br>+
<br>+
<br>+font_info::font_info()
<br>+ : d(new font_info_private())
<br>+{
<br>+}
<br>+
<br>+font_info::font_info(font_info_private &dd)
<br>+ : d(&dd)
<br>+{
<br>+}
<br>+
<br>+font_info::font_info(const font_info &fi)
<br>+ : d(new font_info_private(*fi.d))
<br>+{
<br>+}
<br>+
<br>+font_info::~font_info()
<br>+{
<br>+ delete d;
<br>+}
<br>+
<br>+std::string font_info::name() const
<br>+{
<br>+ return d->font_name;
<br>+}
<br>+
<br>+std::string font_info::file() const
<br>+{
<br>+ return d->font_file;
<br>+}
<br>+
<br>+bool font_info::is_embedded() const
<br>+{
<br>+ return d->is_embedded;
<br>+}
<br>+
<br>+bool font_info::is_subset() const
<br>+{
<br>+ return d->is_subset;
<br>+}
<br>+
<br>+font_info::type_enum font_info::type() const
<br>+{
<br>+ return d->type;
<br>+}
<br>+
<br>+font_info& font_info::operator=(const font_info &fi)
<br>+{
<br>+ if (this != &fi) {
<br>+ *d = *fi.d;
<br>+ }
<br>+ return *this;
<br>+}
<br>+
<br>+
<br>+font_iterator::font_iterator(int start_page, document_private *dd)
<br>+ : d(new font_iterator_private(start_page, dd))
<br>+{
<br>+}
<br>+
<br>+font_iterator::~font_iterator()
<br>+{
<br>+ delete d;
<br>+}
<br>+
<br>+std::vector<font_info> font_iterator::next()
<br>+{
<br>+ ++d->current_page;
<br>+
<br>+ GooList *items = d->font_info_scanner.scan(1);
<br>+ if (!items) {
<br>+ return std::vector<font_info>();
<br>+ }
<br>+ std::vector<font_info> fonts(items->getLength());
<br>+ for (int i = 0; i < items->getLength(); ++i) {
<br>+ fonts[i] = font_info(*new font_info_private((FontInfo *)items->get(i)));
<br>+ }
<br>+ deleteGooList(items, FontInfo);
<br>+ return fonts;
<br>+}
<br>+
<br>+bool font_iterator::has_next() const
<br>+{
<br>+ return (d->current_page + 1) < d->total_pages;
<br>+}
<br>+
<br>+int font_iterator::current_page() const
<br>+{
<br>+ return d->current_page;
<br>+}
<br>diff --git a/cpp/poppler-font.h b/cpp/poppler-font.h
<br>new file mode 100644
<br>index 0000000..854b7a4
<br>--- /dev/null
<br>+++ b/cpp/poppler-font.h
<br>@@ -0,0 +1,91 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=13" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_FONT_H
<br>+#define POPPLER_FONT_H
<br>+
<br>+#include "poppler-global.h"
<br>+
<br>+#include <vector>
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class document;
<br>+class document_private;
<br>+class font_info_private;
<br>+class font_iterator;
<br>+class font_iterator_private;
<br>+
<br>+class POPPLER_CPP_EXPORT font_info
<br>+{
<br>+public:
<br>+ enum type_enum {
<br>+ unknown,
<br>+ type1,
<br>+ type1c,
<br>+ type1c_ot,
<br>+ type3,
<br>+ truetype,
<br>+ truetype_ot,
<br>+ cid_type0,
<br>+ cid_type0c,
<br>+ cid_type0c_ot,
<br>+ cid_truetype,
<br>+ cid_truetype_ot
<br>+ };
<br>+
<br>+ font_info();
<br>+ font_info(const font_info &fi);
<br>+ ~font_info();
<br>+
<br>+ std::string name() const;
<br>+ std::string file() const;
<br>+ bool is_embedded() const;
<br>+ bool is_subset() const;
<br>+ type_enum type() const;
<br>+
<br>+ font_info& operator=(const font_info &fi);
<br>+
<br>+private:
<br>+ font_info(font_info_private &dd);
<br>+
<br>+ font_info_private *d;
<br>+ friend class font_iterator;
<br>+};
<br>+
<br>+
<br>+class POPPLER_CPP_EXPORT font_iterator : public poppler::noncopyable
<br>+{
<br>+public:
<br>+ ~font_iterator();
<br>+
<br>+ std::vector<font_info> next();
<br>+ bool has_next() const;
<br>+ int current_page() const;
<br>+
<br>+private:
<br>+ font_iterator(int, document_private *dd);
<br>+
<br>+ font_iterator_private *d;
<br>+ friend class document;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-global.cpp b/cpp/poppler-global.cpp
<br>new file mode 100644
<br>index 0000000..ce27061
<br>--- /dev/null
<br>+++ b/cpp/poppler-global.cpp
<br>@@ -0,0 +1,162 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=14" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-global.h"
<br>+
<br>+#include "DateInfo.h"
<br>+
<br>+#include <ctime>
<br>+#include <cstring>
<br>+
<br>+using namespace poppler;
<br>+
<br>+noncopyable::noncopyable()
<br>+{
<br>+}
<br>+
<br>+noncopyable::~noncopyable()
<br>+{
<br>+}
<br>+
<br>+
<br>+ustring::ustring()
<br>+{
<br>+}
<br>+
<br>+ustring::ustring(size_type len, value_type ch)
<br>+ : std::basic_string<value_type>(len, ch)
<br>+{
<br>+}
<br>+
<br>+ustring::~ustring()
<br>+{
<br>+}
<br>+
<br>+char* ustring::to_utf_8(int *length) const
<br>+{
<br>+ if (!size()) {
<br>+ if (length) {
<br>+ *length = 0;
<br>+ }
<br>+ return 0;
<br>+ }
<br>+
<br>+ const value_type *me = data();
<br>+ const size_t len = size() * 2 + 2;
<br>+ char *str = new char[len];
<br>+ str[0] = 0xfe;
<br>+ str[1] = 0xff;
<br>+ for (size_t i = 0; i < size(); ++i, ++me) {
<br>+ str[i * 2 + 2] = (*me & 0xff);
<br>+ str[i * 2 + 3] = ((*me >> 8) & 0xff);
<br>+ }
<br>+ if (length) {
<br>+ *length = len;
<br>+ }
<br>+ return str;
<br>+}
<br>+
<br>+std::string ustring::to_latin1() const
<br>+{
<br>+ if (!size()) {
<br>+ return std::string();
<br>+ }
<br>+
<br>+ const size_type mylength = size();
<br>+ std::string ret(mylength, '\0');
<br>+ const value_type *me = data();
<br>+ for (size_type i = 0; i < mylength; ++i) {
<br>+ ret[i] = (char)*me++;
<br>+ }
<br>+ return ret;
<br>+}
<br>+
<br>+ustring ustring::from_utf_8(const char *str, int len)
<br>+{
<br>+ if (len <= 0) {
<br>+ len = std::strlen(str);
<br>+ if (len <= 0) {
<br>+ return ustring();
<br>+ }
<br>+ }
<br>+
<br>+ int i = 0;
<br>+ bool is_unicode = false;
<br>+ if ((str[0] & 0xff) == 0xfe && (len > 1 && (str[1] & 0xff) == 0xff)) {
<br>+ is_unicode = true;
<br>+ i = 2;
<br>+ }
<br>+
<br>+ const ustring::size_type ret_len = (len - i) / (is_unicode ? 2 : 1);
<br>+ ustring ret(ret_len, 0);
<br>+ size_t ret_index = 0;
<br>+ ustring::value_type u;
<br>+ if (is_unicode) {
<br>+ while (i < len) {
<br>+ u = ((str[i] & 0xff) << 8) | (str[i + 1] & 0xff);
<br>+ i += 2;
<br>+ ret[ret_index++] = u;
<br>+ }
<br>+ } else {
<br>+ while (i < len) {
<br>+ u = str[i] & 0xff;
<br>+ ++i;
<br>+ ret[ret_index++] = u;
<br>+ }
<br>+ }
<br>+
<br>+ return ret;
<br>+}
<br>+
<br>+ustring ustring::from_latin1(const std::string &str)
<br>+{
<br>+ const size_type l = str.size();
<br>+ if (!l) {
<br>+ return ustring();
<br>+ }
<br>+ const char *c = str.data();
<br>+ ustring ret(l, 0);
<br>+ for (size_type i = 0; i < l; ++i) {
<br>+ ret[i] = *c++;
<br>+ }
<br>+ return ret;
<br>+}
<br>+
<br>+
<br>+unsigned int convert_date(const std::string &date)
<br>+{
<br>+ int year, mon, day, hour, min, sec, tzHours, tzMins;
<br>+ char tz;
<br>+
<br>+ if (!parseDateString(date.c_str(), &year, &mon, &day, &hour, &min, &sec,
<br>+ &tz, &tzHours, &tzMins)) {
<br>+ return (unsigned int)(-1);
<br>+ }
<br>+
<br>+ struct tm time;
<br>+ time.tm_sec = sec;
<br>+ time.tm_min = min;
<br>+ time.tm_hour = hour;
<br>+ time.tm_mday = day;
<br>+ time.tm_mon = mon - 1;
<br>+ time.tm_year = year - 1900;
<br>+ time.tm_wday = -1;
<br>+ time.tm_yday = -1;
<br>+ time.tm_isdst = -1;
<br>+ return mktime(&time);
<br>+}
<br>diff --git a/cpp/poppler-global.h b/cpp/poppler-global.h
<br>new file mode 100644
<br>index 0000000..e51878c
<br>--- /dev/null
<br>+++ b/cpp/poppler-global.h
<br>@@ -0,0 +1,86 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=15" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_GLOBAL_H
<br>+#define POPPLER_GLOBAL_H
<br>+
<br>+#if defined(_WIN32)
<br>+# define LIB_EXPORT __declspec(dllexport)
<br>+# define LIB_IMPORT __declspec(dllimport)
<br>+#else
<br>+# define LIB_EXPORT
<br>+# define LIB_IMPORT
<br>+#endif
<br>+
<br>+#if defined(poppler_cpp_EXPORTS)
<br>+# define POPPLER_CPP_EXPORT LIB_EXPORT
<br>+#else
<br>+# define POPPLER_CPP_EXPORT LIB_IMPORT
<br>+#endif
<br>+
<br>+#include <string>
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+namespace detail
<br>+{
<br>+
<br>+class POPPLER_CPP_EXPORT noncopyable
<br>+{
<br>+protected:
<br>+ noncopyable();
<br>+ ~noncopyable();
<br>+private:
<br>+ noncopyable(const noncopyable &);
<br>+ const noncopyable& operator=(const noncopyable &);
<br>+};
<br>+
<br>+}
<br>+
<br>+typedef detail::noncopyable noncopyable;
<br>+
<br>+enum rotation_enum { rotate_0, rotate_90, rotate_180, rotate_270 };
<br>+
<br>+enum page_box_enum { media_box, crop_box, bleed_box, trim_box, art_box };
<br>+
<br>+class POPPLER_CPP_EXPORT ustring : public std::basic_string<unsigned short>
<br>+{
<br>+public:
<br>+ ustring();
<br>+ ustring(size_type len, value_type ch);
<br>+ ~ustring();
<br>+
<br>+ char* to_utf_8(int *length = 0) const;
<br>+ std::string to_latin1() const;
<br>+
<br>+ static ustring from_utf_8(const char *str, int len = -1);
<br>+ static ustring from_latin1(const std::string &str);
<br>+
<br>+private:
<br>+ // forbid implicit std::string conversions
<br>+ ustring(const std::string &);
<br>+ operator std::string() const;
<br>+ ustring& operator=(const std::string &);
<br>+};
<br>+
<br>+POPPLER_CPP_EXPORT unsigned int /*time_t*/ convert_date(const std::string &date);
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-page-private.h b/cpp/poppler-page-private.h
<br>new file mode 100644
<br>index 0000000..654478b
<br>--- /dev/null
<br>+++ b/cpp/poppler-page-private.h
<br>@@ -0,0 +1,44 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=16" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_PAGE_PRIVATE_H
<br>+#define POPPLER_PAGE_PRIVATE_H
<br>+
<br>+class Page;
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class document_private;
<br>+class page_transition;
<br>+
<br>+class page_private
<br>+{
<br>+public:
<br>+ page_private(document_private *doc, int index);
<br>+ ~page_private();
<br>+
<br>+ document_private *doc;
<br>+ Page *page;
<br>+ int index;
<br>+ page_transition *transition;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-page-transition.cpp b/cpp/poppler-page-transition.cpp
<br>new file mode 100644
<br>index 0000000..92ae4fc
<br>--- /dev/null
<br>+++ b/cpp/poppler-page-transition.cpp
<br>@@ -0,0 +1,95 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=17" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-page-transition.h"
<br>+
<br>+#include "PageTransition.h"
<br>+
<br>+using namespace poppler;
<br>+
<br>+class poppler::page_transition_private
<br>+{
<br>+public:
<br>+ page_transition_private(Object *trans)
<br>+ : pt(trans)
<br>+ {
<br>+ }
<br>+
<br>+ PageTransition pt;
<br>+};
<br>+
<br>+
<br>+page_transition::page_transition(Object *params)
<br>+ : d(new page_transition_private(params))
<br>+{
<br>+}
<br>+
<br>+page_transition::page_transition(const page_transition &pt)
<br>+ : d(new page_transition_private(*pt.d))
<br>+{
<br>+}
<br>+
<br>+page_transition::~page_transition()
<br>+{
<br>+ delete d;
<br>+}
<br>+
<br>+page_transition::type_enum page_transition::type() const
<br>+{
<br>+ return (page_transition::type_enum)d->pt.getType();
<br>+}
<br>+
<br>+int page_transition::duration() const
<br>+{
<br>+ return d->pt.getDuration();
<br>+}
<br>+
<br>+page_transition::alignment_enum page_transition::alignment() const
<br>+{
<br>+ return (page_transition::alignment_enum)d->pt.getAlignment();
<br>+}
<br>+
<br>+page_transition::direction_enum page_transition::direction() const
<br>+{
<br>+ return (page_transition::direction_enum)d->pt.getDirection();
<br>+}
<br>+
<br>+int page_transition::angle() const
<br>+{
<br>+ return d->pt.getAngle();
<br>+}
<br>+
<br>+double page_transition::scale() const
<br>+{
<br>+ return d->pt.getScale();
<br>+}
<br>+
<br>+bool page_transition::is_rectangular() const
<br>+{
<br>+ return d->pt.isRectangular();
<br>+}
<br>+
<br>+page_transition& page_transition::operator=(const page_transition &pt)
<br>+{
<br>+ if (&pt != this) {
<br>+ page_transition_private *new_d = new page_transition_private(*pt.d);
<br>+ delete d;
<br>+ new_d = d;
<br>+ }
<br>+ return *this;
<br>+}
<br>diff --git a/cpp/poppler-page-transition.h b/cpp/poppler-page-transition.h
<br>new file mode 100644
<br>index 0000000..4ecb179
<br>--- /dev/null
<br>+++ b/cpp/poppler-page-transition.h
<br>@@ -0,0 +1,82 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=18" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_PAGE_TRANSITION_H
<br>+#define POPPLER_PAGE_TRANSITION_H
<br>+
<br>+#include "poppler-global.h"
<br>+
<br>+class Object;
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class page;
<br>+class page_transition_private;
<br>+
<br>+class POPPLER_CPP_EXPORT page_transition
<br>+{
<br>+public:
<br>+ enum type_enum {
<br>+ replace = 0,
<br>+ split,
<br>+ blinds,
<br>+ box,
<br>+ wipe,
<br>+ dissolve,
<br>+ glitter,
<br>+ fly,
<br>+ push,
<br>+ cover,
<br>+ uncover,
<br>+ fade
<br>+ };
<br>+
<br>+ enum alignment_enum {
<br>+ horizontal = 0,
<br>+ vertical
<br>+ };
<br>+
<br>+ enum direction_enum {
<br>+ inward = 0,
<br>+ outward
<br>+ };
<br>+
<br>+ page_transition(const page_transition &pt);
<br>+ ~page_transition();
<br>+
<br>+ type_enum type() const;
<br>+ int duration() const;
<br>+ alignment_enum alignment() const;
<br>+ direction_enum direction() const;
<br>+ int angle() const;
<br>+ double scale() const;
<br>+ bool is_rectangular() const;
<br>+
<br>+ page_transition& operator=(const page_transition &pt);
<br>+
<br>+private:
<br>+ page_transition(Object *params);
<br>+
<br>+ page_transition_private *d;
<br>+ friend class page;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-page.cpp b/cpp/poppler-page.cpp
<br>new file mode 100644
<br>index 0000000..b10cc5b
<br>--- /dev/null
<br>+++ b/cpp/poppler-page.cpp
<br>@@ -0,0 +1,121 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=19" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-page.h"
<br>+#include "poppler-page-transition.h"
<br>+
<br>+#include "poppler-document-private.h"
<br>+#include "poppler-page-private.h"
<br>+#include "poppler-private.h"
<br>+
<br>+using namespace poppler;
<br>+
<br>+page_private::page_private(document_private *_doc, int _index)
<br>+ : doc(_doc)
<br>+ , page(doc->doc->getCatalog()->getPage(index + 1))
<br>+ , index(_index)
<br>+ , transition(0)
<br>+{
<br>+}
<br>+
<br>+page_private::~page_private()
<br>+{
<br>+ delete transition;
<br>+}
<br>+
<br>+
<br>+page::page(document_private *doc, int index)
<br>+ : d(new page_private(doc, index))
<br>+{
<br>+}
<br>+
<br>+page::~page()
<br>+{
<br>+ delete d;
<br>+}
<br>+
<br>+page::orientation_enum page::orientation() const
<br>+{
<br>+ const int rotation = d->page->getRotate();
<br>+ switch (rotation) {
<br>+ case 90:
<br>+ return landscape;
<br>+ break;
<br>+ case 180:
<br>+ return upside_down;
<br>+ break;
<br>+ case 270:
<br>+ return seascape;
<br>+ break;
<br>+ default:
<br>+ return portrait;
<br>+ }
<br>+}
<br>+
<br>+double page::duration() const
<br>+{
<br>+ return d->page->getDuration();
<br>+}
<br>+
<br>+rectf page::page_rect(page_box_enum box) const
<br>+{
<br>+ PDFRectangle *r = 0;
<br>+ switch (box) {
<br>+ case media_box:
<br>+ r = d->page->getMediaBox();
<br>+ break;
<br>+ case crop_box:
<br>+ r = d->page->getCropBox();
<br>+ break;
<br>+ case bleed_box:
<br>+ r = d->page->getBleedBox();
<br>+ break;
<br>+ case trim_box:
<br>+ r = d->page->getTrimBox();
<br>+ break;
<br>+ case art_box:
<br>+ r = d->page->getArtBox();
<br>+ break;
<br>+ }
<br>+ if (r) {
<br>+ return detail::pdfrectangle_to_rectf(*r);
<br>+ }
<br>+ return rectf();
<br>+}
<br>+
<br>+ustring page::label() const
<br>+{
<br>+ GooString goo;
<br>+ if (!d->doc->doc->getCatalog()->indexToLabel(d->index, &goo)) {
<br>+ return ustring();
<br>+ }
<br>+
<br>+ return detail::unicode_GooString_to_ustring(&goo);
<br>+}
<br>+
<br>+page_transition* page::transition() const
<br>+{
<br>+ if (!d->transition) {
<br>+ Object o;
<br>+ if (d->page->getTrans(&o)->isDict()) {
<br>+ d->transition = new page_transition(&o);
<br>+ }
<br>+ o.free();
<br>+ }
<br>+ return d->transition;
<br>+}
<br>diff --git a/cpp/poppler-page.h b/cpp/poppler-page.h
<br>new file mode 100644
<br>index 0000000..65cea52
<br>--- /dev/null
<br>+++ b/cpp/poppler-page.h
<br>@@ -0,0 +1,62 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=20" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_PAGE_H
<br>+#define POPPLER_PAGE_H
<br>+
<br>+#include "poppler-global.h"
<br>+#include "poppler-rectangle.h"
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class document;
<br>+class document_private;
<br>+class page_private;
<br>+class page_transition;
<br>+
<br>+class POPPLER_CPP_EXPORT page : public poppler::noncopyable
<br>+{
<br>+public:
<br>+ enum orientation_enum {
<br>+ landscape,
<br>+ portrait,
<br>+ seascape,
<br>+ upside_down
<br>+ };
<br>+
<br>+ ~page();
<br>+
<br>+ orientation_enum orientation() const;
<br>+ double duration() const;
<br>+ rectf page_rect(page_box_enum box = crop_box) const;
<br>+ ustring label() const;
<br>+
<br>+ page_transition* transition() const;
<br>+
<br>+private:
<br>+ page(document_private *doc, int index);
<br>+
<br>+ page_private *d;
<br>+ friend class page_private;
<br>+ friend class document;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-private.cpp b/cpp/poppler-private.cpp
<br>new file mode 100644
<br>index 0000000..16ba370
<br>--- /dev/null
<br>+++ b/cpp/poppler-private.cpp
<br>@@ -0,0 +1,70 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=21" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-private.h"
<br>+
<br>+#include "GooString.h"
<br>+#include "Page.h"
<br>+
<br>+#include <iostream>
<br>+#include <sstream>
<br>+
<br>+using namespace poppler;
<br>+
<br>+void detail::error_function(int pos, char *msg, va_list args)
<br>+{
<br>+ std::ostringstream oss;
<br>+ if (pos >= 0) {
<br>+ oss << "poppler/error (" << pos << "): ";
<br>+ } else {
<br>+ oss << "poppler/error: ";
<br>+ }
<br>+ char buffer[4096]; // should be big enough
<br>+ vsnprintf(buffer, sizeof(buffer) - 1, msg, args);
<br>+ oss << buffer;
<br>+ std::cerr << oss.str();
<br>+}
<br>+
<br>+rectf detail::pdfrectangle_to_rectf(const PDFRectangle &pdfrect)
<br>+{
<br>+ return rectf(pdfrect.x1, pdfrect.y1, pdfrect.x2 - pdfrect.x1, pdfrect.y2 - pdfrect.y1);
<br>+}
<br>+
<br>+ustring detail::unicode_GooString_to_ustring(GooString *str)
<br>+{
<br>+ return ustring::from_utf_8(str->getCString(), str->getLength());
<br>+}
<br>+
<br>+ustring detail::unicode_to_ustring(const Unicode *u, int length)
<br>+{
<br>+ ustring str(length, 0);
<br>+ ustring::iterator it = str.begin(), it_end = str.end();
<br>+ const Unicode *uu = u;
<br>+ for (; it != it_end; ++it) {
<br>+ *it = ustring::value_type(*uu++);
<br>+ }
<br>+ return str;
<br>+}
<br>+
<br>+GooString* detail::ustring_to_unicode_GooString(const ustring &str)
<br>+{
<br>+ char *u = str.to_utf_8();
<br>+ GooString *goo = new GooString(u);
<br>+ delete [] u;
<br>+ return goo;
<br>+}
<br>diff --git a/cpp/poppler-private.h b/cpp/poppler-private.h
<br>new file mode 100644
<br>index 0000000..fb3bc6c
<br>--- /dev/null
<br>+++ b/cpp/poppler-private.h
<br>@@ -0,0 +1,66 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=22" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_PRIVATE_H
<br>+#define POPPLER_PRIVATE_H
<br>+
<br>+#include "poppler-global.h"
<br>+#include "poppler-rectangle.h"
<br>+
<br>+#include "CharTypes.h"
<br>+
<br>+#include <stdarg.h>
<br>+
<br>+class GooString;
<br>+class PDFRectangle;
<br>+
<br>+#define PSTR(str) const_cast<char *>(str)
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+namespace detail
<br>+{
<br>+
<br>+void error_function(int pos, char *msg, va_list args);
<br>+
<br>+rectf pdfrectangle_to_rectf(const PDFRectangle &pdfrect);
<br>+
<br>+ustring unicode_GooString_to_ustring(GooString *str);
<br>+ustring unicode_to_ustring(const Unicode *u, int length);
<br>+GooString* ustring_to_unicode_GooString(const ustring &str);
<br>+
<br>+}
<br>+
<br>+template <typename ConstIterator>
<br>+void delete_all(ConstIterator it, ConstIterator end)
<br>+{
<br>+ while (it != end) {
<br>+ delete *it++;
<br>+ }
<br>+}
<br>+
<br>+template <typename Collection>
<br>+void delete_all(const Collection &c)
<br>+{
<br>+ delete_all(c.begin(), c.end());
<br>+}
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-rectangle.h b/cpp/poppler-rectangle.h
<br>new file mode 100644
<br>index 0000000..7465edc
<br>--- /dev/null
<br>+++ b/cpp/poppler-rectangle.h
<br>@@ -0,0 +1,60 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=23" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_RECTANGLE_H
<br>+#define POPPLER_RECTANGLE_H
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+template <typename T> class rectangle
<br>+{
<br>+public:
<br>+ rectangle()
<br>+ : x1(), y1(), x2(), y2()
<br>+ {}
<br>+ rectangle(T _x, T _y, T w, T h)
<br>+ : x1(_x), y1(_y), x2(x1 + w), y2(y1 + h)
<br>+ {}
<br>+ ~rectangle();
<br>+
<br>+ bool is_empty() const
<br>+ { return (x1 == x2) && (y1 == y2); }
<br>+
<br>+ T x() const
<br>+ { return x1; }
<br>+
<br>+ T y() const
<br>+ { return y1; }
<br>+
<br>+ T width() const
<br>+ { return x2 - x1; }
<br>+
<br>+ T height() const
<br>+ { return y2 - y1; }
<br>+
<br>+private:
<br>+ T x1, y1, x2, y2;
<br>+};
<br>+
<br>+typedef rectangle<int> rect;
<br>+typedef rectangle<double> rectf;
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-toc-private.h b/cpp/poppler-toc-private.h
<br>new file mode 100644
<br>index 0000000..e8841ff
<br>--- /dev/null
<br>+++ b/cpp/poppler-toc-private.h
<br>@@ -0,0 +1,62 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=24" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_TOC_PRIVATE_H
<br>+#define POPPLER_TOC_PRIVATE_H
<br>+
<br>+#include "poppler-global.h"
<br>+#include "poppler-toc.h"
<br>+
<br>+#include <vector>
<br>+
<br>+class GooList;
<br>+class Outline;
<br>+class OutlineItem;
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class toc_private
<br>+{
<br>+public:
<br>+ toc_private();
<br>+ ~toc_private();
<br>+
<br>+ static toc* load_from_outline(Outline *outline);
<br>+
<br>+ toc_item root;
<br>+};
<br>+
<br>+
<br>+class toc_item_private
<br>+{
<br>+public:
<br>+ toc_item_private();
<br>+ ~toc_item_private();
<br>+
<br>+ void load(OutlineItem *item);
<br>+ void load_children(GooList *items);
<br>+
<br>+ std::vector<toc_item*> children;
<br>+ ustring title;
<br>+ bool is_open;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>diff --git a/cpp/poppler-toc.cpp b/cpp/poppler-toc.cpp
<br>new file mode 100644
<br>index 0000000..6f05f21
<br>--- /dev/null
<br>+++ b/cpp/poppler-toc.cpp
<br>@@ -0,0 +1,136 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=25" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#include "poppler-toc.h"
<br>+
<br>+#include "poppler-toc-private.h"
<br>+#include "poppler-private.h"
<br>+
<br>+#include "GooList.h"
<br>+#include "Outline.h"
<br>+
<br>+using namespace poppler;
<br>+
<br>+toc_private::toc_private()
<br>+{
<br>+}
<br>+
<br>+toc_private::~toc_private()
<br>+{
<br>+}
<br>+
<br>+toc* toc_private::load_from_outline(Outline *outline)
<br>+{
<br>+ if (!outline) {
<br>+ return 0;
<br>+ }
<br>+
<br>+ GooList *items = outline->getItems();
<br>+ if (!items || items->getLength() < 1) {
<br>+ return 0;
<br>+ }
<br>+
<br>+ toc *newtoc = new toc();
<br>+ newtoc->d->root.d->is_open = true;
<br>+ newtoc->d->root.d->load_children(outline->getItems());
<br>+
<br>+ return newtoc;
<br>+}
<br>+
<br>+toc_item_private::toc_item_private()
<br>+ : is_open(false)
<br>+{
<br>+}
<br>+
<br>+toc_item_private::~toc_item_private()
<br>+{
<br>+}
<br>+
<br>+void toc_item_private::load(OutlineItem *item)
<br>+{
<br>+ const Unicode *title_unicode = item->getTitle();
<br>+ const int title_length = item->getTitleLength();
<br>+ title = detail::unicode_to_ustring(title_unicode, title_length);
<br>+ is_open = item->isOpen();
<br>+}
<br>+
<br>+void toc_item_private::load_children(GooList *items)
<br>+{
<br>+ const int num_items = items->getLength();
<br>+ children.resize(num_items);
<br>+ for (int i = 0; i < num_items; ++i) {
<br>+ OutlineItem *item = (OutlineItem *)items->get(i);
<br>+
<br>+ toc_item *new_item = new toc_item();
<br>+ new_item->d->load(item);
<br>+ children[i] = new_item;
<br>+
<br>+ item->open();
<br>+ GooList *item_children = item->getKids();
<br>+ if (item_children) {
<br>+ new_item->d->load_children(item_children);
<br>+ }
<br>+ }
<br>+}
<br>+
<br>+
<br>+toc::toc()
<br>+ : d(new toc_private())
<br>+{
<br>+}
<br>+
<br>+toc::~toc()
<br>+{
<br>+ delete d;
<br>+}
<br>+
<br>+
<br>+toc_item::toc_item()
<br>+ : d(new toc_item_private())
<br>+{
<br>+}
<br>+
<br>+toc_item::~toc_item()
<br>+{
<br>+ delete d;
<br>+}
<br>+
<br>+ustring toc_item::title() const
<br>+{
<br>+ return d->title;
<br>+}
<br>+
<br>+bool toc_item::is_open() const
<br>+{
<br>+ return d->is_open;
<br>+}
<br>+
<br>+std::vector<toc_item *> toc_item::children() const
<br>+{
<br>+ return d->children;
<br>+}
<br>+
<br>+toc_item::iterator toc_item::children_begin() const
<br>+{
<br>+ return d->children.begin();
<br>+}
<br>+
<br>+toc_item::iterator toc_item::children_end() const
<br>+{
<br>+ return d->children.end();
<br>+}
<br>diff --git a/cpp/poppler-toc.h b/cpp/poppler-toc.h
<br>new file mode 100644
<br>index 0000000..8b09736
<br>--- /dev/null
<br>+++ b/cpp/poppler-toc.h
<br>@@ -0,0 +1,74 @@
<br>+/*
<br>+ * Copyright (C) 2009, Pino Toscano <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=26" target="_top" rel="nofollow">pino@...</a>>
<br>+ *
<br>+ * This program is free software; you can redistribute it and/or modify
<br>+ * it under the terms of the GNU General Public License as published by
<br>+ * the Free Software Foundation; either version 2, or (at your option)
<br>+ * any later version.
<br>+ *
<br>+ * This program is distributed in the hope that it will be useful,
<br>+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
<br>+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
<br>+ * GNU General Public License for more details.
<br>+ *
<br>+ * You should have received a copy of the GNU General Public License
<br>+ * along with this program; if not, write to the Free Software
<br>+ * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
<br>+ */
<br>+
<br>+#ifndef POPPLER_TOC_H
<br>+#define POPPLER_TOC_H
<br>+
<br>+#include "poppler-global.h"
<br>+
<br>+#include <vector>
<br>+
<br>+namespace poppler
<br>+{
<br>+
<br>+class toc_private;
<br>+class toc_item;
<br>+class toc_item_private;
<br>+
<br>+class POPPLER_CPP_EXPORT toc : public poppler::noncopyable
<br>+{
<br>+public:
<br>+ ~toc();
<br>+
<br>+ toc_item* root() const;
<br>+
<br>+private:
<br>+ toc();
<br>+
<br>+ toc_private *d;
<br>+
<br>+ friend class toc_private;
<br>+};
<br>+
<br>+
<br>+class POPPLER_CPP_EXPORT toc_item : public poppler::noncopyable
<br>+{
<br>+public:
<br>+ typedef std::vector<toc_item *>::const_iterator iterator;
<br>+
<br>+ ~toc_item();
<br>+
<br>+ ustring title() const;
<br>+ bool is_open() const;
<br>+
<br>+ std::vector<toc_item *> children() const;
<br>+ iterator children_begin() const;
<br>+ iterator children_end() const;
<br>+
<br>+private:
<br>+ toc_item();
<br>+
<br>+ toc_item_private *d;
<br>+ friend class toc;
<br>+ friend class toc_private;
<br>+ friend class toc_item_private;
<br>+};
<br>+
<br>+}
<br>+
<br>+#endif
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26770585&i=27" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26768040
Changes to 'cpp-frontend'
2009-12-13T09:39:18Z
2009-12-13T09:39:18Z
Pino Toscano-2
New branch 'cpp-frontend' available with the following commits:
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26768040&i=0" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26758912
poppler/Gfx.cc
2009-12-12T08:25:32Z
2009-12-12T08:25:32Z
Carlos Garcia Campos-5
poppler/Gfx.cc | 1 +
<br> 1 file changed, 1 insertion(+)
<br><br>New commits:
<br>commit 62854051f4e47028147cc93a5faac39e2fa2c9fd
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26758912&i=0" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Sat Dec 12 17:22:08 2009 +0100
<br><br> Initialize profileCommands in Gfx constructor
<br><br>diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
<br>index 401b52e..69f99db 100644
<br>--- a/poppler/Gfx.cc
<br>+++ b/poppler/Gfx.cc
<br>@@ -565,6 +565,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict, Catalog *catalogA,
<br> catalog = catalogA;
<br> subPage = gTrue;
<br> printCommands = globalParams->getPrintCommands();
<br>+ profileCommands = globalParams->getProfileCommands();
<br> textHaveCSPattern = gFalse;
<br> drawText = gFalse;
<br> maskHaveCSPattern = gFalse;
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26758912&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26758908
Branch 'poppler-0.12' - poppler/Gfx.cc
2009-12-12T08:25:19Z
2009-12-12T08:25:19Z
Carlos Garcia Campos-5
poppler/Gfx.cc | 1 +
<br> 1 file changed, 1 insertion(+)
<br><br>New commits:
<br>commit ec36133e2d3693a05836aadb96a722262d48fd39
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26758908&i=0" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Sat Dec 12 17:22:08 2009 +0100
<br><br> Initialize profileCommands in Gfx constructor
<br><br>diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
<br>index 2a4c9b8..60eb78a 100644
<br>--- a/poppler/Gfx.cc
<br>+++ b/poppler/Gfx.cc
<br>@@ -565,6 +565,7 @@ Gfx::Gfx(XRef *xrefA, OutputDev *outA, Dict *resDict, Catalog *catalogA,
<br> catalog = catalogA;
<br> subPage = gTrue;
<br> printCommands = globalParams->getPrintCommands();
<br>+ profileCommands = globalParams->getProfileCommands();
<br> textHaveCSPattern = gFalse;
<br> drawText = gFalse;
<br> maskHaveCSPattern = gFalse;
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26758908&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26755183
Re: Testing Re: Multicolumn select
2009-12-11T21:44:47Z
2009-12-11T21:44:47Z
Albert Astals Cid-2
A Dimecres 09 Desembre 2009 23:22:09, Baz va escriure:
<div class='shrinkable-quote'><br>> 2009/12/9 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26755183&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<br>> > A Dimecres 09 Desembre 2009 14:51:59, Baz va escriure:
<br>> >> 2009/12/8 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26755183&i=1" target="_top" rel="nofollow">aacid@...</a>>:
<br>> >> > What we want is something that makes text extraction/selection better,
<br>> >> > the definition of better is the problem here :D
<br>> >>
<br>> >> Ok. So it sounds like it would be worth adding tests in, so we can be
<br>> >> explicit about what we want text extraction to do.
<br>> >>
<br>> >> I could do this in two ways:
<br>> >> - write a test harness that calls the apis directly (following the
<br>> >> example of cairo). This has the advantage that more apis could be
<br>> >> tested later, but complicates writing the tests; and in any case most
<br>> >> other tests will be about rendering not text extraction. Since this
<br>> >> would be a unit test, its also fragile to API changes.
<br>> >> - extend pdftotext to allow me to specify start and end points for
<br>> >> text extraction (page,x,y). This would make writing tests easy - just
<br>> >> simple shell scripts along the lines of the git test suite. This
<br>> >> feature could be useful to end users too, I guess.
<br>> >>
<br>> >> I like the second plan better, since it supports building ad-hoc tests
<br>> >> with pdfs attached to bugs. Since we already have -f and -l, (and -x,
<br>> >> -y do something unrelated to the selection) I'm thinking of int args
<br>> >> -fx, -fy, -lx, -ly, which default to (0,0) (pageWidth, pageHeight).
<br>> >
<br>> > Why isn't x,y,W,H enough? AFAIR they define which area gets extracted.
<br>>
<br>> Its not the same area. That mechanism crops every page from start to
<br>> finish to the same x,y,W,H box before dumping the text. Its useful for
<br>> removing header/footer sections in a whole-document dump. It also
<br>> doesn't hit the text selection code at all.
</div><br>I'm lost now, you originally said pdftotext was using your new code and now
<br>you say it doesn't?
<br><br>Albert
<br><div class='shrinkable-quote'><br>>
<br>> By contrast, a reading-order selection, even on a single page, may
<br>> include text that lies outside the rectangle from the startpoint to
<br>> the endpoint. Also, the xyWH mechanism applies the start/end points to
<br>> every page, instead of only the start/end page as you would with a
<br>> selection.
<br>>
<br>> -Baz
<br>>
<br>> > Albert
<br>> >
<br>> >> Does this sound useful to you?
<br>> >>
<br>> >> -Baz
<br>> >> _______________________________________________
<br>> >> poppler mailing list
<br>> >> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26755183&i=2" target="_top" rel="nofollow">poppler@...</a>
<br>> >> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>> >
<br>> > _______________________________________________
<br>> > poppler mailing list
<br>> > <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26755183&i=3" target="_top" rel="nofollow">poppler@...</a>
<br>> > <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>
<br>> _______________________________________________
<br>> poppler mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26755183&i=4" target="_top" rel="nofollow">poppler@...</a>
<br>> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>
</div>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26755183&i=5" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26740661
Re: Poppler Fix #bug Number 25578
2009-12-11T00:48:58Z
2009-12-11T00:48:58Z
Albert Astals Cid-2
A Divendres 11 Desembre 2009 07:07:49, amit aggarwal va escriure:
<div class='shrinkable-quote'><br>> One more changes in poppler../goo/FixedPoint.cc
<br>>
<br>> -- int FixedPoint::div(int x, int y) {
<br>> -- #if 1 //~tmp
<br>> -- return ((FixPtInt64)x << fixptShift) / y;
<br>>
<br>> ++ int FixedPoint::div(int x, int y) {
<br>> ++ #if 1 //~tmp
<br>> ++ if(y>0)
<br>> ++ return ((FixPtInt64)x << fixptShift) / y;
<br>> ++ else
<br>> ++ return 0;
</div><br>Hi Amit, thanks for the patch, but please do not post patches both here and on
<br>the bug because otherwise we lose track of which patches are the
<br>newest/correct ones. I also have posted some more comments about the issue on
<br>the bugzilla issue.
<br><br>Albert
<br><div class='shrinkable-quote'><br>>
<br>>
<br>> Thanks
<br>> Amit
<br>>
<br>> On Fri, Dec 11, 2009 at 12:27 PM, amit aggarwal <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26740661&i=0" target="_top" rel="nofollow">amitcs06@...</a>> wrote:
<br>> > poppler/goo/FixedPoint.cc
<br>> >
<br>> > Old Code
<br>> > ---int FixedPoint::mul(int x, int y) {
<br>> > #if 1 //~tmp
<br>> > return ((FixPtInt64)x * y) >> fixptShift;
<br>> >
<br>> > New Changes
<br>> > +++
<br>> > FixPtInt64 FixedPoint::mul(FixPtInt64 x, FixPtInt64 y) {
<br>> > #if 1 //~tmp
<br>> > FixPtInt64 val;
<br>> > val =((FixPtInt64)(x * y))>>fixptShift;
<br>> >
<br>> > return val;
<br>> >
<br>> >
<br>> > poppler/goo/FixedPoint.h
<br>> >
<br>> > OldCode
<br>> > --static FixedPoint make(int valA) { FixedPoint x; x.val = valA; return
<br>> > x; }
<br>> >
<br>> > New changes
<br>> > ++ static FixedPoint make(FixPtInt64 valA) { FixedPoint x; x.val = valA;
<br>> > return x; }
<br>> >
<br>> > -- static int mul(int x, int y);
<br>> > ++ static FixPtInt64 mul(FixPtInt64 x, FixPtInt64 y);
<br>> >
<br>> >
<br>> > -- static int div(int x, int y);
<br>> > ++ static FixPtInt64 div(FixPtInt64 x, FixPtInt64 y);
<br>> >
<br>> > -- int val; // 16.16 fixed point
<br>> > ++ FixPtInt64 val; // 16.16 fixed point
<br>> >
<br>> > --
<br>> > Thanks
<br>> > Amit Aggarwal
<br>>
</div>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26740661&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26739562
Re: Poppler Fix #bug Number 25578
2009-12-10T23:07:49Z
2009-12-10T23:07:49Z
Amit Aggarwal-3
One more changes in poppler../goo/FixedPoint.cc<br><br>-- int FixedPoint::div(int x, int y) {<br>-- #if 1 //~tmp<br>-- return ((FixPtInt64)x << fixptShift) / y;<br><br>++ int FixedPoint::div(int x, int y) {<br>++ #if 1 //~tmp<br>
++ if(y>0)<br>++ return ((FixPtInt64)x << fixptShift) / y;<br>++ else <br>++ return 0;<br><br><br>Thanks<br>Amit<br><br><div class="gmail_quote">On Fri, Dec 11, 2009 at 12:27 PM, amit aggarwal <span dir="ltr"><<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26739562&i=0" target="_top" rel="nofollow">amitcs06@...</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="border-left: 1px solid rgb(204, 204, 204); margin: 0pt 0pt 0pt 0.8ex; padding-left: 1ex;">poppler/goo/FixedPoint.cc<br><br>Old Code<br>---int FixedPoint::mul(int x, int y) {<br>#if 1 //~tmp<br>
return ((FixPtInt64)x * y) >> fixptShift;<br><br>New Changes<br>+++<br>FixPtInt64 FixedPoint::mul(FixPtInt64 x, FixPtInt64 y) {<br>
#if 1 //~tmp<br> FixPtInt64 val;<br> val =((FixPtInt64)(x * y))>>fixptShift;<br><br> return val;<br><br><br>poppler/goo/FixedPoint.h<br><br>OldCode<br>--static FixedPoint make(int valA) { FixedPoint x; x.val = valA; return x; }<br>
<br>New changes<br>++ static FixedPoint make(FixPtInt64 valA) { FixedPoint x; x.val = valA; return x; }<br><br>-- static int mul(int x, int y);<br>++ static FixPtInt64 mul(FixPtInt64 x, FixPtInt64 y);<br><br><br>-- static int div(int x, int y);<br>
++ static FixPtInt64 div(FixPtInt64 x, FixPtInt64 y);<br><br>-- int val; // 16.16 fixed point<br>++ FixPtInt64 val; // 16.16 fixed point<br clear="all"><br>-- <br>Thanks<br><font color="#888888">Amit Aggarwal<br>
<br>
</font></blockquote></div><br><br clear="all"><br>-- <br>Thanks<br>Amit Aggarwal<br><br>
<br />_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26739562&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26739489
Poppler Fix #bug Number 25578
2009-12-10T22:57:04Z
2009-12-10T22:57:04Z
Amit Aggarwal-3
poppler/goo/FixedPoint.cc<br><br>Old Code<br>---int FixedPoint::mul(int x, int y) {<br>#if 1 //~tmp<br> return ((FixPtInt64)x * y) >> fixptShift;<br><br>New Changes<br>+++<br>FixPtInt64 FixedPoint::mul(FixPtInt64 x, FixPtInt64 y) {<br>
#if 1 //~tmp<br> FixPtInt64 val;<br> val =((FixPtInt64)(x * y))>>fixptShift;<br><br> return val;<br><br><br>poppler/goo/FixedPoint.h<br><br>OldCode<br>--static FixedPoint make(int valA) { FixedPoint x; x.val = valA; return x; }<br>
<br>New changes<br>++ static FixedPoint make(FixPtInt64 valA) { FixedPoint x; x.val = valA; return x; }<br><br>-- static int mul(int x, int y);<br>++ static FixPtInt64 mul(FixPtInt64 x, FixPtInt64 y);<br><br><br>-- static int div(int x, int y);<br>
++ static FixPtInt64 div(FixPtInt64 x, FixPtInt64 y);<br><br>-- int val; // 16.16 fixed point<br>++ FixPtInt64 val; // 16.16 fixed point<br clear="all"><br>-- <br>Thanks<br>Amit Aggarwal<br><br>
<br />poppler/goo/FixedPoint.cc
<br><br>Old Code
<br>---int FixedPoint::mul(int x, int y) {
<br>#if 1 //~tmp
<br> return ((FixPtInt64)x * y) >> fixptShift;
<br><br>New Changes
<br>+++
<br>FixPtInt64 FixedPoint::mul(FixPtInt64 x, FixPtInt64 y) {
<br>#if 1 //~tmp
<br> FixPtInt64 val;
<br> val =((FixPtInt64)(x * y))>>fixptShift;
<br><br> return val;
<br><br><br>poppler/goo/FixedPoint.h
<br><br>OldCode
<br>--static FixedPoint make(int valA) { FixedPoint x; x.val = valA; return x; }
<br><br>New changes
<br>++ static FixedPoint make(FixPtInt64 valA) { FixedPoint x; x.val = valA; return x; }
<br><br>-- static int mul(int x, int y);
<br>++ static FixPtInt64 mul(FixPtInt64 x, FixPtInt64 y);
<br><br><br>-- static int div(int x, int y);
<br>++ static FixPtInt64 div(FixPtInt64 x, FixPtInt64 y);
<br><br>-- int val; // 16.16 fixed point
<br>++ FixPtInt64 val; // 16.16 fixed point
<br><br><br><br />_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26739489&i=0" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26724395
poppler/CairoOutputDev.cc
2009-12-10T01:40:27Z
2009-12-10T01:40:27Z
Carlos Garcia Campos-5
poppler/CairoOutputDev.cc | 2 ++
<br> 1 file changed, 2 insertions(+)
<br><br>New commits:
<br>commit 4e6af25a028d16608111634c5467420e31fa399b
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26724395&i=0" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Wed Dec 9 19:45:40 2009 +0100
<br><br> [cairo] Update font of TextPage in CairoOutputDev::updateAll()
<br>
<br> Fixes a crash with some documents, see Evince bug
<br> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=603934" target="_top" rel="nofollow">https://bugzilla.gnome.org/show_bug.cgi?id=603934</a><br><br>diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
<br>index 191fa33..9a0f3be 100644
<br>--- a/poppler/CairoOutputDev.cc
<br>+++ b/poppler/CairoOutputDev.cc
<br>@@ -294,6 +294,8 @@ void CairoOutputDev::updateAll(GfxState *state) {
<br> updateStrokeOpacity(state);
<br> updateBlendMode(state);
<br> needFontUpdate = gTrue;
<br>+ if (text)
<br>+ text->updateFont(state);
<br> }
<br>
<br> void CairoOutputDev::setDefaultCTM(double *ctm) {
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26724395&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26719518
Re: Testing Re: Multicolumn select
2009-12-09T15:22:09Z
2009-12-09T15:22:09Z
Baz-4
2009/12/9 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26719518&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<div class='shrinkable-quote'><br>> A Dimecres 09 Desembre 2009 14:51:59, Baz va escriure:
<br>>> 2009/12/8 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26719518&i=1" target="_top" rel="nofollow">aacid@...</a>>:
<br>>> > What we want is something that makes text extraction/selection better,
<br>>> > the definition of better is the problem here :D
<br>>>
<br>>> Ok. So it sounds like it would be worth adding tests in, so we can be
<br>>> explicit about what we want text extraction to do.
<br>>>
<br>>> I could do this in two ways:
<br>>> - write a test harness that calls the apis directly (following the
<br>>> example of cairo). This has the advantage that more apis could be
<br>>> tested later, but complicates writing the tests; and in any case most
<br>>> other tests will be about rendering not text extraction. Since this
<br>>> would be a unit test, its also fragile to API changes.
<br>>> - extend pdftotext to allow me to specify start and end points for
<br>>> text extraction (page,x,y). This would make writing tests easy - just
<br>>> simple shell scripts along the lines of the git test suite. This
<br>>> feature could be useful to end users too, I guess.
<br>>>
<br>>> I like the second plan better, since it supports building ad-hoc tests
<br>>> with pdfs attached to bugs. Since we already have -f and -l, (and -x,
<br>>> -y do something unrelated to the selection) I'm thinking of int args
<br>>> -fx, -fy, -lx, -ly, which default to (0,0) (pageWidth, pageHeight).
<br>>
<br>> Why isn't x,y,W,H enough? AFAIR they define which area gets extracted.
</div><br>Its not the same area. That mechanism crops every page from start to
<br>finish to the same x,y,W,H box before dumping the text. Its useful for
<br>removing header/footer sections in a whole-document dump. It also
<br>doesn't hit the text selection code at all.
<br><br>By contrast, a reading-order selection, even on a single page, may
<br>include text that lies outside the rectangle from the startpoint to
<br>the endpoint. Also, the xyWH mechanism applies the start/end points to
<br>every page, instead of only the start/end page as you would with a
<br>selection.
<br><br>-Baz
<br><div class='shrinkable-quote'><br>>
<br>> Albert
<br>>
<br>>>
<br>>> Does this sound useful to you?
<br>>>
<br>>> -Baz
<br>>> _______________________________________________
<br>>> poppler mailing list
<br>>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26719518&i=2" target="_top" rel="nofollow">poppler@...</a>
<br>>> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>>
<br>> _______________________________________________
<br>> poppler mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26719518&i=3" target="_top" rel="nofollow">poppler@...</a>
<br>> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>
</div>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26719518&i=4" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26718874
Re: Testing Re: Multicolumn select
2009-12-09T14:25:57Z
2009-12-09T14:25:57Z
Albert Astals Cid-2
A Dimecres 09 Desembre 2009 14:51:59, Baz va escriure:
<div class='shrinkable-quote'><br>> 2009/12/8 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26718874&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<br>> > What we want is something that makes text extraction/selection better,
<br>> > the definition of better is the problem here :D
<br>>
<br>> Ok. So it sounds like it would be worth adding tests in, so we can be
<br>> explicit about what we want text extraction to do.
<br>>
<br>> I could do this in two ways:
<br>> - write a test harness that calls the apis directly (following the
<br>> example of cairo). This has the advantage that more apis could be
<br>> tested later, but complicates writing the tests; and in any case most
<br>> other tests will be about rendering not text extraction. Since this
<br>> would be a unit test, its also fragile to API changes.
<br>> - extend pdftotext to allow me to specify start and end points for
<br>> text extraction (page,x,y). This would make writing tests easy - just
<br>> simple shell scripts along the lines of the git test suite. This
<br>> feature could be useful to end users too, I guess.
<br>>
<br>> I like the second plan better, since it supports building ad-hoc tests
<br>> with pdfs attached to bugs. Since we already have -f and -l, (and -x,
<br>> -y do something unrelated to the selection) I'm thinking of int args
<br>> -fx, -fy, -lx, -ly, which default to (0,0) (pageWidth, pageHeight).
</div><br>Why isn't x,y,W,H enough? AFAIR they define which area gets extracted.
<br><br>Albert
<br><br>>
<br>> Does this sound useful to you?
<br>>
<br>> -Baz
<br>> _______________________________________________
<br>> poppler mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26718874&i=1" target="_top" rel="nofollow">poppler@...</a>
<br>> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26718874&i=2" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26718810
Poppler-data 0.4.0 released
2009-12-09T14:21:10Z
2009-12-09T14:21:10Z
Albert Astals Cid-2
Available from
<br><a href="http://poppler.freedesktop.org/poppler-data-0.4.0.tar.gz" target="_top" rel="nofollow">http://poppler.freedesktop.org/poppler-data-0.4.0.tar.gz</a><br><br>Changes since 0.3.1:
<br> Added a host of new files released under a free license by Adobe at
<br><a href="http://opensource.adobe.com/wiki/display/pdfmapping/Mapping+Resources+for+PDF" target="_top" rel="nofollow">http://opensource.adobe.com/wiki/display/pdfmapping/Mapping+Resources+for+PDF</a><br><br>Albert
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26718810&i=0" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26715535
poppler/CairoOutputDev.cc
2009-12-09T10:51:21Z
2009-12-09T10:51:21Z
Carlos Garcia Campos-5
poppler/CairoOutputDev.cc | 2 ++
<br> 1 file changed, 2 insertions(+)
<br><br>New commits:
<br>commit 4e6af25a028d16608111634c5467420e31fa399b
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715535&i=0" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Wed Dec 9 19:45:40 2009 +0100
<br><br> [cairo] Update font of TextPage in CairoOutputDev::updateAll()
<br>
<br> Fixes a crash with some documents, see Evince bug
<br> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=603934" target="_top" rel="nofollow">https://bugzilla.gnome.org/show_bug.cgi?id=603934</a><br><br>diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
<br>index 191fa33..9a0f3be 100644
<br>--- a/poppler/CairoOutputDev.cc
<br>+++ b/poppler/CairoOutputDev.cc
<br>@@ -294,6 +294,8 @@ void CairoOutputDev::updateAll(GfxState *state) {
<br> updateStrokeOpacity(state);
<br> updateBlendMode(state);
<br> needFontUpdate = gTrue;
<br>+ if (text)
<br>+ text->updateFont(state);
<br> }
<br>
<br> void CairoOutputDev::setDefaultCTM(double *ctm) {
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715535&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26715506
poppler/CairoOutputDev.cc
2009-12-09T10:49:47Z
2009-12-09T10:49:47Z
Carlos Garcia Campos-5
poppler/CairoOutputDev.cc | 2 ++
<br> 1 file changed, 2 insertions(+)
<br><br>New commits:
<br>commit 4e6af25a028d16608111634c5467420e31fa399b
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715506&i=0" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Wed Dec 9 19:45:40 2009 +0100
<br><br> [cairo] Update font of TextPage in CairoOutputDev::updateAll()
<br>
<br> Fixes a crash with some documents, see Evince bug
<br> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=603934" target="_top" rel="nofollow">https://bugzilla.gnome.org/show_bug.cgi?id=603934</a><br><br>diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
<br>index 191fa33..9a0f3be 100644
<br>--- a/poppler/CairoOutputDev.cc
<br>+++ b/poppler/CairoOutputDev.cc
<br>@@ -294,6 +294,8 @@ void CairoOutputDev::updateAll(GfxState *state) {
<br> updateStrokeOpacity(state);
<br> updateBlendMode(state);
<br> needFontUpdate = gTrue;
<br>+ if (text)
<br>+ text->updateFont(state);
<br> }
<br>
<br> void CairoOutputDev::setDefaultCTM(double *ctm) {
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715506&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26715502
Branch 'poppler-0.12' - poppler/CairoOutputDev.cc
2009-12-09T10:49:32Z
2009-12-09T10:49:32Z
Carlos Garcia Campos-5
poppler/CairoOutputDev.cc | 2 ++
<br> 1 file changed, 2 insertions(+)
<br><br>New commits:
<br>commit 36abc88231e3d62b12a98afcb0a3c4ed5f07a1e6
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715502&i=0" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Wed Dec 9 19:45:40 2009 +0100
<br><br> [cairo] Update font of TextPage in CairoOutputDev::updateAll()
<br>
<br> Fixes a crash with some documents, see Evince bug
<br> <a href="https://bugzilla.gnome.org/show_bug.cgi?id=603934" target="_top" rel="nofollow">https://bugzilla.gnome.org/show_bug.cgi?id=603934</a><br><br>diff --git a/poppler/CairoOutputDev.cc b/poppler/CairoOutputDev.cc
<br>index 25d4167..a00db24 100644
<br>--- a/poppler/CairoOutputDev.cc
<br>+++ b/poppler/CairoOutputDev.cc
<br>@@ -292,6 +292,8 @@ void CairoOutputDev::updateAll(GfxState *state) {
<br> updateStrokeOpacity(state);
<br> updateBlendMode(state);
<br> needFontUpdate = gTrue;
<br>+ if (text)
<br>+ text->updateFont(state);
<br> }
<br>
<br> void CairoOutputDev::setDefaultCTM(double *ctm) {
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26715502&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26711477
Testing Re: Multicolumn select
2009-12-09T06:51:59Z
2009-12-09T06:51:59Z
Baz-4
2009/12/8 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26711477&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<br>> What we want is something that makes text extraction/selection better, the
<br>> definition of better is the problem here :D
<br><br>Ok. So it sounds like it would be worth adding tests in, so we can be
<br>explicit about what we want text extraction to do.
<br><br>I could do this in two ways:
<br>- write a test harness that calls the apis directly (following the
<br>example of cairo). This has the advantage that more apis could be
<br>tested later, but complicates writing the tests; and in any case most
<br>other tests will be about rendering not text extraction. Since this
<br>would be a unit test, its also fragile to API changes.
<br>- extend pdftotext to allow me to specify start and end points for
<br>text extraction (page,x,y). This would make writing tests easy - just
<br>simple shell scripts along the lines of the git test suite. This
<br>feature could be useful to end users too, I guess.
<br><br>I like the second plan better, since it supports building ad-hoc tests
<br>with pdfs attached to bugs. Since we already have -f and -l, (and -x,
<br>-y do something unrelated to the selection) I'm thinking of int args
<br>-fx, -fy, -lx, -ly, which default to (0,0) (pageWidth, pageHeight).
<br><br>Does this sound useful to you?
<br><br>-Baz
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26711477&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26702833
Re: Multicolumn select
2009-12-08T15:38:09Z
2009-12-08T15:38:09Z
Albert Astals Cid-2
A Dimarts 08 Desembre 2009 02:11:50, Baz va escriure:
<div class='shrinkable-quote'><br>> 2009/12/7 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26702833&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<br>> > Sorry for the late reply i've moved job and country meanwhile :D
<br>> >
<br>> > A Dilluns 23 Novembre 2009 09:37:42, Baz va escriure:
<br>> >> 2009/11/18 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26702833&i=1" target="_top" rel="nofollow">aacid@...</a>>:
<br>> >> > A Dilluns, 16 de novembre de 2009, Baz va escriure:
<br>> >> >> I've checked now... yes pdftotext with no flags will hit the new
<br>> >> >> reading order code.
<br>> >> >
<br>> >> > And that is good or bad? :D
<br>> >>
<br>> >> It turns out, good.
<br>> >>
<br>> >> These are the results of comparing the sizes of diffs to acrobat
<br>> >> output for poppler before and after the patch. The diff is just done
<br>> >> on word order, to try to pick up paragraphs that have been misplaced.
<br>> >> The filenames refer to the bugzillas where I found these: freedesktop,
<br>> >> gnome, ubuntu launchpad, and kde.
<br>> >>
<br>> >> (status, filename, unpatched, patched, difference)
<br>> >> SAME fdo-18531-1.pdf 1215 1218 0%
<br>> >> SAME gno-333967-1.pdf 971 971 0%
<br>> >> PASS gno-360722-1.pdf 553 431 22%
<br>> >> PASS gno-481825-1.pdf 2413 1582 34%
<br>> >> PASS gno-494078-1.pdf 7494 5462 27%
<br>> >> PASS gno-500352-1.pdf 11904 11204 5%
<br>> >> FAIL gno-588476-1.pdf 1192 1277 -7%
<br>> >> FAIL hig-2.0.pdf 3908 5057 -29%
<br>> >> SAME kde-184399-1.pdf 159 159 0%
<br>> >> SAME ubu-181737-1.pdf 18709 18724 0%
<br>> >> FAIL ubu-251412-1.pdf 528 551 -4%
<br>> >> PASS ubu-33288-2.pdf 2535 154 93%
<br>> >> SAME ubu-346403-1.pdf 437 439 0%
<br>> >> PASS ubu-367770-1.pdf 2955 2408 18%
<br>> >
<br>> > Not sure i understand the numbers, do you mean that there are 6 documents
<br>> > that improve, 5 that are the same and 3 that are worse?
<br>>
<br>> Yes. Although the size of the differences is also interesting: the
<br>> ones that are better are significantly better. The only document
<br>> that's significantly worse is the hig document, but looking at that in
<br>> detail, this document is a dogs breakfast layout-wise, and goes wrong
<br>> when selecting bullet-pointed sections. If I was using that as a copy
<br>> & paste, it wouldn't bother me much as I could just delete the
<br>> out-of-order bullet points. The numbering in the footnotes would be
<br>> more of a problem as they would sound bad in a screenreader.
<br>>
<br>> >> The 3 failures were largely due to numbered footnotes or tables; the
<br>> >> body text was fine. So mostly the patched version is an improvement to
<br>> >> reading order detection. If I can get the bullet points and numbers to
<br>> >> be part of the correct block, those failures would go away.
<br>> >
<br>> > Do you think you'll be able to get that done?
<br>>
<br>> Not in the short term. What time I've had to look at this I've been
<br>> scratching my head over how to fit bidi selection into the code
<br>> without breaking it too much. I was trying to get this:
<br>> <a href="http://www.w3.org/TR/charmod/#sec-LogicalOrder" target="_top" rel="nofollow">http://www.w3.org/TR/charmod/#sec-LogicalOrder</a><br>> I was hoping was that I could implement bidi selection, then move on
<br>> to improving reading order further. However, bidi depends not just on
<br>> the start and end position of the selection, and primaryLR, but also
<br>> the writing direction in the words where the selection endpoints lie,
<br>> /and/ requires words to be in reading order, which needs a bit of a
<br>> rewrite. Which got me looking at the larger rewrite that would be
<br>> needed to accomodate tagged pdf structures. None of that looks doable
<br>> without changing some method signatures, which I've been avoiding up
<br>> till now; I've got no idea what depends on TextOutputDev.h.
</div><br>Here's the guideline, do not hesitate to change things, but don't change just
<br>for the fun of changing :D
<br><div class='shrinkable-quote'><br>>
<br>> >> The test script, in case you want to try this on your corpus; I was
<br>> >> running this in a directory of pdfs with a subdirectory 'acrobat' for
<br>> >> my ground truth. I ignored non-ascii characters because the acrobat
<br>> >> output was in win-1252.
<br>> >
<br>> > That mans having to run acrobat by hand right? That means running that
<br>> > script on my pdf files is unmanageable, on the other hand i can run a
<br>> > script that compares old and new pdftotext output, if it's different i
<br>> > manually check if i think that's an improvement or not, hoping that there
<br>> > are not MANY files that are different :D
<br>>
<br>> Now you see why I was hoping you had a test suite somewhere :)
<br>>
<br>> I was thinking more along the lines of dumping text from a sample of
<br>> documents. Also, you will almost certainly find that /most/ files are
<br>> different; its the size of the difference that matters. The ones that
<br>> seem to have greatly improved or worsened are the ones I'd look at
<br>> manually.
<br>>
<br>> > So do you want me to try that or you are working on a improved patch?
<br>>
<br>> At the end of the day its up to you how you decide if this series is
<br>> acceptable; for pdfs that aren't tagged there is no 'correct' reading
<br>> order, only a best guess. I can point out the places where the current
<br>> algorithm fails, but whether these errors are serious or not is a
<br>> matter of opinion; any automated testing would have to work something
<br>> like the perceptual-diff tests in cairo. I have no idea what your
<br>> acceptance criteria are, so I can't say whether running a bunch of
<br>> comparisons with acrobat would be useful to you. How did you decide
<br>> that the /current/ text extraction code was ok?
</div><br>It's the one that came with xpdf, so we (the poppler project) haven't touched
<br>that code at all i think (maybe we did some code about actual text but not
<br>much)
<br><br>>
<br>> As for an improved patch...well like I said I was looking at other
<br>> issues. The only completed fix I have that isn't uploaded was that in
<br>> RTL docs, selections across page boundaries were wrong (evince passes
<br>> the tl/br corners to signal start/end of page). Everything else is
<br>> looking like bigger chunks of code, I don't want to do too much with
<br>> until I've an idea whether these patches are getting closer to what
<br>> you want.
<br><br>What we want is something that makes text extraction/selection better, the
<br>definition of better is the problem here :D
<br><br>> I'll take a look at the doc you mentioned in the other mail.
<br><br>Thanks :-)
<br><br>Albert
<br><div class='shrinkable-quote'><br>>
<br>> -Baz
<br>>
<br>> > Albert
<br>> >
<br>> >> PDF=$1
<br>> >> TXT=${PDF%%.pdf}.txt
<br>> >> cp acrobat/$TXT first
<br>> >> pdftotext $PDF second
<br>> >> ~/poppler/utils/pdftotext $PDF third
<br>> >> perl -i.bak -ne 'for(/([A-Za-z0-9.,;:]+)/g){print "$_\n";}' first second
<br>> >> third DIFF12=$(diff -udwb first second | wc -l)
<br>> >> DIFF13=$(diff -udwb first third | wc -l)
<br>> >> DIFF23=$(diff -udwb second third | wc -l)
<br>> >> DIFF=$(expr \( 100 \* \( $DIFF12 - $DIFF13 \) \) / $DIFF12 )
<br>> >> STATUS=SAME
<br>> >> if [ $DIFF -gt 1 ]
<br>> >> then
<br>> >> STATUS=PASS
<br>> >> fi
<br>> >> if [ $DIFF -lt -1 ]
<br>> >> then
<br>> >> STATUS=FAIL
<br>> >> fi
<br>> >>
<br>> >> echo $STATUS $PDF $DIFF12 $DIFF13 ${DIFF}%
<br>>
<br>> _______________________________________________
<br>> poppler mailing list
<br>> <a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26702833&i=2" target="_top" rel="nofollow">poppler@...</a>
<br>> <a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>>
</div>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26702833&i=3" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26687990
Re: Multicolumn select
2009-12-07T19:00:57Z
2009-12-07T19:00:57Z
Baz-4
2009/12/7 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26687990&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<div class='shrinkable-quote'><br>> A Dilluns 23 Novembre 2009 09:37:42, vàreu escriure:
<br>>> 2009/11/18 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26687990&i=1" target="_top" rel="nofollow">aacid@...</a>>:
<br>>> > A Dilluns, 16 de novembre de 2009, Baz va escriure:
<br>>> >> I've checked now... yes pdftotext with no flags will hit the new
<br>>> >> reading order code.
<br>>> >
<br>>> > And that is good or bad? :D
<br>>>
<br>>> It turns out, good.
<br>>>
<br>>> These are the results of comparing the sizes of diffs to acrobat
<br>>> output for poppler before and after the patch. The diff is just done
<br>>> on word order, to try to pick up paragraphs that have been misplaced.
<br>>> The filenames refer to the bugzillas where I found these: freedesktop,
<br>>> gnome, ubuntu launchpad, and kde.
<br>>
<br>> BTW can you have a look at <a href="http://bugs.freedesktop.org/show_bug.cgi?id=25482" target="_top" rel="nofollow">http://bugs.freedesktop.org/show_bug.cgi?id=25482</a> ?
<br>>
<br>> Thanks,
<br>> Albert
<br>>
</div><br>Its pushing letters semi-randomly into two separate line objects. A
<br>plausible explanation would be if the algorithm scans from the right
<br>edge of one glyph to the left of the next when adding glyphs to words
<br>(or words to lines). That would skip overlapped glyphs/words,
<br>producing everything I'm seeing here, and the code does do something
<br>like that.
<br><br>Assuming thats right, theres an obvious fix (always scan left edge to
<br>left edge), and its not related to the other selection bugs. I'll
<br>comment on bugzilla once I've tracked this down in the coalesce()
<br>code.
<br><br>-Baz
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26687990&i=2" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26687653
Re: Multicolumn select
2009-12-07T18:11:50Z
2009-12-07T18:11:50Z
Baz-4
2009/12/7 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26687653&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<div class='shrinkable-quote'><br>> Sorry for the late reply i've moved job and country meanwhile :D
<br>>
<br>> A Dilluns 23 Novembre 2009 09:37:42, Baz va escriure:
<br>>> 2009/11/18 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26687653&i=1" target="_top" rel="nofollow">aacid@...</a>>:
<br>>> > A Dilluns, 16 de novembre de 2009, Baz va escriure:
<br>>> >> I've checked now... yes pdftotext with no flags will hit the new
<br>>> >> reading order code.
<br>>> >
<br>>> > And that is good or bad? :D
<br>>>
<br>>> It turns out, good.
<br>>>
<br>>> These are the results of comparing the sizes of diffs to acrobat
<br>>> output for poppler before and after the patch. The diff is just done
<br>>> on word order, to try to pick up paragraphs that have been misplaced.
<br>>> The filenames refer to the bugzillas where I found these: freedesktop,
<br>>> gnome, ubuntu launchpad, and kde.
<br>>>
<br>>> (status, filename, unpatched, patched, difference)
<br>>> SAME fdo-18531-1.pdf 1215 1218 0%
<br>>> SAME gno-333967-1.pdf 971 971 0%
<br>>> PASS gno-360722-1.pdf 553 431 22%
<br>>> PASS gno-481825-1.pdf 2413 1582 34%
<br>>> PASS gno-494078-1.pdf 7494 5462 27%
<br>>> PASS gno-500352-1.pdf 11904 11204 5%
<br>>> FAIL gno-588476-1.pdf 1192 1277 -7%
<br>>> FAIL hig-2.0.pdf 3908 5057 -29%
<br>>> SAME kde-184399-1.pdf 159 159 0%
<br>>> SAME ubu-181737-1.pdf 18709 18724 0%
<br>>> FAIL ubu-251412-1.pdf 528 551 -4%
<br>>> PASS ubu-33288-2.pdf 2535 154 93%
<br>>> SAME ubu-346403-1.pdf 437 439 0%
<br>>> PASS ubu-367770-1.pdf 2955 2408 18%
<br>>
<br>> Not sure i understand the numbers, do you mean that there are 6 documents that
<br>> improve, 5 that are the same and 3 that are worse?
</div><br>Yes. Although the size of the differences is also interesting: the
<br>ones that are better are significantly better. The only document
<br>that's significantly worse is the hig document, but looking at that in
<br>detail, this document is a dogs breakfast layout-wise, and goes wrong
<br>when selecting bullet-pointed sections. If I was using that as a copy
<br>& paste, it wouldn't bother me much as I could just delete the
<br>out-of-order bullet points. The numbering in the footnotes would be
<br>more of a problem as they would sound bad in a screenreader.
<br><br>>>
<br>>> The 3 failures were largely due to numbered footnotes or tables; the
<br>>> body text was fine. So mostly the patched version is an improvement to
<br>>> reading order detection. If I can get the bullet points and numbers to
<br>>> be part of the correct block, those failures would go away.
<br>>
<br>> Do you think you'll be able to get that done?
<br><br>Not in the short term. What time I've had to look at this I've been
<br>scratching my head over how to fit bidi selection into the code
<br>without breaking it too much. I was trying to get this:
<br><a href="http://www.w3.org/TR/charmod/#sec-LogicalOrder" target="_top" rel="nofollow">http://www.w3.org/TR/charmod/#sec-LogicalOrder</a><br>I was hoping was that I could implement bidi selection, then move on
<br>to improving reading order further. However, bidi depends not just on
<br>the start and end position of the selection, and primaryLR, but also
<br>the writing direction in the words where the selection endpoints lie,
<br>/and/ requires words to be in reading order, which needs a bit of a
<br>rewrite. Which got me looking at the larger rewrite that would be
<br>needed to accomodate tagged pdf structures. None of that looks doable
<br>without changing some method signatures, which I've been avoiding up
<br>till now; I've got no idea what depends on TextOutputDev.h.
<br><div class='shrinkable-quote'><br>>
<br>>>
<br>>> The test script, in case you want to try this on your corpus; I was
<br>>> running this in a directory of pdfs with a subdirectory 'acrobat' for
<br>>> my ground truth. I ignored non-ascii characters because the acrobat
<br>>> output was in win-1252.
<br>>
<br>> That mans having to run acrobat by hand right? That means running that script
<br>> on my pdf files is unmanageable, on the other hand i can run a script that
<br>> compares old and new pdftotext output, if it's different i manually check if i
<br>> think that's an improvement or not, hoping that there are not MANY files that
<br>> are different :D
</div><br>Now you see why I was hoping you had a test suite somewhere :)
<br><br>I was thinking more along the lines of dumping text from a sample of
<br>documents. Also, you will almost certainly find that /most/ files are
<br>different; its the size of the difference that matters. The ones that
<br>seem to have greatly improved or worsened are the ones I'd look at
<br>manually.
<br><br>> So do you want me to try that or you are working on a improved patch?
<br><br>At the end of the day its up to you how you decide if this series is
<br>acceptable; for pdfs that aren't tagged there is no 'correct' reading
<br>order, only a best guess. I can point out the places where the current
<br>algorithm fails, but whether these errors are serious or not is a
<br>matter of opinion; any automated testing would have to work something
<br>like the perceptual-diff tests in cairo. I have no idea what your
<br>acceptance criteria are, so I can't say whether running a bunch of
<br>comparisons with acrobat would be useful to you. How did you decide
<br>that the /current/ text extraction code was ok?
<br><br>As for an improved patch...well like I said I was looking at other
<br>issues. The only completed fix I have that isn't uploaded was that in
<br>RTL docs, selections across page boundaries were wrong (evince passes
<br>the tl/br corners to signal start/end of page). Everything else is
<br>looking like bigger chunks of code, I don't want to do too much with
<br>until I've an idea whether these patches are getting closer to what
<br>you want.
<br><br>I'll take a look at the doc you mentioned in the other mail.
<br><br>-Baz
<br><div class='shrinkable-quote'><br>>
<br>> Albert
<br>>
<br>>>
<br>>> PDF=$1
<br>>> TXT=${PDF%%.pdf}.txt
<br>>> cp acrobat/$TXT first
<br>>> pdftotext $PDF second
<br>>> ~/poppler/utils/pdftotext $PDF third
<br>>> perl -i.bak -ne 'for(/([A-Za-z0-9.,;:]+)/g){print "$_\n";}' first second
<br>>> third DIFF12=$(diff -udwb first second | wc -l)
<br>>> DIFF13=$(diff -udwb first third | wc -l)
<br>>> DIFF23=$(diff -udwb second third | wc -l)
<br>>> DIFF=$(expr \( 100 \* \( $DIFF12 - $DIFF13 \) \) / $DIFF12 )
<br>>> STATUS=SAME
<br>>> if [ $DIFF -gt 1 ]
<br>>> then
<br>>> STATUS=PASS
<br>>> fi
<br>>> if [ $DIFF -lt -1 ]
<br>>> then
<br>>> STATUS=FAIL
<br>>> fi
<br>>>
<br>>> echo $STATUS $PDF $DIFF12 $DIFF13 ${DIFF}%
<br>>>
<br>>
</div>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26687653&i=2" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26686246
Re: Multicolumn select
2009-12-07T15:32:39Z
2009-12-07T15:32:39Z
Albert Astals Cid-2
A Dilluns 23 Novembre 2009 09:37:42, vàreu escriure:
<div class='shrinkable-quote'><br>> 2009/11/18 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26686246&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<br>> > A Dilluns, 16 de novembre de 2009, Baz va escriure:
<br>> >> I've checked now... yes pdftotext with no flags will hit the new
<br>> >> reading order code.
<br>> >
<br>> > And that is good or bad? :D
<br>>
<br>> It turns out, good.
<br>>
<br>> These are the results of comparing the sizes of diffs to acrobat
<br>> output for poppler before and after the patch. The diff is just done
<br>> on word order, to try to pick up paragraphs that have been misplaced.
<br>> The filenames refer to the bugzillas where I found these: freedesktop,
<br>> gnome, ubuntu launchpad, and kde.
</div><br>BTW can you have a look at <a href="http://bugs.freedesktop.org/show_bug.cgi?id=25482" target="_top" rel="nofollow">http://bugs.freedesktop.org/show_bug.cgi?id=25482</a> ?
<br><br>Thanks,
<br> Albert
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26686246&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26686163
Re: Multicolumn select
2009-12-07T15:25:23Z
2009-12-07T15:25:23Z
Albert Astals Cid-2
Sorry for the late reply i've moved job and country meanwhile :D
<br><br>A Dilluns 23 Novembre 2009 09:37:42, Baz va escriure:
<div class='shrinkable-quote'><br>> 2009/11/18 Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26686163&i=0" target="_top" rel="nofollow">aacid@...</a>>:
<br>> > A Dilluns, 16 de novembre de 2009, Baz va escriure:
<br>> >> I've checked now... yes pdftotext with no flags will hit the new
<br>> >> reading order code.
<br>> >
<br>> > And that is good or bad? :D
<br>>
<br>> It turns out, good.
<br>>
<br>> These are the results of comparing the sizes of diffs to acrobat
<br>> output for poppler before and after the patch. The diff is just done
<br>> on word order, to try to pick up paragraphs that have been misplaced.
<br>> The filenames refer to the bugzillas where I found these: freedesktop,
<br>> gnome, ubuntu launchpad, and kde.
<br>>
<br>> (status, filename, unpatched, patched, difference)
<br>> SAME fdo-18531-1.pdf 1215 1218 0%
<br>> SAME gno-333967-1.pdf 971 971 0%
<br>> PASS gno-360722-1.pdf 553 431 22%
<br>> PASS gno-481825-1.pdf 2413 1582 34%
<br>> PASS gno-494078-1.pdf 7494 5462 27%
<br>> PASS gno-500352-1.pdf 11904 11204 5%
<br>> FAIL gno-588476-1.pdf 1192 1277 -7%
<br>> FAIL hig-2.0.pdf 3908 5057 -29%
<br>> SAME kde-184399-1.pdf 159 159 0%
<br>> SAME ubu-181737-1.pdf 18709 18724 0%
<br>> FAIL ubu-251412-1.pdf 528 551 -4%
<br>> PASS ubu-33288-2.pdf 2535 154 93%
<br>> SAME ubu-346403-1.pdf 437 439 0%
<br>> PASS ubu-367770-1.pdf 2955 2408 18%
</div><br>Not sure i understand the numbers, do you mean that there are 6 documents that
<br>improve, 5 that are the same and 3 that are worse?
<br><br>>
<br>> The 3 failures were largely due to numbered footnotes or tables; the
<br>> body text was fine. So mostly the patched version is an improvement to
<br>> reading order detection. If I can get the bullet points and numbers to
<br>> be part of the correct block, those failures would go away.
<br><br>Do you think you'll be able to get that done?
<br><br>>
<br>> The test script, in case you want to try this on your corpus; I was
<br>> running this in a directory of pdfs with a subdirectory 'acrobat' for
<br>> my ground truth. I ignored non-ascii characters because the acrobat
<br>> output was in win-1252.
<br><br>That mans having to run acrobat by hand right? That means running that script
<br>on my pdf files is unmanageable, on the other hand i can run a script that
<br>compares old and new pdftotext output, if it's different i manually check if i
<br>think that's an improvement or not, hoping that there are not MANY files that
<br>are different :D
<br><br>So do you want me to try that or you are working on a improved patch?
<br><br>Albert
<br><div class='shrinkable-quote'><br>>
<br>> PDF=$1
<br>> TXT=${PDF%%.pdf}.txt
<br>> cp acrobat/$TXT first
<br>> pdftotext $PDF second
<br>> ~/poppler/utils/pdftotext $PDF third
<br>> perl -i.bak -ne 'for(/([A-Za-z0-9.,;:]+)/g){print "$_\n";}' first second
<br>> third DIFF12=$(diff -udwb first second | wc -l)
<br>> DIFF13=$(diff -udwb first third | wc -l)
<br>> DIFF23=$(diff -udwb second third | wc -l)
<br>> DIFF=$(expr \( 100 \* \( $DIFF12 - $DIFF13 \) \) / $DIFF12 )
<br>> STATUS=SAME
<br>> if [ $DIFF -gt 1 ]
<br>> then
<br>> STATUS=PASS
<br>> fi
<br>> if [ $DIFF -lt -1 ]
<br>> then
<br>> STATUS=FAIL
<br>> fi
<br>>
<br>> echo $STATUS $PDF $DIFF12 $DIFF13 ${DIFF}%
<br>>
</div>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26686163&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26665647
glib/poppler-annot.cc poppler/Annot.cc poppler/Annot.h poppler/Gfx.cc qt4/src
2009-12-06T06:47:49Z
2009-12-06T06:47:49Z
Carlos Garcia Campos-5
glib/poppler-annot.cc | 2 +-
<br> poppler/Annot.cc | 24 +++++-------------------
<br> poppler/Annot.h | 5 ++---
<br> poppler/Gfx.cc | 2 +-
<br> qt4/src/poppler-annotation.cc | 2 +-
<br> 5 files changed, 10 insertions(+), 25 deletions(-)
<br><br>New commits:
<br>commit 6798d3e52e36e91bceff3a1a96372e9d9c6f3813
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26665647&i=0" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Sun Dec 6 15:34:36 2009 +0100
<br><br> Use fixed size array in AnnotColor
<br><br>diff --git a/glib/poppler-annot.cc b/glib/poppler-annot.cc
<br>index e019eca..50496e7 100644
<br>--- a/glib/poppler-annot.cc
<br>+++ b/glib/poppler-annot.cc
<br>@@ -391,7 +391,7 @@ poppler_annot_get_color (PopplerAnnot *poppler_annot)
<br> color = poppler_annot->annot->getColor ();
<br>
<br> if (color) {
<br>- double *values = color->getValues ();
<br>+ const double *values = color->getValues ();
<br>
<br> switch (color->getSpace ())
<br> {
<br>diff --git a/poppler/Annot.cc b/poppler/Annot.cc
<br>index fb65ea6..dd360ec 100644
<br>--- a/poppler/Annot.cc
<br>+++ b/poppler/Annot.cc
<br>@@ -607,19 +607,16 @@ AnnotBorderBS::AnnotBorderBS(Dict *dict) {
<br>
<br> AnnotColor::AnnotColor() {
<br> length = 0;
<br>- values = NULL;
<br> }
<br>
<br> AnnotColor::AnnotColor(double gray) {
<br> length = 1;
<br>- values = (double *) gmallocn (length, sizeof(double));
<br>
<br> values[0] = gray;
<br> }
<br>
<br> AnnotColor::AnnotColor(double r, double g, double b) {
<br> length = 3;
<br>- values = (double *) gmallocn (length, sizeof(double));
<br>
<br> values[0] = r;
<br> values[1] = g;
<br>@@ -628,7 +625,6 @@ AnnotColor::AnnotColor(double r, double g, double b) {
<br>
<br> AnnotColor::AnnotColor(double c, double m, double y, double k) {
<br> length = 4;
<br>- values = (double *) gmallocn (length, sizeof(double));
<br>
<br> values[0] = c;
<br> values[1] = m;
<br>@@ -637,12 +633,11 @@ AnnotColor::AnnotColor(double c, double m, double y, double k) {
<br> }
<br>
<br> AnnotColor::AnnotColor(Array *array) {
<br>- // TODO: check what Acrobat does in the case of having more than 5 numbers.
<br>- if (array->getLength() < 5) {
<br>- length = array->getLength();
<br>- values = (double *) gmallocn (length, sizeof(double));
<br>+ length = array->getLength();
<br>+ if (length > 4)
<br>+ length = 4;
<br>
<br>- for(int i = 0; i < length; i++) {
<br>+ for (int i = 0; i < length; i++) {
<br> Object obj1;
<br>
<br> if (array->get(i, &obj1)->isNum()) {
<br>@@ -654,18 +649,9 @@ AnnotColor::AnnotColor(Array *array) {
<br> values[i] = 0;
<br> }
<br> obj1.free();
<br>- }
<br>- } else {
<br>- values = NULL;
<br>- length = 0;
<br> }
<br> }
<br>
<br>-AnnotColor::~AnnotColor() {
<br>- if (values)
<br>- gfree (values);
<br>-}
<br>-
<br> //------------------------------------------------------------------------
<br> // AnnotBorderStyle
<br> //------------------------------------------------------------------------
<br>@@ -1076,7 +1062,7 @@ void Annot::setColor(AnnotColor *new_color) {
<br>
<br> if (new_color) {
<br> Object obj1, obj2;
<br>- double *values = new_color->getValues();
<br>+ const double *values = new_color->getValues();
<br>
<br> obj1.initArray(xref);
<br> for (int i = 0; i < (int)new_color->getSpace(); i++)
<br>diff --git a/poppler/Annot.h b/poppler/Annot.h
<br>index cb0bc96..3f3ed70 100644
<br>--- a/poppler/Annot.h
<br>+++ b/poppler/Annot.h
<br>@@ -291,14 +291,13 @@ public:
<br> AnnotColor(double r, double g, double b);
<br> AnnotColor(double c, double m, double y, double k);
<br> AnnotColor(Array *array);
<br>- ~AnnotColor();
<br>
<br> AnnotColorSpace getSpace() const { return (AnnotColorSpace) length; }
<br>- double *getValues() const { return values; }
<br>+ const double *getValues() const { return values; }
<br>
<br> private:
<br>
<br>- double *values;
<br>+ double values[4];
<br> int length;
<br> };
<br>
<br>diff --git a/poppler/Gfx.cc b/poppler/Gfx.cc
<br>index 2a4c9b8..401b52e 100644
<br>--- a/poppler/Gfx.cc
<br>+++ b/poppler/Gfx.cc
<br>@@ -4675,7 +4675,7 @@ void Gfx::drawAnnot(Object *str, AnnotBorder *border, AnnotColor *aColor,
<br> out->updateStrokeColorSpace(state);
<br> }
<br> if (aColor && (aColor->getSpace() == AnnotColor::colorRGB)) {
<br>- double *values = aColor->getValues();
<br>+ const double *values = aColor->getValues();
<br> r = values[0];
<br> g = values[1];
<br> b = values[2];
<br>diff --git a/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc
<br>index 22f1e6a..98573c0 100644
<br>--- a/qt4/src/poppler-annotation.cc
<br>+++ b/qt4/src/poppler-annotation.cc
<br>@@ -2039,7 +2039,7 @@ QColor convertAnnotColor( AnnotColor *color )
<br> return QColor();
<br>
<br> QColor newcolor;
<br>- double *color_data = color->getValues();
<br>+ const double *color_data = color->getValues();
<br> switch ( color->getSpace() )
<br> {
<br> case AnnotColor::colorTransparent: // = 0,
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26665647&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26660098
Branch 'poppler-0.12' - poppler/PDFDoc.cc
2009-12-05T14:34:33Z
2009-12-05T14:34:33Z
Albert Astals Cid-6
poppler/PDFDoc.cc | 3 ++-
<br> 1 file changed, 2 insertions(+), 1 deletion(-)
<br><br>New commits:
<br>commit c9ee556ab8b9bab3107a5cb3489354b3d6187a8b
<br>Author: Axel Struebing <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660098&i=0" target="_top" rel="nofollow">axel.struebing@...</a>>
<br>Date: Sat Dec 5 22:31:29 2009 +0000
<br><br> Add a empty space after null
<br>
<br> Fixes bug 25465
<br><br>diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
<br>index 4af402b..b088f6c 100644
<br>--- a/poppler/PDFDoc.cc
<br>+++ b/poppler/PDFDoc.cc
<br>@@ -20,6 +20,7 @@
<br> // Copyright (C) 2008 Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660098&i=1" target="_top" rel="nofollow">carlosgc@...</a>>
<br> // Copyright (C) 2009 Eric Toombs <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660098&i=2" target="_top" rel="nofollow">ewtoombs@...</a>>
<br> // Copyright (C) 2009 Kovid Goyal <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660098&i=3" target="_top" rel="nofollow">kovid@...</a>>
<br>+// Copyright (C) 2009 Axel Struebing <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660098&i=4" target="_top" rel="nofollow">axel.struebing@...</a>>
<br> //
<br> // To see a description of the changes please see the Changelog file that
<br> // came with your tarball or type make ChangeLog if you are building from git
<br>@@ -732,7 +733,7 @@ Guint PDFDoc::writeObject (Object* obj, Ref* ref, OutStream* outStr)
<br> break;
<br> }
<br> case objNull:
<br>- outStr->printf( "null");
<br>+ outStr->printf( "null ");
<br> break;
<br> case objArray:
<br> array = obj->getArray();
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660098&i=5" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26660074
poppler/PDFDoc.cc
2009-12-05T14:32:31Z
2009-12-05T14:32:31Z
Albert Astals Cid-6
poppler/PDFDoc.cc | 3 ++-
<br> 1 file changed, 2 insertions(+), 1 deletion(-)
<br><br>New commits:
<br>commit 92fab93bee3748a73c09429cc8a105c16f21fed0
<br>Author: Axel Struebing <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660074&i=0" target="_top" rel="nofollow">axel.struebing@...</a>>
<br>Date: Sat Dec 5 22:31:29 2009 +0000
<br><br> Add a empty space after null
<br>
<br> Fixes bug 25465
<br><br>diff --git a/poppler/PDFDoc.cc b/poppler/PDFDoc.cc
<br>index 4af402b..b088f6c 100644
<br>--- a/poppler/PDFDoc.cc
<br>+++ b/poppler/PDFDoc.cc
<br>@@ -20,6 +20,7 @@
<br> // Copyright (C) 2008 Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660074&i=1" target="_top" rel="nofollow">carlosgc@...</a>>
<br> // Copyright (C) 2009 Eric Toombs <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660074&i=2" target="_top" rel="nofollow">ewtoombs@...</a>>
<br> // Copyright (C) 2009 Kovid Goyal <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660074&i=3" target="_top" rel="nofollow">kovid@...</a>>
<br>+// Copyright (C) 2009 Axel Struebing <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660074&i=4" target="_top" rel="nofollow">axel.struebing@...</a>>
<br> //
<br> // To see a description of the changes please see the Changelog file that
<br> // came with your tarball or type make ChangeLog if you are building from git
<br>@@ -732,7 +733,7 @@ Guint PDFDoc::writeObject (Object* obj, Ref* ref, OutStream* outStr)
<br> break;
<br> }
<br> case objNull:
<br>- outStr->printf( "null");
<br>+ outStr->printf( "null ");
<br> break;
<br> case objArray:
<br> array = obj->getArray();
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26660074&i=5" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26654008
2 commits - poppler/Annot.cc poppler/Annot.h
2009-12-05T01:18:25Z
2009-12-05T01:18:25Z
Carlos Garcia Campos-5
poppler/Annot.cc | 31 +++++++++++++++----------------
<br> poppler/Annot.h | 1 +
<br> 2 files changed, 16 insertions(+), 16 deletions(-)
<br><br>New commits:
<br>commit 32103f45d0193b31e95269ea9123b8011d93e994
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26654008&i=0" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Sat Dec 5 10:14:18 2009 +0100
<br><br> [annots] Add isVisible() to check whether annot is visible before drawing it
<br>
<br> It takes into account annot flags and optional content.
<br><br>diff --git a/poppler/Annot.cc b/poppler/Annot.cc
<br>index 20c8209..fb65ea6 100644
<br>--- a/poppler/Annot.cc
<br>+++ b/poppler/Annot.cc
<br>@@ -1262,22 +1262,29 @@ void Annot::drawCircleBottomRight(double cx, double cy, double r) {
<br> appearBuf->append("S\n");
<br> }
<br>
<br>-void Annot::draw(Gfx *gfx, GBool printing) {
<br>- Object obj;
<br>-
<br>+GBool Annot::isVisible(GBool printing) {
<br> // check the flags
<br> if ((flags & flagHidden) ||
<br> (printing && !(flags & flagPrint)) ||
<br> (!printing && (flags & flagNoView))) {
<br>- return;
<br>+ return gFalse;
<br> }
<br>
<br> // check the OC
<br> if (optContentConfig && oc.isRef()) {
<br> if (! optContentConfig->optContentIsVisible(&oc))
<br>- return;
<br>+ return gFalse;
<br> }
<br>
<br>+ return gTrue;
<br>+}
<br>+
<br>+void Annot::draw(Gfx *gfx, GBool printing) {
<br>+ Object obj;
<br>+
<br>+ if (!isVisible (printing))
<br>+ return;
<br>+
<br> // draw the appearance stream
<br> appearance.fetch(xref, &obj);
<br> gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
<br>@@ -1691,12 +1698,8 @@ void AnnotLink::initialize(XRef *xrefA, Catalog *catalog, Dict *dict) {
<br> void AnnotLink::draw(Gfx *gfx, GBool printing) {
<br> Object obj;
<br>
<br>- // check the flags
<br>- if ((flags & flagHidden) ||
<br>- (printing && !(flags & flagPrint)) ||
<br>- (!printing && (flags & flagNoView))) {
<br>+ if (!isVisible (printing))
<br> return;
<br>- }
<br>
<br> // draw the appearance stream
<br> appearance.fetch(xref, &obj);
<br>@@ -3416,12 +3419,8 @@ void AnnotWidget::generateFieldAppearance() {
<br> void AnnotWidget::draw(Gfx *gfx, GBool printing) {
<br> Object obj;
<br>
<br>- // check the flags
<br>- if ((flags & flagHidden) ||
<br>- (printing && !(flags & flagPrint)) ||
<br>- (!printing && (flags & flagNoView))) {
<br>+ if (!isVisible (printing))
<br> return;
<br>- }
<br>
<br> addDingbatsResource = gFalse;
<br> generateFieldAppearance ();
<br>diff --git a/poppler/Annot.h b/poppler/Annot.h
<br>index b83c1db..cb0bc96 100644
<br>--- a/poppler/Annot.h
<br>+++ b/poppler/Annot.h
<br>@@ -538,6 +538,7 @@ protected:
<br> void drawCircle(double cx, double cy, double r, GBool fill);
<br> void drawCircleTopLeft(double cx, double cy, double r);
<br> void drawCircleBottomRight(double cx, double cy, double r);
<br>+ GBool isVisible(GBool printing);
<br>
<br> // Updates the field key of the annotation dictionary
<br> // and sets M to the current time
<br>commit c14dfc7102341f5e1ed67a05c0738d55befab1ec
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26654008&i=1" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Sat Dec 5 10:07:46 2009 +0100
<br><br> [annots] Do not check if annot is a link in Annot::draw()
<br>
<br> AnnotLink already implements draw()
<br><br>diff --git a/poppler/Annot.cc b/poppler/Annot.cc
<br>index 478ed21..20c8209 100644
<br>--- a/poppler/Annot.cc
<br>+++ b/poppler/Annot.cc
<br>@@ -1280,7 +1280,7 @@ void Annot::draw(Gfx *gfx, GBool printing) {
<br>
<br> // draw the appearance stream
<br> appearance.fetch(xref, &obj);
<br>- gfx->drawAnnot(&obj, (type == typeLink) ? border : (AnnotBorder *)NULL, color,
<br>+ gfx->drawAnnot(&obj, (AnnotBorder *)NULL, color,
<br> rect->x1, rect->y1, rect->x2, rect->y2);
<br> obj.free();
<br> }
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26654008&i=2" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26642944
2 commits - poppler/GfxFont.cc poppler/PSOutputDev.cc
2009-12-04T06:02:08Z
2009-12-04T06:02:08Z
Albert Astals Cid-6
poppler/GfxFont.cc | 9 +++++++++
<br> poppler/PSOutputDev.cc | 24 ++++++++++++++++--------
<br> 2 files changed, 25 insertions(+), 8 deletions(-)
<br><br>New commits:
<br>commit ddf85d4a51f605eed998c633857b8bb5c74ab590
<br>Author: Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26642944&i=0" target="_top" rel="nofollow">aacid@...</a>>
<br>Date: Fri Dec 4 14:59:41 2009 +0100
<br><br> Make the code a bit more resilient
<br>
<br> By checking the GooString we are going to use really exists
<br><br>diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
<br>index 67b5412..f577425 100644
<br>--- a/poppler/PSOutputDev.cc
<br>+++ b/poppler/PSOutputDev.cc
<br>@@ -1663,14 +1663,16 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> // check for embedded Type 1 font
<br> } else if (globalParams->getPSEmbedType1() &&
<br> font->getType() == fontType1 &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedType1Font(&fontFileID, psName);
<br>
<br> // check for embedded Type 1C font
<br> } else if (globalParams->getPSEmbedType1() &&
<br> font->getType() == fontType1C &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getOrigName()) {
<br> // use the PDF font name because the embedded font name might
<br> // not include the subset prefix
<br> psName = font->getOrigName()->sanitizedName(gTrue /* ps mode */);
<br>@@ -1679,7 +1681,8 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> // check for embedded OpenType - Type 1C font
<br> } else if (globalParams->getPSEmbedType1() &&
<br> font->getType() == fontType1COT &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getOrigName()) {
<br> // use the PDF font name because the embedded font name might
<br> // not include the subset prefix
<br> psName = font->getOrigName()->sanitizedName(gTrue /* ps mode */);
<br>@@ -1688,7 +1691,8 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> // check for external Type 1 font file
<br> } else if (globalParams->getPSEmbedType1() &&
<br> font->getType() == fontType1 &&
<br>- font->getExtFontFile()) {
<br>+ font->getExtFontFile() &&
<br>+ font->getName()) {
<br> // this assumes that the PS font name matches the PDF font name
<br> psName = font->getName()->copy();
<br> setupExternalType1Font(font->getExtFontFile(), psName);
<br>@@ -1697,7 +1701,8 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> } else if (globalParams->getPSEmbedTrueType() &&
<br> (font->getType() == fontTrueType ||
<br> font->getType() == fontTrueTypeOT) &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedTrueTypeFont(font, &fontFileID, psName);
<br>
<br>@@ -1710,7 +1715,8 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> // check for embedded CID PostScript font
<br> } else if (globalParams->getPSEmbedCIDPostScript() &&
<br> font->getType() == fontCIDType0C &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedCIDType0Font(font, &fontFileID, psName);
<br>
<br>@@ -1718,14 +1724,16 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> } else if (globalParams->getPSEmbedCIDTrueType() &&
<br> (font->getType() == fontCIDType2 ||
<br> font->getType() == fontCIDType2OT) &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedCIDTrueTypeFont(font, &fontFileID, psName, gTrue);
<br>
<br> // check for embedded OpenType - CID CFF font
<br> } else if (globalParams->getPSEmbedCIDPostScript() &&
<br> font->getType() == fontCIDType0COT &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedOpenTypeCFFFont(font, &fontFileID, psName);
<br>
<br>commit 78b4afa0a44048b8d40438d400652dbae4cb99b1
<br>Author: Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26642944&i=1" target="_top" rel="nofollow">aacid@...</a>>
<br>Date: Fri Dec 4 14:57:10 2009 +0100
<br><br> Accept Fontname if FontName is not present
<br>
<br> Fixes KDE bug 217013
<br><br>diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
<br>index f51c100..e7d564a 100644
<br>--- a/poppler/GfxFont.cc
<br>+++ b/poppler/GfxFont.cc
<br>@@ -230,6 +230,15 @@ void GfxFont::readFontDescriptor(XRef *xref, Dict *fontDict) {
<br> embFontName = new GooString(obj2.getName());
<br> }
<br> obj2.free();
<br>+ if (embFontName == NULL) {
<br>+ // get name with typo
<br>+ obj1.dictLookup("Fontname", &obj2);
<br>+ if (obj2.isName()) {
<br>+ embFontName = new GooString(obj2.getName());
<br>+ error(-1, "The file uses Fontname instead of FontName please notify the creator that the file is broken");
<br>+ }
<br>+ obj2.free();
<br>+ }
<br>
<br> // get family
<br> obj1.dictLookup("FontFamily", &obj2);
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26642944&i=2" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26642923
Branch 'poppler-0.12' - 2 commits - poppler/GfxFont.cc poppler/PSOutputDev.cc
2009-12-04T06:01:14Z
2009-12-04T06:01:14Z
Albert Astals Cid-6
poppler/GfxFont.cc | 9 +++++++++
<br> poppler/PSOutputDev.cc | 24 ++++++++++++++++--------
<br> 2 files changed, 25 insertions(+), 8 deletions(-)
<br><br>New commits:
<br>commit a6cdeb7be296b14d74cf1d2f22729dc7d0b9e31c
<br>Author: Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26642923&i=0" target="_top" rel="nofollow">aacid@...</a>>
<br>Date: Fri Dec 4 14:59:41 2009 +0100
<br><br> Make the code a bit more resilient
<br>
<br> By checking the GooString we are going to use really exists
<br><br>diff --git a/poppler/PSOutputDev.cc b/poppler/PSOutputDev.cc
<br>index b784c00..1cf2eea 100644
<br>--- a/poppler/PSOutputDev.cc
<br>+++ b/poppler/PSOutputDev.cc
<br>@@ -1662,14 +1662,16 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> // check for embedded Type 1 font
<br> } else if (globalParams->getPSEmbedType1() &&
<br> font->getType() == fontType1 &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedType1Font(&fontFileID, psName);
<br>
<br> // check for embedded Type 1C font
<br> } else if (globalParams->getPSEmbedType1() &&
<br> font->getType() == fontType1C &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getOrigName()) {
<br> // use the PDF font name because the embedded font name might
<br> // not include the subset prefix
<br> psName = font->getOrigName()->sanitizedName(gTrue /* ps mode */);
<br>@@ -1678,7 +1680,8 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> // check for embedded OpenType - Type 1C font
<br> } else if (globalParams->getPSEmbedType1() &&
<br> font->getType() == fontType1COT &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getOrigName()) {
<br> // use the PDF font name because the embedded font name might
<br> // not include the subset prefix
<br> psName = font->getOrigName()->sanitizedName(gTrue /* ps mode */);
<br>@@ -1687,7 +1690,8 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> // check for external Type 1 font file
<br> } else if (globalParams->getPSEmbedType1() &&
<br> font->getType() == fontType1 &&
<br>- font->getExtFontFile()) {
<br>+ font->getExtFontFile() &&
<br>+ font->getName()) {
<br> // this assumes that the PS font name matches the PDF font name
<br> psName = font->getName()->copy();
<br> setupExternalType1Font(font->getExtFontFile(), psName);
<br>@@ -1696,7 +1700,8 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> } else if (globalParams->getPSEmbedTrueType() &&
<br> (font->getType() == fontTrueType ||
<br> font->getType() == fontTrueTypeOT) &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedTrueTypeFont(font, &fontFileID, psName);
<br>
<br>@@ -1709,7 +1714,8 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> // check for embedded CID PostScript font
<br> } else if (globalParams->getPSEmbedCIDPostScript() &&
<br> font->getType() == fontCIDType0C &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedCIDType0Font(font, &fontFileID, psName);
<br>
<br>@@ -1717,14 +1723,16 @@ void PSOutputDev::setupFont(GfxFont *font, Dict *parentResDict) {
<br> } else if (globalParams->getPSEmbedCIDTrueType() &&
<br> (font->getType() == fontCIDType2 ||
<br> font->getType() == fontCIDType2OT) &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedCIDTrueTypeFont(font, &fontFileID, psName, gTrue);
<br>
<br> // check for embedded OpenType - CID CFF font
<br> } else if (globalParams->getPSEmbedCIDPostScript() &&
<br> font->getType() == fontCIDType0COT &&
<br>- font->getEmbeddedFontID(&fontFileID)) {
<br>+ font->getEmbeddedFontID(&fontFileID) &&
<br>+ font->getEmbeddedFontName()) {
<br> psName = font->getEmbeddedFontName()->sanitizedName(gTrue /* ps mode */);
<br> setupEmbeddedOpenTypeCFFFont(font, &fontFileID, psName);
<br>
<br>commit 4eaf44cdf4e6006b70712c055a97ab152c41d26f
<br>Author: Albert Astals Cid <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26642923&i=1" target="_top" rel="nofollow">aacid@...</a>>
<br>Date: Fri Dec 4 14:57:10 2009 +0100
<br><br> Accept Fontname if FontName is not present
<br>
<br> Fixes KDE bug 217013
<br><br>diff --git a/poppler/GfxFont.cc b/poppler/GfxFont.cc
<br>index f51c100..e7d564a 100644
<br>--- a/poppler/GfxFont.cc
<br>+++ b/poppler/GfxFont.cc
<br>@@ -230,6 +230,15 @@ void GfxFont::readFontDescriptor(XRef *xref, Dict *fontDict) {
<br> embFontName = new GooString(obj2.getName());
<br> }
<br> obj2.free();
<br>+ if (embFontName == NULL) {
<br>+ // get name with typo
<br>+ obj1.dictLookup("Fontname", &obj2);
<br>+ if (obj2.isName()) {
<br>+ embFontName = new GooString(obj2.getName());
<br>+ error(-1, "The file uses Fontname instead of FontName please notify the creator that the file is broken");
<br>+ }
<br>+ obj2.free();
<br>+ }
<br>
<br> // get family
<br> obj1.dictLookup("FontFamily", &obj2);
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26642923&i=2" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>
tag:old.nabble.com,2006:post-26641866
poppler/Annot.cc
2009-12-04T04:28:54Z
2009-12-04T04:28:54Z
Carlos Garcia Campos-5
poppler/Annot.cc | 22 +++++++++-------------
<br> 1 file changed, 9 insertions(+), 13 deletions(-)
<br><br>New commits:
<br>commit fee5cb0eec2ddb8d596289e9a6285cf04d97632e
<br>Author: Carlos Garcia Campos <<a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641866&i=0" target="_top" rel="nofollow">carlosgc@...</a>>
<br>Date: Fri Dec 4 13:26:42 2009 +0100
<br><br> [annots] Remove redundant flags definition
<br><br>diff --git a/poppler/Annot.cc b/poppler/Annot.cc
<br>index cb6a381..478ed21 100644
<br>--- a/poppler/Annot.cc
<br>+++ b/poppler/Annot.cc
<br>@@ -61,10 +61,6 @@
<br> #include "DateInfo.h"
<br> #include <string.h>
<br>
<br>-#define annotFlagHidden 0x0002
<br>-#define annotFlagPrint 0x0004
<br>-#define annotFlagNoView 0x0020
<br>-
<br> #define fieldFlagReadOnly 0x00000001
<br> #define fieldFlagRequired 0x00000002
<br> #define fieldFlagNoExport 0x00000004
<br>@@ -1270,9 +1266,9 @@ void Annot::draw(Gfx *gfx, GBool printing) {
<br> Object obj;
<br>
<br> // check the flags
<br>- if ((flags & annotFlagHidden) ||
<br>- (printing && !(flags & annotFlagPrint)) ||
<br>- (!printing && (flags & annotFlagNoView))) {
<br>+ if ((flags & flagHidden) ||
<br>+ (printing && !(flags & flagPrint)) ||
<br>+ (!printing && (flags & flagNoView))) {
<br> return;
<br> }
<br>
<br>@@ -1696,9 +1692,9 @@ void AnnotLink::draw(Gfx *gfx, GBool printing) {
<br> Object obj;
<br>
<br> // check the flags
<br>- if ((flags & annotFlagHidden) ||
<br>- (printing && !(flags & annotFlagPrint)) ||
<br>- (!printing && (flags & annotFlagNoView))) {
<br>+ if ((flags & flagHidden) ||
<br>+ (printing && !(flags & flagPrint)) ||
<br>+ (!printing && (flags & flagNoView))) {
<br> return;
<br> }
<br>
<br>@@ -3421,9 +3417,9 @@ void AnnotWidget::draw(Gfx *gfx, GBool printing) {
<br> Object obj;
<br>
<br> // check the flags
<br>- if ((flags & annotFlagHidden) ||
<br>- (printing && !(flags & annotFlagPrint)) ||
<br>- (!printing && (flags & annotFlagNoView))) {
<br>+ if ((flags & flagHidden) ||
<br>+ (printing && !(flags & flagPrint)) ||
<br>+ (!printing && (flags & flagNoView))) {
<br> return;
<br> }
<br>
<br>_______________________________________________
<br>poppler mailing list
<br><a href="http://old.nabble.com/user/SendEmail.jtp?type=post&post=26641866&i=1" target="_top" rel="nofollow">poppler@...</a>
<br><a href="http://lists.freedesktop.org/mailman/listinfo/poppler" target="_top" rel="nofollow">http://lists.freedesktop.org/mailman/listinfo/poppler</a><br>