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

Merge pull request #1629 from stweil/bool

Browse Source 
src/training: Replace more proprietary BOOL8 by standard bool data type
This commit is contained in:
Egor Pugin 2018-06-04 18:54:31 +03:00 committed by GitHub
commit 83ae900549
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 20 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/training/cntraining.cpp
View File

@ -45,21 +45,11 @@ DECLARE_STRING_PARAM_FLAG(D);
Private Function Prototypes
----------------------------------------------------------------------------*/
void WriteNormProtos(const char *Directory, LIST LabeledProtoList,
const FEATURE_DESC_STRUCT *feature_desc);
static void WriteNormProtos(const char *Directory, LIST LabeledProtoList,
const FEATURE_DESC_STRUCT *feature_desc);
/*
PARAMDESC *ConvertToPARAMDESC(
PARAM_DESC* Param_Desc,
int N);
*/
void WriteProtos(
FILE *File,
uint16_t N,
LIST ProtoList,
BOOL8 WriteSigProtos,
BOOL8 WriteInsigProtos);
static void WriteProtos(FILE* File, uint16_t N, LIST ProtoList,
bool WriteSigProtos, bool WriteInsigProtos);
/*----------------------------------------------------------------------------
Global Data Definitions and Declarations
@ -174,7 +164,7 @@ int main(int argc, char *argv[]) {
Config.MagicSamples = CharSample->SampleCount;
while (Config.MinSamples > 0.001) {
ProtoList = ClusterSamples(Clusterer, &Config);
if (NumberOfProtos(ProtoList, 1, 0) > 0) {
if (NumberOfProtos(ProtoList, true, false) > 0) {
break;
} else {
Config.MinSamples *= 0.95;
@ -216,8 +206,8 @@ int main(int argc, char *argv[]) {
* @note Exceptions: none
* @note History: Fri Aug 18 16:17:06 1989, DSJ, Created.
*/
void WriteNormProtos(const char *Directory, LIST LabeledProtoList,
const FEATURE_DESC_STRUCT *feature_desc) {
static void WriteNormProtos(const char *Directory, LIST LabeledProtoList,
const FEATURE_DESC_STRUCT *feature_desc) {
FILE *File;
STRING Filename;
LABELEDLIST LabeledProto;
@ -242,8 +232,8 @@ void WriteNormProtos(const char *Directory, LIST LabeledProtoList,
" (%d significant protos"
", %d insignificant protos)\n",
LabeledProto->Label, N,
NumberOfProtos(LabeledProto->List, 1, 0),
NumberOfProtos(LabeledProto->List, 0, 1));
NumberOfProtos(LabeledProto->List, true, false),
NumberOfProtos(LabeledProto->List, false, true));
exit(1);
}
fprintf(File, "\n%s %d\n", LabeledProto->Label, N);
@ -254,12 +244,9 @@ void WriteNormProtos(const char *Directory, LIST LabeledProtoList,
} // WriteNormProtos
/*-------------------------------------------------------------------------*/
void WriteProtos(
FILE *File,
uint16_t N,
LIST ProtoList,
BOOL8 WriteSigProtos,
BOOL8 WriteInsigProtos)
static void WriteProtos(FILE* File, uint16_t N, LIST ProtoList,
bool WriteSigProtos, bool WriteInsigProtos)
{
PROTOTYPE *Proto;

8
src/training/commontraining.cpp
View File

@ -595,8 +595,8 @@ void CleanUpUnusedData(
/*------------------------------------------------------------------------*/
LIST RemoveInsignificantProtos(
LIST ProtoList,
BOOL8 KeepSigProtos,
BOOL8 KeepInsigProtos,
bool KeepSigProtos,
bool KeepInsigProtos,
int N)
{
@ -823,8 +823,8 @@ void AddToNormProtosList(
}
/*---------------------------------------------------------------------------*/
int NumberOfProtos(LIST ProtoList, BOOL8 CountSigProtos,
BOOL8 CountInsigProtos) {
int NumberOfProtos(LIST ProtoList, bool CountSigProtos,
bool CountInsigProtos) {
int N = 0;
PROTOTYPE* Proto;

8
src/training/commontraining.h
View File

@ -142,8 +142,8 @@ CLUSTERER *SetUpForClustering(
LIST RemoveInsignificantProtos(
LIST ProtoList,
BOOL8 KeepSigProtos,
BOOL8 KeepInsigProtos,
bool KeepSigProtos,
bool KeepInsigProtos,
int N);
void CleanUpUnusedData(
@ -181,8 +181,8 @@ void AddToNormProtosList(
int NumberOfProtos(
LIST ProtoList,
BOOL8 CountSigProtos,
BOOL8 CountInsigProtos);
bool CountSigProtos,
bool CountInsigProtos);
void allocNormProtos();