Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build with legacy engine disabled #1744

Merged
merged 2 commits into from
Jul 4, 2018
Merged

Conversation

stweil
Copy link
Member

@stweil stweil commented Jul 4, 2018

No description provided.

stweil added 2 commits July 4, 2018 17:56
Instead of defining the DISABLED_LEGACY_ENGINE macro in config_auto.h
(which is not included by all source files), define it as a preprocessor
option for those parts of the code which require it.

Signed-off-by: Stefan Weil <[email protected]>
The functions TessBaseAPIInitLangMod, TessBaseAPIClearAdaptiveClassifier
and TessBaseAPIDetectOrientationScript need conditional compilation.

Signed-off-by: Stefan Weil <[email protected]>
@amitdo
Copy link
Collaborator

amitdo commented Jul 4, 2018

Instead of defining the DISABLED_LEGACY_ENGINE macro in config_auto.h
(which is not included by all source files), define it as a preprocessor
option for those parts of the code which require it.

I initially did just that, but then changed my mind, thinking the second option is better.

@amitdo
Copy link
Collaborator

amitdo commented Jul 4, 2018

I approve this PR. Thank you!

@zdenop zdenop merged commit d1e0a4b into tesseract-ocr:master Jul 4, 2018
@amitdo
Copy link
Collaborator

amitdo commented Jul 4, 2018

BTW, CMake also needs to be updated.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants