Fix issue with conversion of complex backgrounds to PNGs

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.2.2
+
+* Patch memory corruption bug due to PNG background images being the incorrect size.
+
 ## 0.2.1
 
 * Process PDF annotations (e.g. stamps) by default.

src/Pdf2Html/Dockerfile

@@ -3,7 +3,7 @@ FROM ubuntu:noble AS build-pdf2htmlex
 
 # Produces a patched pdf2htmlEX using libopenjp 2.7 instead of libjpeg to get JPEG2000 support.
 
-ENV PDF2HTMLEX_BRANCH=cfl1
+ENV PDF2HTMLEX_BRANCH=
 ENV UNATTENDED="--assume-yes"
 ENV MAKE_PARALLEL="-j 4"
 ENV PDF2HTMLEX_PREFIX=/usr/local
@@ -19,6 +19,7 @@ RUN patch ./buildScripts/versionEnvs ./patches/versionEnvs.patch
 RUN patch ./buildScripts/buildPoppler ./patches/buildPoppler.patch
 RUN patch ./buildScripts/getBuildToolsApt ./patches/getBuildToolsApt.patch
 RUN patch ./buildScripts/getDevLibrariesApt ./patches/getDevLibrariesApt.patch
+RUN patch ./pdf2htmlEX/src/BackgroundRenderer/SplashBackgroundRenderer.cc ./patches/SplashBackgroundRenderer.cc.patch
 RUN patch ./pdf2htmlEX/src/util/unicode.cc ./patches/unicode.cc.patch
 RUN patch ./pdf2htmlEX/src/util/unicode.h ./patches/unicode.h.patch
 RUN patch ./pdf2htmlEX/CMakeLists.txt ./patches/CMakeLists.patch
@@ -49,7 +50,7 @@ RUN apt update && apt install -y wget
 RUN wget http://archive.ubuntu.com/ubuntu/pool/main/libj/libjpeg-turbo/libjpeg-turbo8_2.0.3-0ubuntu1_amd64.deb
 RUN apt install -y ./libjpeg-turbo8_2.0.3-0ubuntu1_amd64.deb
 COPY --from=build-pdf2htmlex /source/pdf2htmlEX/imageBuild/*.deb /pdf2htmlEX/
-RUN apt install -y libjpeg62 libopenjp2-7 /pdf2htmlEX/pdf2htmlEX-0.18.8.rc1-cfl1-*-x86_64.deb
+RUN apt install -y libjpeg62 libopenjp2-7 /pdf2htmlEX/pdf2htmlEX-0.18.8.rc1-cfl2-*-x86_64.deb
 
 WORKDIR /app
 COPY --from=build /app ./

src/Pdf2Html/Pdf2Html.csproj

@@ -4,7 +4,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>0.2.0</Version>
+    <Version>0.2.2</Version>
     <AssemblyName>Pdf2Html</AssemblyName>
     <RootNamespace>Pdf2Html</RootNamespace>
   </PropertyGroup>

src/Pdf2Html/pdf2htmlEX/patches/SplashBackgroundRenderer.cc.patch

@@ -0,0 +1,20 @@
+@@ -137,7 +137,7 @@ void SplashBackgroundRenderer::embed_image(int pageno)
+ // end of hack
+
+     // dump the background image only when it is not empty
+-    if((xmin <= xmax) && (ymin <= ymax))
++    if((xmin < xmax) && (ymin < ymax))
+     {
+         {
+             auto fn = html_renderer->str_fmt("%s/bg%x.%s", (param.embed_image ? param.tmp_dir : param.dest_dir).c_str(), pageno, format.c_str());
+@@ -185,8 +185,8 @@ void SplashBackgroundRenderer::embed_image(int pageno)
+ // There might be mem leak when exception is thrown !
+ void SplashBackgroundRenderer::dump_image(const char * filename, int x1, int y1, int x2, int y2)
+ {
+-    int width = x2 - x1 + 1;
+-    int height = y2 - y1 + 1;
++    int width = x2 - x1;
++    int height = y2 - y1;
+     if((width <= 0) || (height <= 0))
+         throw "Bad metric for background image";
+

src/Pdf2Html/pdf2htmlEX/patches/versionEnvs.patch

@@ -3,7 +3,7 @@
  # current working: 0.89.0
 
 -export PDF2HTMLEX_VERSION=0.18.8.rc2
-+export PDF2HTMLEX_VERSION=0.18.8.rc1
++export PDF2HTMLEX_VERSION=0.18.8.rc1-cfl2
 
  export POPPLER_VERSION=poppler-0.89.0
  #export POPPLER_VERSION=poppler-0.88.0