Pull request #2: RED-5911 Bugfix for removed texts within tables

Merge in RED/ocr-service from RED-5911 to master

* commit '0e8dfed4410b28a6316f8e328fc166339852565f':
  RED-5911 Bugfix for removed texts within tables

ocr-service-image-v1/src/main/docker/Dockerfile

@@ -5,6 +5,10 @@ RUN tar xvzf OCRModuleLinux.tar.gz
 RUN mkdir /OCRModule
 RUN mv Lib/* /OCRModule/
 
+RUN apt-get -y update
+# Ghostscript somehow improves ocr quality using pdfton, do not remove!
+RUN apt-get -y install ghostscript
+
 ARG PLATFORM_JAR
 
 ENV PLATFORM_JAR ${PLATFORM_JAR}

ocr-service-v1/ocr-service-server-v1/src/main/java/com/iqser/red/service/ocr/v1/server/service/OCRService.java

@@ -285,7 +285,7 @@ public class OCRService {
         var gState = element.getGState();
 
         //See PDF Reference 5.3 Text rendering modes, 3 = Invisible, however this ocr does not use it.
-        if (!filledRectangleIntersection && gState.getTextRenderMode() != 3) {
+        if (!filledRectangleIntersection && gState.getTextRenderMode() != 3 || filledRectangleIntersection && gState.getTextRenderMode() == 0) {
             writer.writeElement(element);
         }
     }
@@ -294,10 +294,10 @@ public class OCRService {
     @SneakyThrows
     private void processPath(Element element, ElementWriter writer, Set<Rect> filledRectangles) {
 
+        writer.writeElement(element);
         if (element.getPathData() != null && element.getPathData().getPoints().length > 4) {
             filledRectangles.add(element.getBBox());
         }
-        writer.writeElement(element);
     }
 
 

ocr-service-v1/ocr-service-server-v1/src/test/java/com/iqser/red/service/ocr/v1/server/OcrServiceIntegrationTest.java

@@ -76,6 +76,8 @@ public class OcrServiceIntegrationTest {
 
         var out = FileUtils.openOutputStream(new File(getTemporaryDirectory() + "/" + fileName + ".pdf"));
         IOUtils.copy(response, out);
+
+        System.out.println("File:" + getTemporaryDirectory() + "/" + fileName + ".pdf");
     }