97 lines
8.9 KiB
Plaintext
97 lines
8.9 KiB
Plaintext
Fix build with newer leptonica.
|
|
|
|
Index: leptonica_mod/allheaders.h
|
|
--- leptonica_mod/allheaders.h.orig
|
|
+++ leptonica_mod/allheaders.h
|
|
@@ -2146,17 +2146,17 @@ LEPT_DLL extern PIX * pixReadMem ( const l_uint8 *data
|
|
LEPT_DLL extern l_int32 pixReadHeaderMem ( const l_uint8 *data, size_t size, l_int32 *pformat, l_int32 *pw, l_int32 *ph, l_int32 *pbps, l_int32 *pspp, l_int32 *piscmap );
|
|
LEPT_DLL extern l_int32 writeImageFileInfo ( const char *filename, FILE *fpout, l_int32 headeronly );
|
|
LEPT_DLL extern l_int32 ioFormatTest ( const char *filename );
|
|
-LEPT_DLL extern L_RECOGA * recogaCreateFromRecog ( L_RECOG *recog );
|
|
-LEPT_DLL extern L_RECOGA * recogaCreateFromPixaa ( PIXAA *paa, l_int32 scalew, l_int32 scaleh, l_int32 templ_type, l_int32 threshold, l_int32 maxyshift );
|
|
-LEPT_DLL extern L_RECOGA * recogaCreate ( l_int32 n );
|
|
-LEPT_DLL extern void recogaDestroy ( L_RECOGA **precoga );
|
|
-LEPT_DLL extern l_int32 recogaAddRecog ( L_RECOGA *recoga, L_RECOG *recog );
|
|
+LEPT_DLL extern L_RECOG * recogaCreateFromRecog ( L_RECOG *recog );
|
|
+LEPT_DLL extern L_RECOG * recogaCreateFromPixaa ( PIXAA *paa, l_int32 scalew, l_int32 scaleh, l_int32 templ_type, l_int32 threshold, l_int32 maxyshift );
|
|
+LEPT_DLL extern L_RECOG * recogaCreate ( l_int32 n );
|
|
+LEPT_DLL extern void recogaDestroy ( L_RECOG **precoga );
|
|
+LEPT_DLL extern l_int32 recogaAddRecog ( L_RECOG *recoga, L_RECOG *recog );
|
|
LEPT_DLL extern l_int32 recogReplaceInRecoga ( L_RECOG **precog1, L_RECOG *recog2 );
|
|
-LEPT_DLL extern L_RECOG * recogaGetRecog ( L_RECOGA *recoga, l_int32 index );
|
|
-LEPT_DLL extern l_int32 recogaGetCount ( L_RECOGA *recoga );
|
|
+LEPT_DLL extern L_RECOG * recogaGetRecog ( L_RECOG *recoga, l_int32 index );
|
|
+LEPT_DLL extern l_int32 recogaGetCount ( L_RECOG *recoga );
|
|
LEPT_DLL extern l_int32 recogGetCount ( L_RECOG *recog );
|
|
LEPT_DLL extern l_int32 recogGetIndex ( L_RECOG *recog, l_int32 *pindex );
|
|
-LEPT_DLL extern L_RECOGA * recogGetParent ( L_RECOG *recog );
|
|
+LEPT_DLL extern L_RECOG * recogGetParent ( L_RECOG *recog );
|
|
LEPT_DLL extern l_int32 recogSetBootflag ( L_RECOG *recog );
|
|
LEPT_DLL extern L_RECOG * recogCreateFromRecog ( L_RECOG *recs, l_int32 scalew, l_int32 scaleh, l_int32 templ_type, l_int32 threshold, l_int32 maxyshift );
|
|
LEPT_DLL extern L_RECOG * recogCreateFromPixa ( PIXA *pixa, l_int32 scalew, l_int32 scaleh, l_int32 templ_type, l_int32 threshold, l_int32 maxyshift );
|
|
@@ -2167,13 +2167,13 @@ LEPT_DLL extern l_int32 recogGetClassIndex ( L_RECOG *
|
|
LEPT_DLL extern l_int32 recogStringToIndex ( L_RECOG *recog, char *text, l_int32 *pindex );
|
|
LEPT_DLL extern l_int32 recogGetClassString ( L_RECOG *recog, l_int32 index, char **pcharstr );
|
|
LEPT_DLL extern l_int32 l_convertCharstrToInt ( const char *str, l_int32 *pval );
|
|
-LEPT_DLL extern L_RECOGA * recogaRead ( const char *filename );
|
|
-LEPT_DLL extern L_RECOGA * recogaReadStream ( FILE *fp );
|
|
-LEPT_DLL extern L_RECOGA * recogaReadMem ( const l_uint8 *data, size_t size );
|
|
-LEPT_DLL extern l_int32 recogaWrite ( const char *filename, L_RECOGA *recoga );
|
|
-LEPT_DLL extern l_int32 recogaWriteStream ( FILE *fp, L_RECOGA *recoga );
|
|
-LEPT_DLL extern l_int32 recogaWriteMem ( l_uint8 **pdata, size_t *psize, L_RECOGA *recoga );
|
|
-LEPT_DLL extern l_int32 recogaWritePixaa ( const char *filename, L_RECOGA *recoga );
|
|
+LEPT_DLL extern L_RECOG * recogaRead ( const char *filename );
|
|
+LEPT_DLL extern L_RECOG * recogaReadStream ( FILE *fp );
|
|
+LEPT_DLL extern L_RECOG * recogaReadMem ( const l_uint8 *data, size_t size );
|
|
+LEPT_DLL extern l_int32 recogaWrite ( const char *filename, L_RECOG *recoga );
|
|
+LEPT_DLL extern l_int32 recogaWriteStream ( FILE *fp, L_RECOG *recoga );
|
|
+LEPT_DLL extern l_int32 recogaWriteMem ( l_uint8 **pdata, size_t *psize, L_RECOG *recoga );
|
|
+LEPT_DLL extern l_int32 recogaWritePixaa ( const char *filename, L_RECOG *recoga );
|
|
LEPT_DLL extern L_RECOG * recogRead ( const char *filename );
|
|
LEPT_DLL extern L_RECOG * recogReadStream ( FILE *fp );
|
|
LEPT_DLL extern L_RECOG * recogReadMem ( const l_uint8 *data, size_t size );
|
|
@@ -2189,11 +2189,11 @@ LEPT_DLL extern l_int32 recogDestroyDid ( L_RECOG *rec
|
|
LEPT_DLL extern l_int32 recogDidExists ( L_RECOG *recog );
|
|
LEPT_DLL extern L_RDID * recogGetDid ( L_RECOG *recog );
|
|
LEPT_DLL extern l_int32 recogSetChannelParams ( L_RECOG *recog, l_int32 nlevels );
|
|
-LEPT_DLL extern l_int32 recogaIdentifyMultiple ( L_RECOGA *recoga, PIX *pixs, l_int32 nitems, l_int32 minw, l_int32 minh, l_int32 skipsplit, BOXA **pboxa, PIXA **ppixa, PIX **ppixdb, l_int32 debugsplit );
|
|
+LEPT_DLL extern l_int32 recogaIdentifyMultiple ( L_RECOG *recoga, PIX *pixs, l_int32 nitems, l_int32 minw, l_int32 minh, l_int32 skipsplit, BOXA **pboxa, PIXA **ppixa, PIX **ppixdb, l_int32 debugsplit );
|
|
LEPT_DLL extern l_int32 recogSplitIntoCharacters ( L_RECOG *recog, PIX *pixs, l_int32 minw, l_int32 minh, l_int32 skipsplit, BOXA **pboxa, PIXA **ppixa, NUMA **pnaid, l_int32 debug );
|
|
LEPT_DLL extern l_int32 recogCorrelationBestRow ( L_RECOG *recog, PIX *pixs, BOXA **pboxa, NUMA **pnascore, NUMA **pnaindex, SARRAY **psachar, l_int32 debug );
|
|
LEPT_DLL extern l_int32 recogCorrelationBestChar ( L_RECOG *recog, PIX *pixs, BOX **pbox, l_float32 *pscore, l_int32 *pindex, char **pcharstr, PIX **ppixdb );
|
|
-LEPT_DLL extern l_int32 recogaIdentifyPixa ( L_RECOGA *recoga, PIXA *pixa, NUMA *naid, PIX **ppixdb );
|
|
+LEPT_DLL extern l_int32 recogaIdentifyPixa ( L_RECOG *recoga, PIXA *pixa, NUMA *naid, PIX **ppixdb );
|
|
LEPT_DLL extern l_int32 recogIdentifyPixa ( L_RECOG *recog, PIXA *pixa, NUMA *naid, PIX **ppixdb );
|
|
LEPT_DLL extern l_int32 recogIdentifyPix ( L_RECOG *recog, PIX *pixs, PIX **ppixdb );
|
|
LEPT_DLL extern l_int32 recogSkipIdentify ( L_RECOG *recog );
|
|
@@ -2204,7 +2204,7 @@ LEPT_DLL extern l_int32 rchExtract ( L_RCH *rch, l_int
|
|
LEPT_DLL extern PIX * recogProcessToIdentify ( L_RECOG *recog, PIX *pixs, l_int32 pad );
|
|
LEPT_DLL extern PIX * recogPreSplittingFilter ( L_RECOG *recog, PIX *pixs, l_float32 maxasp, l_float32 minaf, l_int32 debug );
|
|
LEPT_DLL extern l_int32 recogSplittingFilter ( L_RECOG *recog, PIX *pixs, l_float32 maxasp, l_float32 minaf, l_int32 *premove, l_int32 debug );
|
|
-LEPT_DLL extern SARRAY * recogaExtractNumbers ( L_RECOGA *recoga, BOXA *boxas, l_float32 scorethresh, l_int32 spacethresh, BOXAA **pbaa, NUMAA **pnaa );
|
|
+LEPT_DLL extern SARRAY * recogaExtractNumbers ( L_RECOG *recoga, BOXA *boxas, l_float32 scorethresh, l_int32 spacethresh, BOXAA **pbaa, NUMAA **pnaa );
|
|
LEPT_DLL extern l_int32 recogSetTemplateType ( L_RECOG *recog, l_int32 templ_type );
|
|
LEPT_DLL extern l_int32 recogSetScaling ( L_RECOG *recog, l_int32 scalew, l_int32 scaleh, l_int32 templ_type );
|
|
LEPT_DLL extern l_int32 recogTrainLabelled ( L_RECOG *recog, PIX *pixs, BOX *box, char *text, l_int32 multflag, l_int32 debug );
|
|
@@ -2216,16 +2216,16 @@ LEPT_DLL extern l_int32 recogAverageSamples ( L_RECOG
|
|
LEPT_DLL extern l_int32 pixaAccumulateSamples ( PIXA *pixa, PTA *pta, PIX **ppixd, l_float32 *px, l_float32 *py );
|
|
LEPT_DLL extern l_int32 recogTrainingFinished ( L_RECOG *recog, l_int32 debug );
|
|
LEPT_DLL extern l_int32 recogRemoveOutliers ( L_RECOG *recog, l_float32 targetscore, l_float32 minfract, l_int32 debug );
|
|
-LEPT_DLL extern l_int32 recogaTrainingDone ( L_RECOGA *recoga, l_int32 *pdone );
|
|
-LEPT_DLL extern l_int32 recogaFinishAveraging ( L_RECOGA *recoga );
|
|
+LEPT_DLL extern l_int32 recogaTrainingDone ( L_RECOG *recoga, l_int32 *pdone );
|
|
+LEPT_DLL extern l_int32 recogaFinishAveraging ( L_RECOG *recoga );
|
|
LEPT_DLL extern L_RECOG * recogTrainFromBoot ( PIXA *pixa, L_RECOG *recogboot, l_float32 minscore, l_int32 threshold, l_int32 scalew, l_int32 scaleh, l_int32 templ_type, l_int32 debug );
|
|
LEPT_DLL extern l_int32 recogTrainUnlabelled ( L_RECOG *recog, L_RECOG *recogboot, PIX *pixs, BOX *box, l_float32 minscore, l_int32 debug );
|
|
LEPT_DLL extern l_int32 recogPadTrainingSet ( L_RECOG **precog, l_int32 debug );
|
|
-LEPT_DLL extern l_int32 recogBestCorrelForPadding ( L_RECOG *recog, L_RECOGA *recoga, NUMA **pnaset, NUMA **pnaindex, NUMA **pnascore, NUMA **pnasum, PIXA *pixadb );
|
|
+LEPT_DLL extern l_int32 recogBestCorrelForPadding ( L_RECOG *recog, L_RECOG *recoga, NUMA **pnaset, NUMA **pnaindex, NUMA **pnascore, NUMA **pnasum, PIXA *pixadb );
|
|
LEPT_DLL extern l_int32 recogCorrelAverages ( L_RECOG *recog1, L_RECOG *recog2, NUMA **pnaindex, NUMA **pnascore, PIXA *pixadb );
|
|
LEPT_DLL extern l_int32 recogSetPadParams ( L_RECOG *recog, const char *bootdir, const char *bootpattern, const char *bootpath, l_int32 boot_iters, l_int32 type, l_int32 min_nopad, l_int32 max_afterpad, l_int32 min_samples );
|
|
LEPT_DLL extern L_RECOG * recogMakeBootDigitRecog ( l_int32 templ_type, l_int32 maxyshift, l_int32 display );
|
|
-LEPT_DLL extern l_int32 recogaShowContent ( FILE *fp, L_RECOGA *recoga, l_int32 display );
|
|
+LEPT_DLL extern l_int32 recogaShowContent ( FILE *fp, L_RECOG *recoga, l_int32 display );
|
|
LEPT_DLL extern l_int32 recogShowContent ( FILE *fp, L_RECOG *recog, l_int32 display );
|
|
LEPT_DLL extern l_int32 recogDebugAverages ( L_RECOG *recog, l_int32 debug );
|
|
LEPT_DLL extern l_int32 recogShowAverageTemplates ( L_RECOG *recog );
|