From 4b0dae5e227d35bdbfaade21059054d4fa9b4e81 Mon Sep 17 00:00:00 2001 From: Ray Smith Date: Wed, 14 Dec 2016 11:35:46 -0800 Subject: [PATCH] Fixed capi to remove cube --- api/capi.cpp | 7 ------- api/capi.h | 11 +---------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/api/capi.cpp b/api/capi.cpp index 57bed872df..2979ae158f 100644 --- a/api/capi.cpp +++ b/api/capi.cpp @@ -607,13 +607,6 @@ TESS_API void TESS_CALL TessBaseAPIInitTruthCallback(TessBaseAPI* handle, TessTr handle->InitTruthCallback(cb); } -#ifndef NO_CUBE_BUILD -TESS_API TessCubeRecoContext* TESS_CALL TessBaseAPIGetCubeRecoContext(const TessBaseAPI* handle) -{ - return handle->GetCubeRecoContext(); -} -#endif // NO_CUBE_BUILD - TESS_API void TESS_CALL TessBaseAPISetMinOrientationMargin(TessBaseAPI* handle, double margin) { handle->set_min_orientation_margin(margin); diff --git a/api/capi.h b/api/capi.h index 9a8edd917e..9c1909a478 100644 --- a/api/capi.h +++ b/api/capi.h @@ -68,9 +68,6 @@ typedef tesseract::ProbabilityInContextFunc TessProbabilityInContextFunc; typedef tesseract::FillLatticeFunc TessFillLatticeFunc; typedef tesseract::Dawg TessDawg; typedef tesseract::TruthCallback TessTruthCallback; -#ifndef NO_CUBE_BUILD -typedef tesseract::CubeRecoContext TessCubeRecoContext; -#endif // NO_CUBE_BUILD typedef tesseract::Orientation TessOrientation; typedef tesseract::ParagraphJustification TessParagraphJustification; typedef tesseract::WritingDirection TessWritingDirection; @@ -88,7 +85,7 @@ typedef struct TessPageIterator TessPageIterator; typedef struct TessResultIterator TessResultIterator; typedef struct TessMutableIterator TessMutableIterator; typedef struct TessChoiceIterator TessChoiceIterator; -typedef enum TessOcrEngineMode { OEM_TESSERACT_ONLY, OEM_CUBE_ONLY, OEM_TESSERACT_CUBE_COMBINED, OEM_DEFAULT } TessOcrEngineMode; +typedef enum TessOcrEngineMode { OEM_TESSERACT_ONLY, OEM_LSTM_ONLY, OEM_TESSERACT_LSTM_COMBINED, OEM_DEFAULT } TessOcrEngineMode; typedef enum TessPageSegMode { PSM_OSD_ONLY, PSM_AUTO_OSD, PSM_AUTO_ONLY, PSM_AUTO, PSM_SINGLE_COLUMN, PSM_SINGLE_BLOCK_VERT_TEXT, PSM_SINGLE_BLOCK, PSM_SINGLE_LINE, PSM_SINGLE_WORD, PSM_CIRCLE_WORD, PSM_SINGLE_CHAR, PSM_SPARSE_TEXT, PSM_SPARSE_TEXT_OSD, PSM_COUNT } TessPageSegMode; @@ -317,12 +314,6 @@ TESS_API TessOcrEngineMode TESS_CALL TessBaseAPIOem(const TessBaseAPI* handle); TESS_API void TESS_CALL TessBaseAPIInitTruthCallback(TessBaseAPI* handle, TessTruthCallback* cb); -#ifndef NO_CUBE_BUILD -TESS_API TessCubeRecoContext* - TESS_CALL TessBaseAPIGetCubeRecoContext(const TessBaseAPI* handle); -#endif // NO_CUBE_BUILD -#endif - TESS_API void TESS_CALL TessBaseAPISetMinOrientationMargin(TessBaseAPI* handle, double margin); #ifdef TESS_CAPI_INCLUDE_BASEAPI TESS_API void TESS_CALL TessBaseGetBlockTextOrientations(TessBaseAPI* handle, int** block_orientation, BOOL** vertical_writing);