handle base64 without inplace_decode

tleyden · May 6, 2017 · a28c4bc · a28c4bc
1 parent efefc7f
commit a28c4bc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/ocr_rpc_client.go b/ocr_rpc_client.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	"github.com/couchbaselabs/logg"
-	"github.com/nu7hatch/gouuid"
 	"github.com/streadway/amqp"
 )
 
@@ -87,7 +86,7 @@ func (c *OcrRpcClient) DecodeImage(ocrRequest OcrRequest) (OcrResult, error) {
 	// any preprocessors.  if rabbitmq isn't in same data center
 	// as open-ocr, it will be expensive in terms of bandwidth
 	// to have image binary in messages
-	if ocrRequest.ImgBytes == nil {
+	if ocrRequest.ImgBytes == nil && ocrRequest.ImgBase64 == nil {
 		// if we already have image bytes, ignore image url
 		err = ocrRequest.downloadImgUrl()
 		if err != nil {

diff --git a/tesseract_engine.go b/tesseract_engine.go
@@ -129,6 +129,8 @@ func (t TesseractEngine) ProcessRequest(ocrRequest OcrRequest) (OcrResult, error
 
 func (t TesseractEngine) tmpFileFromImageBytes(imgBytes []byte) (string, error) {
 
+	logg.LogTo("OCR_TESSERACT", "Use tesseract with bytes image")
+
 	tmpFileName, err := createTempFileName()
 	if err != nil {
 		return "", err
@@ -147,6 +149,8 @@ func (t TesseractEngine) tmpFileFromImageBytes(imgBytes []byte) (string, error)
 
 func (t TesseractEngine) tmpFileFromImageBase64(base64Image string) (string, error) {
 
+	logg.LogTo("OCR_TESSERACT", "Use tesseract with base 64")
+
 	tmpFileName, err := createTempFileName()
 	if err != nil {
 		return "", err
@@ -170,6 +174,8 @@ func (t TesseractEngine) tmpFileFromImageBase64(base64Image string) (string, err
 
 func (t TesseractEngine) tmpFileFromImageUrl(imgUrl string) (string, error) {
 
+	logg.LogTo("OCR_TESSERACT", "Use tesseract with url")
+
 	tmpFileName, err := createTempFileName()
 	if err != nil {
 		return "", err