updated property name, removed orthogonal changes
Project: http://git-wip-us.apache.org/repos/asf/tika/repo Commit: http://git-wip-us.apache.org/repos/asf/tika/commit/bc6667c1 Tree: http://git-wip-us.apache.org/repos/asf/tika/tree/bc6667c1 Diff: http://git-wip-us.apache.org/repos/asf/tika/diff/bc6667c1 Branch: refs/heads/master Commit: bc6667c195bbef1a672fd635ff7e253143ba2ad8 Parents: 37695d4 Author: Zarana Parekh <[email protected]> Authored: Thu Jun 30 09:46:52 2016 -0700 Committer: Zarana Parekh <[email protected]> Committed: Thu Jun 30 09:46:52 2016 -0700 ---------------------------------------------------------------------- tika-bundle/pom.xml | 2 +- .../apache/tika/parser/ocr/TesseractOCRConfig.java | 16 ++++++++-------- .../apache/tika/parser/ocr/TesseractOCRParser.java | 4 ++-- .../tika/parser/ocr/TesseractOCRConfig.properties | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tika/blob/bc6667c1/tika-bundle/pom.xml ---------------------------------------------------------------------- diff --git a/tika-bundle/pom.xml b/tika-bundle/pom.xml index e993c4b..a6d3572 100644 --- a/tika-bundle/pom.xml +++ b/tika-bundle/pom.xml @@ -112,7 +112,7 @@ </dependencies> <build> - <plugins> + <plugins> <plugin> <groupId>org.apache.felix</groupId> <artifactId>maven-bundle-plugin</artifactId> http://git-wip-us.apache.org/repos/asf/tika/blob/bc6667c1/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java b/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java index 0e553b6..558a83d 100644 --- a/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java +++ b/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRConfig.java @@ -64,7 +64,7 @@ public class TesseractOCRConfig implements Serializable{ private int timeout = 120; // enable image processing (optional) - private int enableProcessing = 0; + private int enableImageProcessing = 0; // Path to ImageMagick program, if not on system path. private String ImageMagickPath = ""; @@ -137,8 +137,8 @@ public class TesseractOCRConfig implements Serializable{ getProp(props, "timeout", getTimeout())); // set parameters for ImageMagick - setEnableProcessing( - getProp(props, "enableProcessing", isEnableProcessing())); + setEnableImageProcessing( + getProp(props, "enableImageProcessing", isEnableImageProcessing())); setImageMagickPath( getProp(props, "ImageMagickPath", getImageMagickPath())); setDensity( @@ -261,17 +261,17 @@ public class TesseractOCRConfig implements Serializable{ return timeout; } - /** @see #setEnableProcessing(boolean) */ - public int isEnableProcessing() { - return enableProcessing; + /** @see #setEnableImageProcessing(boolean) */ + public int isEnableImageProcessing() { + return enableImageProcessing; } /** * Set the value to true if processing is to be enabled. * Default value is false. */ - public void setEnableProcessing(int enableProcessing) { - this.enableProcessing = enableProcessing; + public void setEnableImageProcessing(int enableImageProcessing) { + this.enableImageProcessing = enableImageProcessing; } /** http://git-wip-us.apache.org/repos/asf/tika/blob/bc6667c1/tika-parsers/src/main/java/org/apache/tika/parser/ocr/TesseractOCRParser.java ---------------------------------------------------------------------- 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 dbecb71..c2ef1ee 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 @@ -320,11 +320,11 @@ public class TesseractOCRParser extends AbstractParser { FileUtils.copyFile(input, tmpFile); // Process image if ImageMagick Tool is present - if(config.isEnableProcessing() == 1 && hasImageMagick(config)) { + if(config.isEnableImageProcessing() == 1 && hasImageMagick(config)) { processImage(tmpFile,config); } - doOCR(tmpFile, tmpImgFile, config); + doOCR(tmpFile, tmpImgFile, config); // Tesseract appends .txt to output file name tmpTxtOutput = new File(tmpImgFile.getAbsolutePath() + ".txt"); http://git-wip-us.apache.org/repos/asf/tika/blob/bc6667c1/tika-parsers/src/main/resources/org/apache/tika/parser/ocr/TesseractOCRConfig.properties ---------------------------------------------------------------------- diff --git a/tika-parsers/src/main/resources/org/apache/tika/parser/ocr/TesseractOCRConfig.properties b/tika-parsers/src/main/resources/org/apache/tika/parser/ocr/TesseractOCRConfig.properties index e18c229..fc025d1 100644 --- a/tika-parsers/src/main/resources/org/apache/tika/parser/ocr/TesseractOCRConfig.properties +++ b/tika-parsers/src/main/resources/org/apache/tika/parser/ocr/TesseractOCRConfig.properties @@ -23,7 +23,7 @@ timeout=120 # properties for image processing # to enable processing, set enableProcessing to 1 -enableProcessing=0 +enableImageProcessing=0 ImageMagickPath= density=300 depth=4
