Skip to content

Commit 0f3206d

Browse files
stweilstweil
committed
Format code (replace ( xxx ) by (xxx))
Signed-off-by: Stefan Weil <[email protected]>
1 parent 63f87ca commit 0f3206d

23 files changed

+274
-276
lines changed

‎src/api/capi.cpp

+11-11
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,9 @@ TESS_API struct Boxa* TESS_CALL TessBaseAPIGetComponentImages(TessBaseAPI* handl
413413
}
414414

415415
TESS_API struct Boxa*
416-
TESS_CALL TessBaseAPIGetComponentImages1( TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only,
417-
const BOOL raw_image, const int raw_padding,
418-
struct Pixa** pixa, int** blockids, int** paraids)
416+
TESS_CALL TessBaseAPIGetComponentImages1(TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only,
417+
const BOOL raw_image, const int raw_padding,
418+
struct Pixa** pixa, int** blockids, int** paraids)
419419
{
420420
return handle->GetComponentImages(level, text_only != FALSE, raw_image, raw_padding, pixa, blockids, paraids);
421421
}
@@ -825,37 +825,37 @@ TESS_API ETEXT_DESC* TESS_CALL TessMonitorCreate()
825825
return new ETEXT_DESC();
826826
}
827827

828-
TESS_API void TESS_CALL TessMonitorDelete( ETEXT_DESC* monitor )
828+
TESS_API void TESS_CALL TessMonitorDelete(ETEXT_DESC* monitor)
829829
{
830830
delete monitor;
831831
}
832832

833-
TESS_API void TESS_CALL TessMonitorSetCancelFunc( ETEXT_DESC* monitor, TessCancelFunc cancelFunc )
833+
TESS_API void TESS_CALL TessMonitorSetCancelFunc(ETEXT_DESC* monitor, TessCancelFunc cancelFunc)
834834
{
835835
monitor->cancel = cancelFunc;
836836
}
837837

838-
TESS_API void TESS_CALL TessMonitorSetCancelThis( ETEXT_DESC* monitor, void* cancelThis )
838+
TESS_API void TESS_CALL TessMonitorSetCancelThis(ETEXT_DESC* monitor, void* cancelThis)
839839
{
840840
monitor->cancel_this = cancelThis;
841841
}
842842

843-
TESS_API void* TESS_CALL TessMonitorGetCancelThis( ETEXT_DESC* monitor )
843+
TESS_API void* TESS_CALL TessMonitorGetCancelThis(ETEXT_DESC* monitor)
844844
{
845845
return monitor->cancel_this;
846846
}
847847

848-
TESS_API void TESS_CALL TessMonitorSetProgressFunc( ETEXT_DESC* monitor, TessProgressFunc progressFunc )
848+
TESS_API void TESS_CALL TessMonitorSetProgressFunc(ETEXT_DESC* monitor, TessProgressFunc progressFunc)
849849
{
850850
monitor->progress_callback2 = progressFunc;
851851
}
852852

853-
TESS_API int TESS_CALL TessMonitorGetProgress( ETEXT_DESC* monitor )
853+
TESS_API int TESS_CALL TessMonitorGetProgress(ETEXT_DESC* monitor)
854854
{
855855
return monitor->progress;
856856
}
857857

858-
TESS_API void TESS_CALL TessMonitorSetDeadlineMSecs( ETEXT_DESC* monitor, int deadline )
858+
TESS_API void TESS_CALL TessMonitorSetDeadlineMSecs(ETEXT_DESC* monitor, int deadline)
859859
{
860-
monitor->set_deadline_msecs( deadline );
860+
monitor->set_deadline_msecs(deadline);
861861
}

‎src/api/capi.h

+23-23
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ TESS_API void TESS_CALL TessBaseAPIDelete(TessBaseAPI* handle);
151151

152152
TESS_API size_t TESS_CALL TessBaseAPIGetOpenCLDevice(TessBaseAPI* handle, void **device);
153153

154-
TESS_API void TESS_CALL TessBaseAPISetInputName( TessBaseAPI* handle, const char* name);
154+
TESS_API void TESS_CALL TessBaseAPISetInputName(TessBaseAPI* handle, const char* name);
155155
TESS_API const char* TESS_CALL TessBaseAPIGetInputName(TessBaseAPI* handle);
156156

157157
TESS_API void TESS_CALL TessBaseAPISetInputImage(TessBaseAPI* handle, struct Pix* pix);
@@ -165,13 +165,13 @@ TESS_API void TESS_CALL TessBaseAPISetOutputName(TessBaseAPI* handle, const cha
165165
TESS_API BOOL TESS_CALL TessBaseAPISetVariable(TessBaseAPI* handle, const char* name, const char* value);
166166
TESS_API BOOL TESS_CALL TessBaseAPISetDebugVariable(TessBaseAPI* handle, const char* name, const char* value);
167167

168-
TESS_API BOOL TESS_CALL TessBaseAPIGetIntVariable( const TessBaseAPI* handle, const char* name, int* value);
169-
TESS_API BOOL TESS_CALL TessBaseAPIGetBoolVariable( const TessBaseAPI* handle, const char* name, BOOL* value);
168+
TESS_API BOOL TESS_CALL TessBaseAPIGetIntVariable(const TessBaseAPI* handle, const char* name, int* value);
169+
TESS_API BOOL TESS_CALL TessBaseAPIGetBoolVariable(const TessBaseAPI* handle, const char* name, BOOL* value);
170170
TESS_API BOOL TESS_CALL TessBaseAPIGetDoubleVariable(const TessBaseAPI* handle, const char* name, double* value);
171171
TESS_API const char*
172172
TESS_CALL TessBaseAPIGetStringVariable(const TessBaseAPI* handle, const char* name);
173173

174-
TESS_API void TESS_CALL TessBaseAPIPrintVariables( const TessBaseAPI* handle, FILE* fp);
174+
TESS_API void TESS_CALL TessBaseAPIPrintVariables(const TessBaseAPI* handle, FILE* fp);
175175
TESS_API BOOL TESS_CALL TessBaseAPIPrintVariablesToFile(const TessBaseAPI* handle, const char* filename);
176176

177177
#ifdef TESS_CAPI_INCLUDE_BASEAPI
@@ -231,27 +231,27 @@ TESS_API void TESS_CALL TessBaseAPISetThresholder(TessBaseAPI* handle, TessImag
231231
#endif
232232

233233
TESS_API struct Pix*
234-
TESS_CALL TessBaseAPIGetThresholdedImage( TessBaseAPI* handle);
234+
TESS_CALL TessBaseAPIGetThresholdedImage(TessBaseAPI* handle);
235235
TESS_API struct Boxa*
236-
TESS_CALL TessBaseAPIGetRegions( TessBaseAPI* handle, struct Pixa** pixa);
236+
TESS_CALL TessBaseAPIGetRegions(TessBaseAPI* handle, struct Pixa** pixa);
237237
TESS_API struct Boxa*
238-
TESS_CALL TessBaseAPIGetTextlines( TessBaseAPI* handle, struct Pixa** pixa, int** blockids);
238+
TESS_CALL TessBaseAPIGetTextlines(TessBaseAPI* handle, struct Pixa** pixa, int** blockids);
239239
TESS_API struct Boxa*
240-
TESS_CALL TessBaseAPIGetTextlines1( TessBaseAPI* handle, const BOOL raw_image, const int raw_padding,
241-
struct Pixa** pixa, int** blockids, int** paraids);
240+
TESS_CALL TessBaseAPIGetTextlines1(TessBaseAPI* handle, const BOOL raw_image, const int raw_padding,
241+
struct Pixa** pixa, int** blockids, int** paraids);
242242
TESS_API struct Boxa*
243-
TESS_CALL TessBaseAPIGetStrips( TessBaseAPI* handle, struct Pixa** pixa, int** blockids);
243+
TESS_CALL TessBaseAPIGetStrips(TessBaseAPI* handle, struct Pixa** pixa, int** blockids);
244244
TESS_API struct Boxa*
245-
TESS_CALL TessBaseAPIGetWords( TessBaseAPI* handle, struct Pixa** pixa);
245+
TESS_CALL TessBaseAPIGetWords(TessBaseAPI* handle, struct Pixa** pixa);
246246
TESS_API struct Boxa*
247247
TESS_CALL TessBaseAPIGetConnectedComponents(TessBaseAPI* handle, struct Pixa** cc);
248248
TESS_API struct Boxa*
249-
TESS_CALL TessBaseAPIGetComponentImages( TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only,
250-
struct Pixa** pixa, int** blockids);
249+
TESS_CALL TessBaseAPIGetComponentImages(TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only,
250+
struct Pixa** pixa, int** blockids);
251251
TESS_API struct Boxa*
252-
TESS_CALL TessBaseAPIGetComponentImages1( TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only,
253-
const BOOL raw_image, const int raw_padding,
254-
struct Pixa** pixa, int** blockids, int** paraids);
252+
TESS_CALL TessBaseAPIGetComponentImages1(TessBaseAPI* handle, const TessPageIteratorLevel level, const BOOL text_only,
253+
const BOOL raw_image, const int raw_padding,
254+
struct Pixa** pixa, int** blockids, int** paraids);
255255

256256
TESS_API int TESS_CALL TessBaseAPIGetThresholdedImageScaleFactor(const TessBaseAPI* handle);
257257

@@ -405,13 +405,13 @@ TESS_API float TESS_CALL TessChoiceIteratorConfidence(const TessChoiceIterator*
405405
/* Progress monitor */
406406

407407
TESS_API ETEXT_DESC* TESS_CALL TessMonitorCreate();
408-
TESS_API void TESS_CALL TessMonitorDelete( ETEXT_DESC* monitor );
409-
TESS_API void TESS_CALL TessMonitorSetCancelFunc( ETEXT_DESC* monitor, TessCancelFunc cancelFunc );
410-
TESS_API void TESS_CALL TessMonitorSetCancelThis( ETEXT_DESC* monitor, void* cancelThis );
411-
TESS_API void* TESS_CALL TessMonitorGetCancelThis( ETEXT_DESC* monitor );
412-
TESS_API void TESS_CALL TessMonitorSetProgressFunc( ETEXT_DESC* monitor, TessProgressFunc progressFunc );
413-
TESS_API int TESS_CALL TessMonitorGetProgress( ETEXT_DESC* monitor );
414-
TESS_API void TESS_CALL TessMonitorSetDeadlineMSecs( ETEXT_DESC* monitor, int deadline );
408+
TESS_API void TESS_CALL TessMonitorDelete(ETEXT_DESC* monitor);
409+
TESS_API void TESS_CALL TessMonitorSetCancelFunc(ETEXT_DESC* monitor, TessCancelFunc cancelFunc);
410+
TESS_API void TESS_CALL TessMonitorSetCancelThis(ETEXT_DESC* monitor, void* cancelThis);
411+
TESS_API void* TESS_CALL TessMonitorGetCancelThis(ETEXT_DESC* monitor);
412+
TESS_API void TESS_CALL TessMonitorSetProgressFunc(ETEXT_DESC* monitor, TessProgressFunc progressFunc);
413+
TESS_API int TESS_CALL TessMonitorGetProgress(ETEXT_DESC* monitor);
414+
TESS_API void TESS_CALL TessMonitorSetDeadlineMSecs(ETEXT_DESC* monitor, int deadline);
415415

416416

417417
#ifndef DISABLED_LEGACY_ENGINE

‎src/ccstruct/statistc.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ void STATS::plot(ScrollView* window, // to draw in
593593
window->Pen(colour);
594594

595595
for (int index = 0; index < rangemax_ - rangemin_; index++) {
596-
window->Rectangle( xorigin + xscale * index, yorigin,
596+
window->Rectangle(xorigin + xscale * index, yorigin,
597597
xorigin + xscale * (index + 1),
598598
yorigin + yscale * buckets_[index]);
599599
}

‎src/ccstruct/statistc.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class STATS {
7575
// between 6 and 13 = 9.5
7676
double median() const; // get median of samples
7777
// Returns the count of the given value.
78-
int32_t pile_count(int32_t value ) const {
78+
int32_t pile_count(int32_t value) const {
7979
if (value <= rangemin_)
8080
return buckets_[0];
8181
if (value >= rangemax_ - 1)

‎src/ccutil/clst.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -782,10 +782,10 @@ inline void CLIST_ITERATOR::add_to_end( // element to add
782782
Replace <parm> with "<parm>". <parm> may be an arbitrary number of tokens
783783
***********************************************************************/
784784

785-
#define QUOTE_IT( parm ) #parm
785+
#define QUOTE_IT(parm) #parm
786786

787787
/***********************************************************************
788-
CLISTIZE( CLASSNAME ) MACRO DEFINITION
788+
CLISTIZE(CLASSNAME) MACRO DEFINITION
789789
======================================
790790
791791
CLASSNAME is assumed to be the name of a class to be used in a CONS list
@@ -810,7 +810,7 @@ The ...IZE macros define the code use in .c files
810810
***********************************************************************/
811811

812812
/***********************************************************************
813-
CLISTIZEH( CLASSNAME ) MACRO
813+
CLISTIZEH(CLASSNAME) MACRO
814814
815815
CLISTIZEH is a concatenation of 3 fragments CLISTIZEH_A, CLISTIZEH_B and
816816
CLISTIZEH_C.
@@ -907,7 +907,7 @@ CLISTIZEH_C.
907907
CLISTIZEH_C(CLASSNAME)
908908

909909
/***********************************************************************
910-
CLISTIZE( CLASSNAME ) MACRO
910+
CLISTIZE(CLASSNAME) MACRO
911911
***********************************************************************/
912912

913913
#define CLISTIZE(CLASSNAME) \

‎src/ccutil/elst.h

+10-10
Original file line numberDiff line numberDiff line change
@@ -826,10 +826,10 @@ inline void ELIST_ITERATOR::add_to_end( // element to add
826826
Replace <parm> with "<parm>". <parm> may be an arbitrary number of tokens
827827
***********************************************************************/
828828

829-
#define QUOTE_IT( parm ) #parm
829+
#define QUOTE_IT(parm) #parm
830830

831831
/***********************************************************************
832-
ELISTIZE( CLASSNAME ) MACRO
832+
ELISTIZE(CLASSNAME) MACRO
833833
============================
834834
835835
CLASSNAME is assumed to be the name of a class which has a baseclass of
@@ -852,7 +852,7 @@ The ...IZE macros define the code use in .c files
852852
***********************************************************************/
853853

854854
/***********************************************************************
855-
ELISTIZEH( CLASSNAME ) MACRO
855+
ELISTIZEH(CLASSNAME) MACRO
856856
857857
ELISTIZEH is a concatenation of 3 fragments ELISTIZEH_A, ELISTIZEH_B and
858858
ELISTIZEH_C.
@@ -893,10 +893,10 @@ private: \
893893
DONT_CONSTRUCT_LIST_BY_COPY.error(QUOTE_IT(CLASSNAME##_LIST), ABORT, nullptr);\
894894
} \
895895
void operator=(const CLASSNAME##_LIST&) { \
896-
DONT_ASSIGN_LISTS.error(QUOTE_IT(CLASSNAME##_LIST), ABORT, nullptr ); \
896+
DONT_ASSIGN_LISTS.error(QUOTE_IT(CLASSNAME##_LIST), ABORT, nullptr); \
897897
} \
898898

899-
#define ELISTIZEH_C( CLASSNAME ) \
899+
#define ELISTIZEH_C(CLASSNAME) \
900900
}; \
901901
\
902902
\
@@ -945,17 +945,17 @@ class DLLSYM CLASSNAME##_IT : public ELIST_ITERATOR { \
945945
} \
946946
};
947947

948-
#define ELISTIZEH( CLASSNAME ) \
948+
#define ELISTIZEH(CLASSNAME) \
949949
\
950-
ELISTIZEH_A( CLASSNAME ) \
950+
ELISTIZEH_A(CLASSNAME) \
951951
\
952-
ELISTIZEH_B( CLASSNAME ) \
952+
ELISTIZEH_B(CLASSNAME) \
953953
\
954-
ELISTIZEH_C( CLASSNAME )
954+
ELISTIZEH_C(CLASSNAME)
955955

956956

957957
/***********************************************************************
958-
ELISTIZE( CLASSNAME ) MACRO
958+
ELISTIZE(CLASSNAME) MACRO
959959
***********************************************************************/
960960

961961
#define ELISTIZE(CLASSNAME) \

‎src/ccutil/elst2.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ int32_t ELIST2::length() const { // count elements
102102
*
103103
* Sort elements on list
104104
* NB If you don't like the const declarations in the comparator, coerce yours:
105-
* ( int (*)(const void *, const void *)
105+
* (int (*)(const void *, const void *)
106106
**********************************************************************/
107107

108108
void

‎src/ccutil/elst2.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -824,10 +824,10 @@ inline void ELIST2_ITERATOR::add_to_end( // element to add
824824
Replace <parm> with "<parm>". <parm> may be an arbitrary number of tokens
825825
***********************************************************************/
826826

827-
#define QUOTE_IT( parm ) #parm
827+
#define QUOTE_IT(parm) #parm
828828

829829
/***********************************************************************
830-
ELIST2IZE( CLASSNAME ) MACRO DEFINITION
830+
ELIST2IZE(CLASSNAME) MACRO DEFINITION
831831
======================================
832832
833833
CLASSNAME is assumed to be the name of a class which has a baseclass of
@@ -851,7 +851,7 @@ The ...IZE macros define the code use in .c files
851851
***********************************************************************/
852852

853853
/***********************************************************************
854-
ELIST2IZEH( CLASSNAME ) MACRO
854+
ELIST2IZEH(CLASSNAME) MACRO
855855
856856
ELIST2IZEH is a concatenation of 3 fragments ELIST2IZEH_A, ELIST2IZEH_B and
857857
ELIST2IZEH_C.
@@ -955,7 +955,7 @@ ELIST2IZEH_C.
955955
ELIST2IZEH_C(CLASSNAME)
956956

957957
/***********************************************************************
958-
ELIST2IZE( CLASSNAME ) MACRO
958+
ELIST2IZE(CLASSNAME) MACRO
959959
***********************************************************************/
960960

961961
#define ELIST2IZE(CLASSNAME) \

‎src/ccutil/ocrclass.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ class ETEXT_DESC { // output header
142142
err_code(0),
143143
cancel(nullptr),
144144
progress_callback(nullptr),
145-
progress_callback2( &default_progress_func ),
145+
progress_callback2(&default_progress_func),
146146
cancel_this(nullptr) {
147147
end_time.tv_sec = 0;
148148
end_time.tv_usec = 0;
@@ -173,7 +173,7 @@ class ETEXT_DESC { // output header
173173
static bool default_progress_func(ETEXT_DESC* ths, int left, int right, int top,
174174
int bottom)
175175
{
176-
if ( ths->progress_callback ) {
176+
if (ths->progress_callback) {
177177
return (*(ths->progress_callback))(ths->progress, left, right, top, bottom);
178178
}
179179
return true;

‎src/ccutil/scanutils.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) {
360360

361361
scan_int:
362362
q = SkipSpace(stream);
363-
if ( q <= 0 ) {
363+
if (q <= 0) {
364364
bail = BAIL_EOF;
365365
break;
366366
}
@@ -471,7 +471,7 @@ static int tvfscanf(FILE* stream, const char *format, va_list ap) {
471471
break;
472472

473473
case '%': // %% sequence
474-
if (fgetc(stream) != '%' )
474+
if (fgetc(stream) != '%')
475475
bail = BAIL_ERR;
476476
break;
477477

‎src/ccutil/serialis.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class STRING;
3434
Replace <parm> with "<parm>". <parm> may be an arbitrary number of tokens
3535
***********************************************************************/
3636

37-
#define QUOTE_IT( parm ) #parm
37+
#define QUOTE_IT(parm) #parm
3838

3939
namespace tesseract {
4040

0 commit comments

Comments
 (0)