Revert "Always use L_FLATE_ENCODE in PdfRenderer (fixes #31)"

This reverts commit 1181cc0.
adaptech-cz · Mar 4, 2021 · 3975aa6 · 3975aa6
1 parent 339a4a9
commit 3975aa6
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/tesseract4android/src/main/cpp/leptonica/CMakeLists.txt b/tesseract4android/src/main/cpp/leptonica/CMakeLists.txt
@@ -67,7 +67,7 @@ add_definitions(-DANDROID_BUILD)
 add_definitions(-DHAVE_LIBJPEG=1)
 add_definitions(-DHAVE_LIBPNG=1)
 add_definitions(-DHAVE_LIBZ=1)
-# TODO: Enable this when we use minSdkVersion 23 or higher and remove workaround in pdfrenderer.cpp
+# TODO: Enable this when we use minSdkVersion 23 or higher
 #add_definitions(-DHAVE_FMEMOPEN=1)
 
 # Ignore some warnings during build

diff --git a/tesseract4android/src/main/cpp/tesseract/src/src/api/pdfrenderer.cpp b/tesseract4android/src/main/cpp/tesseract/src/src/api/pdfrenderer.cpp
@@ -675,14 +675,8 @@ bool TessPDFRenderer::imageToPDFObj(Pix *pix,
 
   L_Compressed_Data *cid = nullptr;
 
-#ifdef __ANDROID__ // Remove this when we use minSdkVersion 23 or higher
-  bool flateEncode = true;
-#else
-  bool flateEncode = pixGetInputFormat(pix) == IFF_PNG;
-#endif
-
   int sad = 0;
-  if (flateEncode)
+  if (pixGetInputFormat(pix) == IFF_PNG)
     sad = pixGenerateCIData(pix, L_FLATE_ENCODE, 0, 0, &cid);
   if (!cid) {
     sad = l_generateCIDataForPdf(filename, pix, jpg_quality, &cid);