[poppler] utils/HtmlOutputDev.cc

GitLab Mirror gitlab-mirror at kemper.freedesktop.org
Mon Apr 25 11:47:25 UTC 2022


 utils/HtmlOutputDev.cc |    8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 44533caf6b74ec3d531eb7ceec6ed2a31b24079a
Author: Adrian Johnson <ajohnson at redneon.com>
Date:   Mon Apr 25 19:46:22 2022 +0930

    HtmlOutputDev: don't use png.h
    
    It is not needed. Fixes mingw build that was failing with png.h not found.

diff --git a/utils/HtmlOutputDev.cc b/utils/HtmlOutputDev.cc
index 94f3a67c..a10be08e 100644
--- a/utils/HtmlOutputDev.cc
+++ b/utils/HtmlOutputDev.cc
@@ -79,10 +79,6 @@
 #include "Outline.h"
 #include "PDFDoc.h"
 
-#ifdef ENABLE_LIBPNG
-#    include <png.h>
-#endif
-
 #define DEBUG __FILE__ << ": " << __LINE__ << ": DEBUG: "
 
 class HtmlImage
@@ -1359,8 +1355,8 @@ void HtmlOutputDev::drawPngImage(GfxState *state, Stream *str, int width, int he
     if (!isMask) {
         unsigned char *p;
         GfxRGB rgb;
-        png_byte *row = (png_byte *)gmalloc(3 * width); // 3 bytes/pixel: RGB
-        png_bytep *row_pointer = &row;
+        unsigned char *row = (unsigned char *)gmalloc(3 * width); // 3 bytes/pixel: RGB
+        unsigned char **row_pointer = &row;
 
         // Initialize the image stream
         ImageStream *imgStr = new ImageStream(str, width, colorMap->getNumPixelComps(), colorMap->getBits());


More information about the poppler mailing list