Skip to content
This repository has been archived by the owner on Mar 17, 2022. It is now read-only.

Issue 185 #186

Merged
merged 4 commits into from
Dec 6, 2016
Merged

Issue 185 #186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
68f6321
Issue 185
Dec 6, 2016
c61cb64
Fix getHOCRText() crashing
Dec 6, 2016
c947584
Fail if OCR happens too fast
Dec 6, 2016
33175da
Should use a semaphore instead of locks. Subtle bug in that there is …
Dec 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
132 changes: 91 additions & 41 deletions tess-two-test/src/com/googlecode/tesseract/android/test/TessBaseAPITest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,6 @@

package com.googlecode.tesseract.android.test;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.List;

import junit.framework.TestCase;

import android.annotation.SuppressLint;
import android.graphics.Bitmap;
import android.graphics.Bitmap.CompressFormat;
Expand All @@ -32,6 +25,7 @@
import android.graphics.Paint.Align;
import android.graphics.Paint.Style;
import android.graphics.Rect;
import android.os.AsyncTask;
import android.test.suitebuilder.annotation.SmallTest;
import android.text.Html;
import android.util.Pair;
Expand All @@ -44,6 +38,14 @@
import com.googlecode.tesseract.android.TessBaseAPI.ProgressNotifier;
import com.googlecode.tesseract.android.TessBaseAPI.ProgressValues;

import junit.framework.TestCase;

import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.List;
import java.util.concurrent.Semaphore;

public class TessBaseAPITest extends TestCase {
@SuppressLint("SdCardPath")
static final String TESSBASE_PATH = "/sdcard/tesseract/";
Expand Down Expand Up @@ -131,19 +133,47 @@ public void testChoiceIterator() {

private static Bitmap getTextImage(String text, int width, int height) {
final Bitmap bmp = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
final Paint paint = new Paint();
final Canvas canvas = new Canvas(bmp);

final Canvas canvas = new Canvas(bmp);
canvas.drawColor(Color.WHITE);
drawTextNewLines(text, canvas);

return bmp;
}

/**
* Draws text (with newlines) centered onto the canvas. If the text does not fit horizontally,
* it will be cut off. If the text does not fit vertically, the start of the text will be at
* the top of the image and whatever not fitting onto the image being cut off. If the text
* fits vertically it will be centered vertically.
*
* @param text String to draw onto the canvas
* @param canvas Canvas to draw text onto
*/
private static void drawTextNewLines(String text, Canvas canvas){
final Paint paint = new Paint();
paint.setColor(Color.BLACK);
paint.setStyle(Style.FILL);
paint.setAntiAlias(true);
paint.setTextAlign(Align.CENTER);
paint.setTextSize(24.0f);
canvas.drawText(text, width / 2, height / 2, paint);

return bmp;
String[] textArray = text.split("\n");
int width = canvas.getWidth();
int height = canvas.getHeight();
int count = textArray.length;
int lineSize = (int) (paint.descent() - paint.ascent());
int maxLinesToPushUp = height / lineSize;
maxLinesToPushUp = count < maxLinesToPushUp ? count : maxLinesToPushUp;
int pixelsToPushUp = (maxLinesToPushUp - 1) / 2 * lineSize;

int x = width / 2;
int y = (height / 2) - pixelsToPushUp;

for (String line : textArray){
canvas.drawText(line, x, y, paint);
y += lineSize;
}
}

@SmallTest
Expand Down Expand Up @@ -687,36 +717,56 @@ public void testSetVariable() {
bmp.recycle();
}

// @SmallTest
// public void testStop() throws InterruptedException {
// final TessBaseAPI baseApi = new TessBaseAPI();
// final String inputText = "The quick brown fox jumps over the lazy dog.";
// final Bitmap bmp = getTextImage(inputText, 640, 480);
//
// boolean success = baseApi.init(TESSBASE_PATH, DEFAULT_LANGUAGE);
// assertTrue(success);
//
// baseApi.setImage(bmp);
//
// class LoopingRecognitionTask extends AsyncTask<Void, Void, Void> {
//
// @Override
// protected Void doInBackground(Void... params) {
// while (true)
// baseApi.getUTF8Text();
// }
// }
//
// LoopingRecognitionTask task = new LoopingRecognitionTask();
// task.execute();
//
// Thread.sleep(200);
//
// baseApi.stop();
//
// baseApi.end();
// bmp.recycle();
// }
@SmallTest
public void testStop() throws InterruptedException {

StringBuilder inputTextBuilder = new StringBuilder();
for (int i = 0; i < 200; i++){
inputTextBuilder.append("The quick brown fox jumps over the lazy dog.\n");
}
final Bitmap bmp = getTextImage(inputTextBuilder.toString(), 640, 4000);

final Semaphore progressSem = new Semaphore(0);
final TessBaseAPI baseApi = new TessBaseAPI(new ProgressNotifier() {
@Override
public void onProgressValues(ProgressValues progressValues) {
if (progressValues.getPercent() > 50){
fail("OCR recognition was too fast, try to increase the image size and amount of text?");
}
if (progressValues.getPercent() > 1){
progressSem.release();
}
}
});

class LongRecognitionTask extends AsyncTask<Void, Void, Void> {
@Override
protected Void doInBackground(Void... params) {
baseApi.getHOCRText(0);
progressSem.release();
return null;
}
}

boolean success = baseApi.init(TESSBASE_PATH, DEFAULT_LANGUAGE);
assertTrue(success);
baseApi.setImage(bmp);

LongRecognitionTask task = new LongRecognitionTask();
task.execute();

// Wait for recognition to start
progressSem.acquire();

baseApi.stop();

// Wait for getHOCRText() to complete, otherwise we may end() and recycle baseApi before
// getHOCRText() finishes execution on the AsyncTask thread and cause an exception
progressSem.acquire();

baseApi.end();
bmp.recycle();
}

@SmallTest
public void testWordConfidences() {
Expand Down
6 changes: 0 additions & 6 deletions tess-two/jni/com_googlecode_tesseract_android/tessbaseapi.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,12 +296,6 @@ jstring Java_com_googlecode_tesseract_android_TessBaseAPI_nativeGetUTF8Text(JNIE
native_data_t *nat = (native_data_t*) mNativeData;
nat->initStateVariables(env, &thiz);

ETEXT_DESC monitor;
monitor.progress_callback = progressJavaCallback;
monitor.cancel = cancelFunc;
monitor.cancel_this = nat;
monitor.progress_this = nat;

char *text = nat->api.GetUTF8Text();

jstring result = env->NewStringUTF(text);
Expand Down
7 changes: 5 additions & 2 deletions tess-two/src/com/googlecode/tesseract/android/TessBaseAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,6 +561,9 @@ public void setImage(byte[] imagedata, int width, int height, int bpp, int bpl)

/**
* The recognized text is returned as a String which is coded as UTF8.
* This is a blocking operation that will not work with {@link #stop()}.
* Call {@link #getHOCRText(int)} before calling this function to
* interrupt a recognition task with {@link #stop()}
*
* @return the recognized text
*/
Expand Down Expand Up @@ -718,7 +721,7 @@ public ResultIterator getResultIterator() {

/**
* Make a HTML-formatted string with hOCR markup from the internal data
* structures.
* structures. Interruptible by {@link #stop()}.
*
* @param page is 0-based but will appear in the output as 1-based.
* @return HTML-formatted string with hOCR markup
Expand Down Expand Up @@ -796,7 +799,7 @@ public String getVersion() {
}

/**
* Cancel any recognition in progress.
* Cancel recognition started by {@link #getHOCRText(int)}.
*/
public void stop() {
if (mRecycled)
Expand Down