Pdftoipe now works with poppler 0.86. Added 'override' to all virtual functions in XmlOutputDev to catch such problems at compile time in the future.

Author: Otfried Cheong

pdftoipe/Makefile

@@ -23,7 +23,7 @@ else
   TARGET   = pdftoipe
 endif
 
-CXXFLAGS += -Wno-write-strings -std=c++14
+CXXFLAGS += -Wno-write-strings -std=c++17
 
 all: $(TARGET)
 

pdftoipe/readme.txt

@@ -28,7 +28,7 @@ the mailing list, where anyone interested can participate than by
 direct Email.
 
 	Otfried Cheong
-	Dept. of Computer Science
+	School of Computing
 	KAIST
 	Daejeon, South Korea
 	Email: ipe@otfried.org
@@ -46,7 +46,7 @@ option) any later version.
 Compiling
 =========
 
-You need the Poppler library (http://poppler.freedesktop.org) v0.83.0
+You need the Poppler library (http://poppler.freedesktop.org) v0.86.0
 or greater.  On Debian/Ubuntu, install the packages 'libpoppler-dev'
 and 'libpoppler-private-dev'.
 
@@ -63,18 +63,22 @@ releases, as the developers are updating the code to use modern C++.
 
 If your poppler version is <= v0.68, then you can check out branch
 "old-poppler" from the "ipe-tools" repository.  If you have a version
-between v0.69 and v0.82 and cannot upgrade poppler easily, you need to
+between v0.69 and v0.85 and cannot upgrade poppler easily, you need to
 look in the release history below and checkout the right release of
 the "ipe-tools" repository. 
 
 If you want to compile pdftoipe on Windows, please refer to
-"compile_on_windows.pdf", written by Daniel Beckmann.
+"compile_on_windows.pdf", written by Daniel Beckmann.  I have not been
+able to get this to work myself for recent versions of poppler.
 
 --------------------------------------------------------------------
 
 Changes
 =======
 
+ * 2020/09/09 (v7.2.20.1)
+   Compatibility with poppler 0.86.0 (#47).
+
  * 2019/12/10 (v7.2.13.1)
    Compilation with poppler 0.83.0 (#42).
 
@@ -86,7 +90,7 @@ Changes
    std::string and may be getting deprecated soon so get rid of some
    uses.
 
-* 2018/11/01
+ * 2018/11/01
    Poppler keeps changing: gBool -> bool (issue #31).
 
  * 2018/10/23
@@ -161,8 +165,7 @@ Changes
    Packaged pdftoipe separately from Ipe.
 
  * 2003/06/04
-   Fixed handling of transformation matrix in Pdftoipe.  Pdftoipe
-   is now actually considered supported.
+   Fixed handling of transformation matrix in Pdftoipe.  
 
    Added option -math to pdftoipe.  With this option, all text objects 
    are turned into math formulas. 

pdftoipe/xmloutputdev.cpp

@@ -118,11 +118,6 @@ void XmlOutputDev::setTextHandling(bool math, bool notext,
 
 // ----------------------------------------------------------
 
-void XmlOutputDev::startPage(int pageNum, GfxState *state)
-{
-  startPage(pageNum, state, NULL);  // for poppler <= 0.22
-}
-
 void XmlOutputDev::startPage(int pageNum, GfxState *state, XRef *xrefA)
 {
   writePSFmt("<!-- Page: %d %d -->\n", pageNum, seqPage);
@@ -248,7 +243,7 @@ void XmlOutputDev::drawChar(GfxState *state, double x, double y,
 			    double dx, double dy,
 			    double originX, double originY,
 			    CharCode code, int nBytes, 
-			    Unicode *u, int uLen)
+			    const Unicode *u, int uLen)
 {
   // check for invisible text -- this is used by Acrobat Capture
   if ((state->getRender() & 3) == 3)
@@ -326,7 +321,7 @@ void XmlOutputDev::finishText()
 
 void XmlOutputDev::drawImage(GfxState *state, Object *ref, Stream *str,
                              int width, int height, GfxImageColorMap *colorMap,
-                             bool interpolate, int *maskColors, 
+                             bool interpolate, const int *maskColors, 
                              bool inlineImg)
 {
   finishText();

pdftoipe/xmloutputdev.h

@@ -14,7 +14,7 @@
 class GfxPath;
 class GfxFont;
 
-#define PDFTOIPE_VERSION "2019/12/10"
+#define PDFTOIPE_VERSION "2020/09/09"
 
 class XmlOutputDev : public OutputDev
 {
@@ -28,7 +28,7 @@ class XmlOutputDev : public OutputDev
   virtual ~XmlOutputDev();
 
   // Check if file was successfully created.
-  virtual bool isOk() { return ok; }
+  bool isOk() { return ok; }
 
   bool hasUnicode() const { return iUnicode; }
 
@@ -39,49 +39,48 @@ class XmlOutputDev : public OutputDev
 
   // Does this device use upside-down coordinates?
   // (Upside-down means (0,0) is the top left corner of the page.)
-  virtual bool upsideDown() { return false; }
+  virtual bool upsideDown() override { return false; }
 
   // Does this device use drawChar() or drawString()?
-  virtual bool useDrawChar() { return true; }
+  virtual bool useDrawChar() override { return true; }
 
   // Does this device use beginType3Char/endType3Char?  Otherwise,
   // text in Type 3 fonts will be drawn with drawChar/drawString.
-  virtual bool interpretType3Chars() { return false; }
+  virtual bool interpretType3Chars() override { return false; }
 
   //----- initialization and control
 
   // Start a page.
-  virtual void startPage(int pageNum, GfxState *state); // poppler <=0.22
-  virtual void startPage(int pageNum, GfxState *state, XRef *xrefA);
+  virtual void startPage(int pageNum, GfxState *state, XRef *xrefA) override;
 
   // End a page.
-  virtual void endPage();
+  virtual void endPage() override;
 
   //----- update graphics state
-  virtual void updateTextPos(GfxState *state);
-  virtual void updateTextShift(GfxState *state, double shift);
+  virtual void updateTextPos(GfxState *state) override;
+  virtual void updateTextShift(GfxState *state, double shift) override;
 
   //----- path painting
-  virtual void stroke(GfxState *state);
-  virtual void fill(GfxState *state);
-  virtual void eoFill(GfxState *state);
+  virtual void stroke(GfxState *state) override;
+  virtual void fill(GfxState *state) override;
+  virtual void eoFill(GfxState *state) override;
 
   //----- text drawing
   virtual void drawChar(GfxState *state, double x, double y,
 			double dx, double dy,
 			double originX, double originY,
-			CharCode code, int nBytes, Unicode *u, int uLen);
+			CharCode code, int nBytes, const Unicode *u, int uLen) override;
 
   //----- image drawing
   virtual void drawImage(GfxState *state, Object *ref, Stream *str,
 			 int width, int height, GfxImageColorMap *colorMap,
-			 bool interpolate, int *maskColors, bool inlineImg);
+			 bool interpolate, const int *maskColors, bool inlineImg) override;
 
 protected:
-  virtual void startDrawingPath();
-  virtual void startText(GfxState *state, double x, double y);
-  virtual void finishText();
-  virtual void writePSUnicode(int ch);
+  void startDrawingPath();
+  void startText(GfxState *state, double x, double y);
+  void finishText();
+  void writePSUnicode(int ch);
 
   void doPath(GfxState *state);
   void writePSChar(int code);