diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fd4c48..cf9660c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ deploy: script: - echo "Building with gradle version ${BUILDVERSION}" - gradle -Pversion=${BUILDVERSION} publish - - gradle bootBuildImage --cleanCache --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION} + - gradle bootBuildImage --publishImage -PbuildbootDockerHostNetwork=true -Pversion=${BUILDVERSION} - echo "BUILDVERSION=$BUILDVERSION" >> version.env artifacts: reports: diff --git a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/threads/ImageExtractionThread.java b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/threads/ImageExtractionThread.java index d0340ca..a6a48e5 100644 --- a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/threads/ImageExtractionThread.java +++ b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/service/threads/ImageExtractionThread.java @@ -62,7 +62,7 @@ public class ImageExtractionThread extends Thread { } for (ExtractedImage image : extractedImages) { - imageProcessingQueue.put((UnprocessedImage) image); + imageProcessingQueue.put(image); logger.addImagesToProcess(image.pageNumber(), image.numberOnPage()); } } @@ -87,7 +87,8 @@ public class ImageExtractionThread extends Thread { } for (ExtractedImage imageOnPage : imagesOnCurrentPage) { - if (imageOnPage.width() > FULL_PAGE_IMAGE_THRESHOLD * page.getCropBox().getWidth() && imageOnPage.height() > FULL_PAGE_IMAGE_THRESHOLD * page.getCropBox().getHeight()) { + if (imageOnPage.width() > FULL_PAGE_IMAGE_THRESHOLD * page.getCropBox().getWidth() && imageOnPage.height() > FULL_PAGE_IMAGE_THRESHOLD * page.getCropBox() + .getHeight()) { return true; } } @@ -95,7 +96,9 @@ public class ImageExtractionThread extends Thread { //checking for intersections or direct alignment of images for (int j = 0; j < imagesOnCurrentPage.size(); j++) { for (int i = j + 1; i < imagesOnCurrentPage.size(); i++) { - if (imagesOnCurrentPage.get(j).getImageCoordinatesInInitialUserSpace().aligns(imagesOnCurrentPage.get(i).getImageCoordinatesInInitialUserSpace(), IMAGE_ALIGNMENT_THRESHOLD)) { + if (imagesOnCurrentPage.get(j) + .getImageCoordinatesInInitialUserSpace() + .aligns(imagesOnCurrentPage.get(i).getImageCoordinatesInInitialUserSpace(), IMAGE_ALIGNMENT_THRESHOLD)) { // TODO: see if we can stitch aligning images using BufferedImage and skip the gs conversion entirely return true; }