You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tika.apache.org by dm...@apache.org on 2018/01/14 22:51:20 UTC
[tika] 01/03: TIKA-2509: Updated to use configured ImageMagick path
This is an automated email from the ASF dual-hosted git repository.
dmeikle pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tika.git
commit 0b9aa9b5efde795f6b863c987abff5be07530a41
Author: David Meikle <da...@meikle.io>
AuthorDate: Sun Jan 14 22:29:59 2018 +0000
TIKA-2509: Updated to use configured ImageMagick path
---
.../main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
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 1bf229b..15d3c58 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
@@ -154,7 +154,7 @@ public class TesseractOCRParser extends AbstractParser implements Initializable
private boolean hasImageMagick(TesseractOCRConfig config) {
// Fetch where the config says to find ImageMagick Program
- String ImageMagick = config.getImageMagickPath() + getImageMagickProg();
+ String ImageMagick = getImageMagickPath(config);
// Have we already checked for a copy of ImageMagick Program there?
if (TESSERACT_PRESENT.containsKey(ImageMagick)) {
@@ -170,6 +170,10 @@ public class TesseractOCRParser extends AbstractParser implements Initializable
}
+ private String getImageMagickPath(TesseractOCRConfig config) {
+ return config.getImageMagickPath() + getImageMagickProg();
+ }
+
static boolean hasPython() {
// check if python is installed and it has the required dependencies for the rotation program to run
boolean hasPython = false;
@@ -339,7 +343,7 @@ public class TesseractOCRParser extends AbstractParser implements Initializable
}
// process the image - parameter values can be set in TesseractOCRConfig.properties
- String line = "convert -density " + config.getDensity() + " -depth " + config.getDepth() +
+ String line = getImageMagickPath(config) + " -density " + config.getDensity() + " -depth " + config.getDepth() +
" -colorspace " + config.getColorspace() + " -filter " + config.getFilter() +
" -resize " + config.getResize() + "% -rotate "+ angle + " " + streamingObject.getAbsolutePath() +
" " + streamingObject.getAbsolutePath();
--
To stop receiving notification emails like this one, please contact
"commits@tika.apache.org" <co...@tika.apache.org>.