mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2024-12-11 23:19:04 +08:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #912 from stweil/leak

Browse Source 
main: Fix two memory leaks and fix order of destructor calls
This commit is contained in:
zdenop 2017-05-13 12:44:38 +02:00 committed by GitHub
commit 4e93259a80
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
api/tesseractmain.cpp
View File

@ -27,6 +27,7 @@
#include "allheaders.h" #include "allheaders.h"
#include "baseapi.h" #include "baseapi.h"
#include "basedir.h" #include "basedir.h"
#include "dict.h"
#include "openclwrapper.h" #include "openclwrapper.h"
#include "osdetect.h" #include "osdetect.h"
#include "renderer.h" #include "renderer.h"
@ -424,7 +425,14 @@ int main(int argc, char** argv) {
} }
PERF_COUNT_START("Tesseract:main") PERF_COUNT_START("Tesseract:main")
tesseract::TessBaseAPI api;
// Call GlobalDawgCache here to create the global DawgCache object before
// the TessBaseAPI object. This fixes the order of destructor calls:
// first TessBaseAPI must be destructed, DawgCache must be the last object.
tesseract::Dict::GlobalDawgCache();
// Avoid memory leak caused by auto variable when exit() is called.
static tesseract::TessBaseAPI api;
api.SetOutputName(outputbase); api.SetOutputName(outputbase);
@ -493,7 +501,8 @@ int main(int argc, char** argv) {
(api.GetBoolVariable("tessedit_resegment_from_boxes", &b) && b) || (api.GetBoolVariable("tessedit_resegment_from_boxes", &b) && b) ||
(api.GetBoolVariable("tessedit_make_boxes_from_boxes", &b) && b); (api.GetBoolVariable("tessedit_make_boxes_from_boxes", &b) && b);
tesseract::PointerVector<tesseract::TessResultRenderer> renderers; // Avoid memory leak caused by auto variable when exit() is called.
static tesseract::PointerVector<tesseract::TessResultRenderer> renderers;
if (in_training_mode) { if (in_training_mode) {
renderers.push_back(NULL); renderers.push_back(NULL);