[tika] branch branch_1x updated: TIKA-2635 -- require that user specify path for imagemagick on windows to avoid conflict with system util "convert.exe"

[ta...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tallison pushed a commit to branch branch_1x
in repository https://gitbox.apache.org/repos/asf/tika.git


The following commit(s) were added to refs/heads/branch_1x by this push:
     new e84d0d5  TIKA-2635 -- require that user specify path for imagemagick on windows to avoid conflict with system util "convert.exe"
e84d0d5 is described below

commit e84d0d56ada5f156ae308347b0c77c0ff281a9b7
Author: tballison <ta...@mitre.org>
AuthorDate: Thu Apr 19 11:17:15 2018 -0400

    TIKA-2635 -- require that user specify path for imagemagick on windows to avoid conflict with system util "convert.exe"
---
 .../main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java b/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
index 4d81023..478fed7 100644
--- a/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
+++ b/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java
@@ -55,6 +55,7 @@ import org.apache.commons.exec.DefaultExecutor;
 import org.apache.commons.exec.PumpStreamHandler;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.SystemUtils;
 import org.apache.tika.config.Initializable;
 import org.apache.tika.config.InitializableProblemHandler;
 import org.apache.tika.config.Param;
@@ -184,6 +185,12 @@ public class TesseractOCRParser extends AbstractParser implements Initializable
             IMAGE_MAGICK_PRESENT.put(ImageMagick, false);
             return false;
         }
+        if (SystemUtils.IS_OS_WINDOWS && config.getImageMagickPath().isEmpty()) {
+            LOG.warn("Must specify path for imagemagick on Windows OS to avoid accidental confusion with convert.exe");
+            IMAGE_MAGICK_PRESENT.put(ImageMagick, false);
+            return false;
+        }
+
         // Try running ImageMagick program from there, and see if it exists + works
         String[] checkCmd = { ImageMagick };
         boolean hasImageMagick = ExternalParser.check(checkCmd);

-- 
To stop receiving notification emails like this one, please contact
tallison@apache.org.