diff --git a/ocr-service-v1/ocr-service-processor/build.gradle.kts b/ocr-service-v1/ocr-service-processor/build.gradle.kts index 60351ba..16d083c 100644 --- a/ocr-service-v1/ocr-service-processor/build.gradle.kts +++ b/ocr-service-v1/ocr-service-processor/build.gradle.kts @@ -20,7 +20,7 @@ dependencies { api("org.apache.pdfbox:jbig2-imageio:3.0.4") api("com.github.jai-imageio:jai-imageio-core:1.4.0") api("com.github.jai-imageio:jai-imageio-jpeg2000:1.4.0") - api("io.github.karols:hocr4j:0.1.2") + api("io.github.karols:hocr4j:0.2.0") api("com.amazonaws:aws-java-sdk-kms:1.12.440") api("com.google.guava:guava:31.1-jre") api("com.iqser.red.commons:pdftron-logic-commons:2.20.0") diff --git a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/ExtractedOcrImage.java b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/ExtractedOcrImage.java index c6abfad..167369a 100644 --- a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/ExtractedOcrImage.java +++ b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/ExtractedOcrImage.java @@ -58,11 +58,4 @@ public class ExtractedOcrImage implements OcrImage { return affineTransform; } - - @Override - public int getOptimalPageSegmentationMode() { - - return ITessAPI.TessPageSegMode.PSM_SINGLE_BLOCK; - } - } diff --git a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/OcrImage.java b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/OcrImage.java index 86cfd6a..3c3d804 100644 --- a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/OcrImage.java +++ b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/OcrImage.java @@ -11,6 +11,7 @@ import lombok.SneakyThrows; import net.sourceforge.lept4j.Leptonica1; import net.sourceforge.lept4j.Pix; import net.sourceforge.lept4j.util.LeptUtils; +import net.sourceforge.tess4j.ITessAPI; public interface OcrImage { @@ -84,7 +85,9 @@ public interface OcrImage { * * @return The optimal page segmentation mode. */ - int getOptimalPageSegmentationMode(); // TODO: evaluate if PSM can be dynamically chosen to increase performance + default int getOptimalPageSegmentationMode() { + return ITessAPI.TessPageSegMode.PSM_AUTO; + } // TODO: evaluate if PSM can be dynamically chosen to increase performance /** diff --git a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/RenderedPageOcrImage.java b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/RenderedPageOcrImage.java index 1141eb5..2e2d3ab 100644 --- a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/RenderedPageOcrImage.java +++ b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/model/RenderedPageOcrImage.java @@ -28,13 +28,6 @@ public class RenderedPageOcrImage implements OcrImage { int rotationDegrees; - @Override - public int getOptimalPageSegmentationMode() { - - return ITessAPI.TessPageSegMode.PSM_SINGLE_BLOCK; - } - - @Override public AffineTransform getImageCTM() {