diff -U 3 -H -d -r -N -- gui/src/ccom/ccom.cpp disk_D/gui/trunk/src/ccom/ccom.cpp --- gui/src/ccom/ccom.cpp 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/ccom/ccom.cpp 2011-02-17 20:05:39.140625000 +0200 @@ -307,7 +307,7 @@ if (size_lrep && lines > 0 && lines) { comp->size_linerep = (int16_t) size_lrep; comp->linerep = static_cast (calloc(1, size_lrep + 2)); - + printf("Size_lrep=%i",size_lrep); if (!comp->linerep || size_lrep == -1) // OLEG & ANTON : very large components return FALSE; diff -U 3 -H -d -r -N -- gui/src/cimage/cticontrol.cpp disk_D/gui/trunk/src/cimage/cticontrol.cpp --- gui/src/cimage/cticontrol.cpp 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/cimage/cticontrol.cpp 2011-02-16 21:52:42.880494800 +0200 @@ -57,8 +57,10 @@ #include "cticontrol.h" #include "ctimemory.h" #include "dpuma.h" - +#include +#include #include +using namespace std; CTIControl::CTIControl() { init(); @@ -316,10 +318,10 @@ Bool32 CTIControl::SetDIB(const char* lpName, Handle hDIB, uint32_t wFlag) { Handle hImage = NULL; - if (wFlag == FALSE) { // создаем новую копию if (!CopyDIB(hDIB, &hImage)) { - fprintf(stderr, "CTIControl::SetDIB: UNABLE COPY DIB: %s\n", lpName); + cerr << "CTIControl::SetDIB: UNABLE COPY DIB: " << lpName << endl; + // fprintf(stderr, "CTIControl::SetDIB: UNABLE COPY DIB: %s\n", lpName); SetReturnCode_cimage(IDS_CIMAGE_UNABLE_COPY_DIB); return FALSE; } @@ -336,7 +338,8 @@ Handle hImage = NULL; // Handle // открываем картинку if (!OpenDIBFromList(lpName, &hImage)) { - fprintf(stderr, "CTIControl::GetDIB failed: %s\n", lpName); + cerr << "CTIControl::GetDIB failed: " << lpName << endl; + // fprintf(stderr, "CTIControl::GetDIB failed: %s\n", lpName); return FALSE; } @@ -345,7 +348,8 @@ // открываем маски (если есть) if (!OpenMaskFromList(lpName, &mpcSrcDIBReadMask, &mbEnableDIBReadMask, "r") || !OpenMaskFromList(lpName, &mpcSrcDIBWriteMask, &mbEnableDIBWriteMask, "w")) { - fprintf(stderr, "CTIControl::GetDIB mask open failed: %s\n", lpName); + cerr << "CTIControl::GetDIB mask open failed: " << lpName << endl; + // fprintf(stderr, "CTIControl::GetDIB mask open failed: %s\n", lpName); return FALSE; } diff -U 3 -H -d -r -N -- gui/src/cstr/cstr.cpp disk_D/gui/trunk/src/cstr/cstr.cpp --- gui/src/cstr/cstr.cpp 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/cstr/cstr.cpp 2011-02-17 07:43:06.843750000 +0200 @@ -63,7 +63,7 @@ #include "resource.h" static CSTR_head head, tail; -static int32_t num_lines = 0, num_fragments0 = 0, num_fragments1 = 0; +static size_t num_lines = 0, num_fragments0 = 0, num_fragments1 = 0; static int32_t user_number = 0xFFFFFF + 1; uint16_t wHeightRC = 0; uint16_t wLowRC = CSTR_ERR_NO; @@ -169,7 +169,7 @@ ////////////////////////////////// // alloc / free & access lines to ////////////////////////////////// -CSTR_line CSTR_NewLine(int32_t lineno, int32_t version) +CSTR_line CSTR_NewLine(size_t lineno, size_t version) { CSTR_head *line = head.next, *lineins = 0, *prev, *next; @@ -489,7 +489,7 @@ return TRUE; } -CSTR_line CSTR_GetLineHandle(int32_t line_no, int32_t version) +CSTR_line CSTR_GetLineHandle(size_t line_no, size_t version) { CSTR_head *line = head.next; @@ -532,7 +532,7 @@ return (CSTR_line) 0; } -int32_t CSTR_GetMaxNumber(void) +size_t CSTR_GetMaxNumber(void) { return num_lines; } @@ -2132,12 +2132,12 @@ return TRUE; } -int32_t CSTR_GetMaxFragment(int32_t version) +size_t CSTR_GetMaxFragment(size_t version) { return version ? num_fragments1 : num_fragments0; } -CSTR_line CSTR_FirstLineFragm(int32_t fragm, int32_t version) +CSTR_line CSTR_FirstLineFragm(size_t fragm, size_t version) { if (version != 1 && version != 0) { wLowRC = CSTR_ERR_VALUE; diff -U 3 -H -d -r -N -- gui/src/cstr/cstrdefs.h disk_D/gui/trunk/src/cstr/cstrdefs.h --- gui/src/cstr/cstrdefs.h 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/cstr/cstrdefs.h 2011-02-17 18:52:18.953125000 +0200 @@ -136,7 +136,7 @@ int32_t number; int32_t version; // 120 - uchar colors[4]; + uchar colors[4]; //-V112 // 124 int16_t agregat_row; uchar tab_number; diff -U 3 -H -d -r -N -- gui/src/cstr/cstr.h disk_D/gui/trunk/src/cstr/cstr.h --- gui/src/cstr/cstr.h 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/cstr/cstr.h 2011-02-17 07:35:36.453125000 +0200 @@ -162,9 +162,9 @@ }; // 1 CSTR_FNNEWLINE Образовать новую строку -typedef CSTR_line (*FNCSTR_NewLine)(int32_t lineno, int32_t version, +typedef CSTR_line (*FNCSTR_NewLine)(size_t lineno, size_t version, int32_t container); -CSTR_FUNC CSTR_line CSTR_NewLine(int32_t lineno, int32_t version); +CSTR_FUNC CSTR_line CSTR_NewLine(size_t lineno, size_t version); // 2 CSTR_FNDELLINE Удалить строку typedef Bool32 (*FNCSTR_DeleteLine)(CSTR_line line); CSTR_FUNC Bool32 CSTR_DeleteLine(CSTR_line line); @@ -246,8 +246,8 @@ typedef Bool32 (*FNCSTR_CopyLine)(CSTR_line trg, CSTR_line src); CSTR_FUNC Bool32 CSTR_CopyLine(CSTR_line trg, CSTR_line src); // 24 CSTR_FNGETLNHND дать хендл строки по номеру и версии -typedef CSTR_line (*FNCSTR_GetLineHandle)(int32_t line_no, int32_t version); -CSTR_FUNC CSTR_line CSTR_GetLineHandle(int32_t line_no, int32_t version); +typedef CSTR_line (*FNCSTR_GetLineHandle)(size_t line_no, size_t version); +CSTR_FUNC CSTR_line CSTR_GetLineHandle(size_t line_no, size_t version); // 25 CSTR_FNGETCOMP получить компонентy растра typedef CCOM_comp * (*FNCSTR_GetComp)(CSTR_rast curr_raster); CSTR_FUNC CCOM_comp * CSTR_GetComp(CSTR_rast curr_raster); @@ -261,8 +261,8 @@ typedef CSTR_rast (*FNCSTR_InsertRaster)(CSTR_rast curr_raster); CSTR_FUNC CSTR_rast CSTR_InsertRaster(CSTR_rast curr_raster); // 30 CSTR_FNMAXNUM наибольший номер строки в контейнере -typedef int32_t (*FNCSTR_GetMaxNumber)(void); -CSTR_FUNC int32_t CSTR_GetMaxNumber(void); +typedef size_t (*FNCSTR_GetMaxNumber)(void); +CSTR_FUNC size_t CSTR_GetMaxNumber(void); // 31 CSTR_FNFIRSTLN первая строка указанной версии typedef CSTR_line (*FNCSTR_FirstLine)(int32_t version); CSTR_FUNC CSTR_line CSTR_FirstLine(int32_t version); @@ -356,8 +356,8 @@ typedef Bool32 (*FNCSTR_SortFragm)(int32_t version); CSTR_FUNC Bool32 CSTR_SortFragm(int32_t version); // 59 CSTR_FNFIRSTLINEFRAGM первая во фрагменте -typedef CSTR_line (*FNCSTR_FirstLineFragm)(int32_t fragm, int32_t version); -CSTR_FUNC CSTR_line CSTR_FirstLineFragm(int32_t fragm, int32_t version); +typedef CSTR_line (*FNCSTR_FirstLineFragm)(size_t fragm, size_t version); +CSTR_FUNC CSTR_line CSTR_FirstLineFragm(size_t fragm, size_t version); // 60 CSTR_FNNEXTLINEFRAGM следующая по фрагменту typedef CSTR_line (*FNCSTR_NextLineFragm)(CSTR_line start); CSTR_FUNC CSTR_line CSTR_NextLineFragm(CSTR_line start); @@ -367,8 +367,8 @@ CSTR_FUNC Bool32 CSTR_StoreCompOriginal(CSTR_rast curr_raster, CCOM_comp * comp, Bool32 raster_init); // 62 CSTR_FNGETMAXFRAGMENT максимальный номер фрагмента -typedef int32_t (*FNCSTR_GetMaxFragment)(int32_t version); -CSTR_FUNC int32_t CSTR_GetMaxFragment(int32_t version); +typedef size_t (*FNCSTR_GetMaxFragment)(size_t version); +CSTR_FUNC size_t CSTR_GetMaxFragment(size_t version); // 63 CSTR_SAVECONT сохранить контейнер на диске typedef Bool32 (*FNCSTR_SaveCont)(const char *filename); CSTR_FUNC Bool32 CSTR_SaveCont(const char *filename); diff -U 3 -H -d -r -N -- gui/src/h/recdefs.h disk_D/gui/trunk/src/h/recdefs.h --- gui/src/h/recdefs.h 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/h/recdefs.h 2011-02-17 18:52:11.812500000 +0200 @@ -117,7 +117,7 @@ uint16_t Info; } RecAlt; typedef struct tagUniAlt { - uchar Code[4]; + uchar Code[4]; //-V112 uchar Liga; // for unicode uchar Method; // recognize method uchar Prob; diff -U 3 -H -d -r -N -- gui/src/puma/pumaimpl.cpp disk_D/gui/trunk/src/puma/pumaimpl.cpp --- gui/src/puma/pumaimpl.cpp 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/puma/pumaimpl.cpp 2011-02-17 18:52:36.531250000 +0200 @@ -160,7 +160,7 @@ if (info_.biBitCount > 1) { //RIMAGE_BINARISE_KRONROD - if (!RIMAGE_Binarise(PUMA_IMAGE_USER, PUMA_IMAGE_BINARIZE, 4, 0)) + if (!RIMAGE_Binarise(PUMA_IMAGE_USER, PUMA_IMAGE_BINARIZE, 4, 0)) //-V112 throw PumaException("RIMAGE_Binarise failed"); if (!CIMAGE_ReadDIB(PUMA_IMAGE_BINARIZE, (Handle*) input_dib_, TRUE)) @@ -354,7 +354,7 @@ void* MemBuf = cf::PumaImpl::mainBuffer(); size_t size_buf = cf::PumaImpl::MainBufferSize; void* MemWork = cf::PumaImpl::workBuffer(); - int size_work = cf::PumaImpl::WorkBufferSize; + size_t size_work = cf::PumaImpl::WorkBufferSize; // калбэки if (RSTUFF_SetImportData(RSTUFF_FN_SetProgresspoints, &CBforRS)) { @@ -584,8 +584,8 @@ void PumaImpl::pass2special() { double s = 0; - int n = CSTR_GetMaxNumber(); - for (int i = 1; i <= n; i++) { + size_t n = CSTR_GetMaxNumber(); + for (size_t i = 1; i <= n; i++) { CSTR_line lin_ruseng = CSTR_GetLineHandle(i, 1); s += portion_of_rus_letters(lin_ruseng); } @@ -594,7 +594,7 @@ s /= (double) n; if (n && s < 0.4) { - for (int i = 0; i <= n; i++) { + for (size_t i = 0; i <= n; i++) { for (int j = 1; j < 10; j++) { CSTR_line lin_ruseng = CSTR_GetLineHandle(i, j); @@ -655,7 +655,7 @@ } void PumaImpl::printResult(std::ostream& os) { - for (int i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) + for (size_t i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) printResultLine(os, i); } @@ -751,18 +751,18 @@ CSTR_SortFragm(0); CSTR_line ln; CSTR_attr attr; - int32_t nf = CSTR_GetMaxFragment(0); + size_t nf = CSTR_GetMaxFragment(0); Handle hBlock = CPAGE_GetBlockFirst(cpage_, TYPE_TEXT); if (hBlock) { AutoBuffer flagfrag(nf); - for (int i = 0; hBlock && i < nf; i++) { + for (size_t i = 0; hBlock && i < nf; i++) { flagfrag[i] = CPAGE_GetBlockFlags(cpage_, hBlock); hBlock = CPAGE_GetBlockNext(cpage_, hBlock, TYPE_TEXT); } - for (int i = 1; i <= nf; i++) { + for (size_t i = 1; i <= nf; i++) { ln = CSTR_FirstLineFragm(i, 0); if (ln) { @@ -816,12 +816,12 @@ RPSTR_CorrectIncline(1); if (Config::instance().debugDump()) - saveCSTR(4); + saveCSTR(4); //-V112 } void PumaImpl::recognizePass1() { // распознавание строк - for (int i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) { + for (size_t i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) { CSTR_line lin_out = CSTR_NewLine(i, CSTR_LINVERS_MAINOUT); // OLEG if (!lin_out) @@ -869,7 +869,7 @@ uchar w8 = 1; RSTR_SetImportData(RSTR_Word8_P2_active, &w8); - for (int i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) { + for (size_t i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) { CSTR_line lin_out = CSTR_GetLineHandle(i, CSTR_LINVERS_MAINOUT); if (!lin_out) @@ -938,13 +938,13 @@ char * pb = buf; global_buf_len = 0; - for (int i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) { + for (size_t i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) { CSTR_line buf_line = CSTR_GetLineHandle(i, 1); CSTR_LineToTxt_Coord(buf_line, buf_str, 1023); strcpy(pb, buf_str); - int len = strlen(pb); + size_t len = strlen(pb); pb += len + 1; - global_buf_len += len + 1; + global_buf_len += len + 1; //TODO need corection V103 Implicit type conversion from memsize to 32-bit type. cuneiform pumaimpl.cpp 947 False } *pb = 0; @@ -1022,7 +1022,7 @@ } void PumaImpl::saveToText(ostream& os) const { - for (int i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) { + for (size_t i = 1, count = CSTR_GetMaxNumber(); i <= count; i++) { CSTR_line lin_out = CSTR_GetLineHandle(i, 1); // OLEG if (!lin_out) diff -U 3 -H -d -r -N -- gui/src/rmarker/dll.cpp disk_D/gui/trunk/src/rmarker/dll.cpp --- gui/src/rmarker/dll.cpp 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/rmarker/dll.cpp 2011-02-16 19:49:08.378398000 +0200 @@ -100,8 +100,8 @@ Handle hEnd; Handle hSegment; -Bool32 RMARKER_PageMarkup(PRMPreProcessImage Image, void* vBuff, int Size, void* vWork, - int SizeWork) +Bool32 RMARKER_PageMarkup(PRMPreProcessImage Image, void* vBuff, size_t Size, void* vWork, + size_t SizeWork) { SetMainBuff(vBuff, Size); SetWorkBuff(vWork, SizeWork); diff -U 3 -H -d -r -N -- gui/src/rmarker/rmarker.h disk_D/gui/trunk/src/rmarker/rmarker.h --- gui/src/rmarker/rmarker.h 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/rmarker/rmarker.h 2011-02-17 07:20:25.734375000 +0200 @@ -134,6 +134,6 @@ }; const int PUMAMaxNumLines = 2000; -FUN_EXPO__ Bool32 RMARKER_PageMarkup(PRMPreProcessImage, void*, int, void*, int); +FUN_EXPO__ Bool32 RMARKER_PageMarkup(PRMPreProcessImage, void*, size_t, void*, size_t); #endif diff -U 3 -H -d -r -N -- gui/src/rmarker/rmarkermem.cpp disk_D/gui/trunk/src/rmarker/rmarkermem.cpp --- gui/src/rmarker/rmarkermem.cpp 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/rmarker/rmarkermem.cpp 2011-02-16 19:49:30.472006600 +0200 @@ -76,13 +76,13 @@ *Size = WorkMemSize; } -void SetMainBuff(void *vBuff, int Size) +void SetMainBuff(void *vBuff, size_t Size) { Buffer = (uchar*)vBuff; BufferSize = Size; } -void SetWorkBuff(void *vBuff, int Size) +void SetWorkBuff(void *vBuff, size_t Size) { WorkMem = (uchar*)vBuff; WorkMemSize = Size; diff -U 3 -H -d -r -N -- gui/src/rmarker/rmfunc.h disk_D/gui/trunk/src/rmarker/rmfunc.h --- gui/src/rmarker/rmfunc.h 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/rmarker/rmfunc.h 2011-02-17 07:47:26.625000000 +0200 @@ -81,8 +81,8 @@ Bool32 SearchFon(PRMPreProcessImage, BIG_IMAGE, int); void GiveMainBuff(void **vvBuff, int *Size); void GiveWorkBuff(char **ccBuff, int *Size); -void SetMainBuff(void *vBuff, int Size); -void SetWorkBuff(void *vBuff, int Size); +void SetMainBuff(void *vBuff, size_t Size); +void SetWorkBuff(void *vBuff, size_t Size); void ReSetMem(void); #endif diff -U 3 -H -d -r -N -- gui/src/rstuff/dll.cpp disk_D/gui/trunk/src/rstuff/dll.cpp --- gui/src/rstuff/dll.cpp 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/rstuff/dll.cpp 2011-02-16 19:39:11.757405900 +0200 @@ -310,7 +310,7 @@ } ////////////////////////////////////////////////////////////////////////////////// // -RSTUFF_FUNC(Bool32) RSTUFF_RSNormalise( PRSPreProcessImage Image,void* vBuff,int Size,void* vWork,int SizeWork ) +RSTUFF_FUNC(Bool32) RSTUFF_RSNormalise( PRSPreProcessImage Image,void* vBuff,size_t Size,void* vWork,size_t SizeWork ) { SetReturnCode_rstuff((uint16_t)0); SetMainBuff(vBuff,Size); diff -U 3 -H -d -r -N -- gui/src/rstuff/rsfunc.h disk_D/gui/trunk/src/rstuff/rsfunc.h --- gui/src/rstuff/rsfunc.h 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/rstuff/rsfunc.h 2011-02-16 19:41:15.568924000 +0200 @@ -122,8 +122,8 @@ Bool32 AboutLines(PRSPreProcessImage, Bool32 *, int32_t *); void GiveMainBuff(void **vvBuff, int *Size); void GiveWorkBuff(char **ccBuff, int *Size); -void SetMainBuff(void *vBuff, int Size); -void SetWorkBuff(void *vBuff, int Size); +void SetMainBuff(void *vBuff, size_t Size); +void SetWorkBuff(void *vBuff, size_t Size); void ReSetMem(void); ///////////////////////////////////////////////////////////////////////////////////////////////////// // обработка коротких вертикальных линий diff -U 3 -H -d -r -N -- gui/src/rstuff/rsmemory.cpp disk_D/gui/trunk/src/rstuff/rsmemory.cpp --- gui/src/rstuff/rsmemory.cpp 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/rstuff/rsmemory.cpp 2011-02-16 19:40:07.413110200 +0200 @@ -77,8 +77,8 @@ uchar* Buffer = NULL; uchar* WorkMem = NULL; -int BufferSize = 0; -int WorkMemSize = 0; +size_t BufferSize = 0; +size_t WorkMemSize = 0; Bool32 InitCFIOInterface(Bool32 Status) { Bool32 bRet = TRUE; @@ -266,12 +266,12 @@ *Size = WorkMemSize; } -void SetMainBuff(void *vBuff, int Size) { +void SetMainBuff(void *vBuff, size_t Size) { Buffer = (uchar*) vBuff; BufferSize = Size; } -void SetWorkBuff(void *vBuff, int Size) { +void SetWorkBuff(void *vBuff, size_t Size) { WorkMem = (uchar*) vBuff; WorkMemSize = Size; } diff -U 3 -H -d -r -N -- gui/src/rstuff/rstuff.h disk_D/gui/trunk/src/rstuff/rstuff.h --- gui/src/rstuff/rstuff.h 2011-02-04 07:33:59.000000000 +0200 +++ disk_D/gui/trunk/src/rstuff/rstuff.h 2011-02-17 07:18:28.765625000 +0200 @@ -142,7 +142,7 @@ /* Описание функций */ #define DEC_FUN(a,b,c) typedef a (*FNRSTUFF##b)c; RSTUFF_FUNC(a) RSTUFF_##b c; DEC_FUN(Bool32, RSBinarise, (void)) -DEC_FUN(Bool32, RSNormalise, (PRSPreProcessImage, void* vBuff, int Size, void* vWork, int SizeWork)) +DEC_FUN(Bool32, RSNormalise, (PRSPreProcessImage, void* vBuff, size_t Size, void* vWork, size_t SizeWork)) DEC_FUN(Bool32, RSNormVerify, (PRSPreProcessImage)) DEC_FUN(Bool32, RSNormRemoveLines, (PRSPreProcessImage)) DEC_FUN(Bool32, RSLayout, (PRSPreProcessImage))