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

textord/makerow.cpp: Fix compiler warnings

Browse Source 
Compiler warnings from clang:

src/textord/makerow.cpp:2579:36: warning:
 cast from 'const void *' to 'BLOBNBOX **' drops const qualifier [-Wcast-qual]
src/textord/makerow.cpp:2581:36: warning:
 cast from 'const void *' to 'BLOBNBOX **' drops const qualifier [-Wcast-qual]
src/textord/makerow.cpp:2601:31: warning:
 cast from 'const void *' to 'TO_ROW **' drops const qualifier [-Wcast-qual]
src/textord/makerow.cpp:2603:31: warning:
 cast from 'const void *' to 'TO_ROW **' drops const qualifier [-Wcast-qual]
src/textord/makerow.cpp:2623:31: warning:
 cast from 'const void *' to 'TO_ROW **' drops const qualifier [-Wcast-qual]
src/textord/makerow.cpp:2625:31: warning:
 cast from 'const void *' to 'TO_ROW **' drops const qualifier [-Wcast-qual]

Warning from lgtm:

Local variable 'blob' hides a parameter of the same name.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2018-09-03 11:40:39 +02:00
parent e74c88a4d3
commit 2cc7839af7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/textord/makerow.cpp
View File

@ -144,7 +144,7 @@ static float MakeRowFromSubBlobs(TO_BLOCK* block, C_BLOB* blob,
return 0.0f; return 0.0f;
for (ol_it.mark_cycle_pt(); !ol_it.cycled_list(); ol_it.forward()) { for (ol_it.mark_cycle_pt(); !ol_it.cycled_list(); ol_it.forward()) {
// Deep copy the child outline and use that to make a blob. // Deep copy the child outline and use that to make a blob.
C_BLOB* blob = new C_BLOB(C_OUTLINE::deep_copy(ol_it.data())); blob = new C_BLOB(C_OUTLINE::deep_copy(ol_it.data()));
// Correct direction as needed. // Correct direction as needed.
blob->CheckInverseFlagAndDirection(); blob->CheckInverseFlagAndDirection();
BLOBNBOX* bbox = new BLOBNBOX(blob); BLOBNBOX* bbox = new BLOBNBOX(blob);
@ -2576,9 +2576,9 @@ int blob_x_order( //sort function
const void *item1, //items to compare const void *item1, //items to compare
const void *item2) { const void *item2) {
//converted ptr //converted ptr
BLOBNBOX *blob1 = *(BLOBNBOX **) item1; const BLOBNBOX *blob1 = *reinterpret_cast<const BLOBNBOX* const*>(item1);
//converted ptr //converted ptr
BLOBNBOX *blob2 = *(BLOBNBOX **) item2; const BLOBNBOX *blob2 = *reinterpret_cast<const BLOBNBOX* const*>(item2);
if (blob1->bounding_box ().left () < blob2->bounding_box ().left ()) if (blob1->bounding_box ().left () < blob2->bounding_box ().left ())
return -1; return -1;
@ -2598,9 +2598,9 @@ int row_y_order( //sort function
const void *item1, //items to compare const void *item1, //items to compare
const void *item2) { const void *item2) {
//converted ptr //converted ptr
TO_ROW *row1 = *(TO_ROW **) item1; const TO_ROW *row1 = *reinterpret_cast<const TO_ROW* const*>(item1);
//converted ptr //converted ptr
TO_ROW *row2 = *(TO_ROW **) item2; const TO_ROW *row2 = *reinterpret_cast<const TO_ROW* const*>(item2);
if (row1->parallel_c () > row2->parallel_c ()) if (row1->parallel_c () > row2->parallel_c ())
return -1; return -1;
@ -2620,9 +2620,9 @@ int row_spacing_order( //sort function
const void *item1, //items to compare const void *item1, //items to compare
const void *item2) { const void *item2) {
//converted ptr //converted ptr
TO_ROW *row1 = *(TO_ROW **) item1; const TO_ROW *row1 = *reinterpret_cast<const TO_ROW* const*>(item1);
//converted ptr //converted ptr
TO_ROW *row2 = *(TO_ROW **) item2; const TO_ROW *row2 = *reinterpret_cast<const TO_ROW* const*>(item2);
if (row1->spacing < row2->spacing) if (row1->spacing < row2->spacing)
return -1; return -1;