mirror/tesseract
1
0
Fork 0
mirror of https://github.com/tesseract-ocr/tesseract.git synced 2025-01-22 09:53:03 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Remove redundant debug code for CLIST

Browse Source 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
This commit is contained in:
Stefan Weil 2021-04-06 15:26:04 +02:00
parent b47ce5643b
commit fb904d2265
2 changed files with 0 additions and 117 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/ccutil/clst.cpp
View File

@ -211,10 +211,6 @@ void CLIST::set_subtract(int comparator(const void *, const void *), bool unique
**********************************************************************/ **********************************************************************/
void *CLIST_ITERATOR::forward() { void *CLIST_ITERATOR::forward() {
#ifndef NDEBUG
if (!list)
NO_LIST.error("CLIST_ITERATOR::forward", ABORT, nullptr);
#endif
if (list->empty()) { if (list->empty()) {
return nullptr; return nullptr;
} }
@ -232,13 +228,6 @@ void *CLIST_ITERATOR::forward() {
current = next; current = next;
} }
#ifndef NDEBUG
if (!current)
NULL_DATA.error("CLIST_ITERATOR::forward", ABORT, nullptr);
if (!next)
NULL_NEXT.error("CLIST_ITERATOR::forward", ABORT, "This is: %p Current is: %p", this, current);
#endif
next = current->next; next = current->next;
return current->data; return current->data;
} }
@ -272,11 +261,6 @@ void *CLIST_ITERATOR::data_relative( // get data + or - ...
} }
} }
#ifndef NDEBUG
if (!ptr)
NULL_DATA.error("CLIST_ITERATOR::data_relative", ABORT, nullptr);
#endif
return ptr->data; return ptr->data;
} }
@ -289,11 +273,6 @@ void *CLIST_ITERATOR::data_relative( // get data + or - ...
**********************************************************************/ **********************************************************************/
void *CLIST_ITERATOR::move_to_last() { void *CLIST_ITERATOR::move_to_last() {
#ifndef NDEBUG
if (!list)
NO_LIST.error("CLIST_ITERATOR::move_to_last", ABORT, nullptr);
#endif
while (current != list->last) { while (current != list->last) {
forward(); forward();
} }
@ -319,15 +298,6 @@ void CLIST_ITERATOR::exchange( // positions of 2 links
CLIST_ITERATOR *other_it) { // other iterator CLIST_ITERATOR *other_it) { // other iterator
constexpr ERRCODE DONT_EXCHANGE_DELETED("Can't exchange deleted elements of lists"); constexpr ERRCODE DONT_EXCHANGE_DELETED("Can't exchange deleted elements of lists");
#ifndef NDEBUG
if (!list)
NO_LIST.error("CLIST_ITERATOR::exchange", ABORT, nullptr);
if (!other_it)
BAD_PARAMETER.error("CLIST_ITERATOR::exchange", ABORT, "other_it nullptr");
if (!(other_it->list))
NO_LIST.error("CLIST_ITERATOR::exchange", ABORT, "other_it");
#endif
/* Do nothing if either list is empty or if both iterators reference the same /* Do nothing if either list is empty or if both iterators reference the same
link */ link */
@ -418,10 +388,6 @@ CLIST_LINK *CLIST_ITERATOR::extract_sublist( // from this current
constexpr ERRCODE BAD_EXTRACTION_PTS("Can't extract sublist from points on different lists"); constexpr ERRCODE BAD_EXTRACTION_PTS("Can't extract sublist from points on different lists");
constexpr ERRCODE DONT_EXTRACT_DELETED("Can't extract a sublist marked by deleted points"); constexpr ERRCODE DONT_EXTRACT_DELETED("Can't extract a sublist marked by deleted points");
if (!other_it)
BAD_PARAMETER.error("CLIST_ITERATOR::extract_sublist", ABORT, "other_it nullptr");
if (!list)
NO_LIST.error("CLIST_ITERATOR::extract_sublist", ABORT, nullptr);
if (list != other_it->list) if (list != other_it->list)
BAD_EXTRACTION_PTS.error("CLIST_ITERATOR.extract_sublist", ABORT, nullptr); BAD_EXTRACTION_PTS.error("CLIST_ITERATOR.extract_sublist", ABORT, nullptr);
if (list->empty()) if (list->empty())

83
src/ccutil/clst.h
View File

@ -194,9 +194,6 @@ public:
if (!list) { if (!list) {
NO_LIST.error("CLIST_ITERATOR::data", ABORT, nullptr); NO_LIST.error("CLIST_ITERATOR::data", ABORT, nullptr);
} }
if (!current) {
NULL_DATA.error("CLIST_ITERATOR::data", ABORT, nullptr);
}
#endif #endif
return current->data; return current->data;
} }
@ -215,11 +212,6 @@ public:
void mark_cycle_pt(); // remember current void mark_cycle_pt(); // remember current
bool empty() const { // is list empty? bool empty() const { // is list empty?
#ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::empty", ABORT, nullptr);
}
#endif
return list->empty(); return list->empty();
} }
@ -255,12 +247,6 @@ public:
inline void CLIST_ITERATOR::set_to_list( // change list inline void CLIST_ITERATOR::set_to_list( // change list
CLIST *list_to_iterate) { CLIST *list_to_iterate) {
#ifndef NDEBUG
if (!list_to_iterate) {
BAD_PARAMETER.error("CLIST_ITERATOR::set_to_list", ABORT, "list_to_iterate is nullptr");
}
#endif
list = list_to_iterate; list = list_to_iterate;
prev = list->last; prev = list->last;
current = list->First(); current = list->First();
@ -291,9 +277,6 @@ inline CLIST_ITERATOR::CLIST_ITERATOR(CLIST *list_to_iterate) {
inline void CLIST_ITERATOR::add_after_then_move( // element to add inline void CLIST_ITERATOR::add_after_then_move( // element to add
void *new_data) { void *new_data) {
#ifndef NDEBUG #ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::add_after_then_move", ABORT, nullptr);
}
if (!new_data) { if (!new_data) {
BAD_PARAMETER.error("CLIST_ITERATOR::add_after_then_move", ABORT, "new_data is nullptr"); BAD_PARAMETER.error("CLIST_ITERATOR::add_after_then_move", ABORT, "new_data is nullptr");
} }
@ -338,9 +321,6 @@ inline void CLIST_ITERATOR::add_after_then_move( // element to add
inline void CLIST_ITERATOR::add_after_stay_put( // element to add inline void CLIST_ITERATOR::add_after_stay_put( // element to add
void *new_data) { void *new_data) {
#ifndef NDEBUG #ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::add_after_stay_put", ABORT, nullptr);
}
if (!new_data) { if (!new_data) {
BAD_PARAMETER.error("CLIST_ITERATOR::add_after_stay_put", ABORT, "new_data is nullptr"); BAD_PARAMETER.error("CLIST_ITERATOR::add_after_stay_put", ABORT, "new_data is nullptr");
} }
@ -387,9 +367,6 @@ inline void CLIST_ITERATOR::add_after_stay_put( // element to add
inline void CLIST_ITERATOR::add_before_then_move( // element to add inline void CLIST_ITERATOR::add_before_then_move( // element to add
void *new_data) { void *new_data) {
#ifndef NDEBUG #ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::add_before_then_move", ABORT, nullptr);
}
if (!new_data) { if (!new_data) {
BAD_PARAMETER.error("CLIST_ITERATOR::add_before_then_move", ABORT, "new_data is nullptr"); BAD_PARAMETER.error("CLIST_ITERATOR::add_before_then_move", ABORT, "new_data is nullptr");
} }
@ -430,9 +407,6 @@ inline void CLIST_ITERATOR::add_before_then_move( // element to add
inline void CLIST_ITERATOR::add_before_stay_put( // element to add inline void CLIST_ITERATOR::add_before_stay_put( // element to add
void *new_data) { void *new_data) {
#ifndef NDEBUG #ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::add_before_stay_put", ABORT, nullptr);
}
if (!new_data) { if (!new_data) {
BAD_PARAMETER.error("CLIST_ITERATOR::add_before_stay_put", ABORT, "new_data is nullptr"); BAD_PARAMETER.error("CLIST_ITERATOR::add_before_stay_put", ABORT, "new_data is nullptr");
} }
@ -473,15 +447,6 @@ inline void CLIST_ITERATOR::add_before_stay_put( // element to add
**********************************************************************/ **********************************************************************/
inline void CLIST_ITERATOR::add_list_after(CLIST *list_to_add) { inline void CLIST_ITERATOR::add_list_after(CLIST *list_to_add) {
#ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::add_list_after", ABORT, nullptr);
}
if (!list_to_add) {
BAD_PARAMETER.error("CLIST_ITERATOR::add_list_after", ABORT, "list_to_add is nullptr");
}
#endif
if (!list_to_add->empty()) { if (!list_to_add->empty()) {
if (list->empty()) { if (list->empty()) {
list->last = list_to_add->last; list->last = list_to_add->last;
@ -520,15 +485,6 @@ inline void CLIST_ITERATOR::add_list_after(CLIST *list_to_add) {
**********************************************************************/ **********************************************************************/
inline void CLIST_ITERATOR::add_list_before(CLIST *list_to_add) { inline void CLIST_ITERATOR::add_list_before(CLIST *list_to_add) {
#ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::add_list_before", ABORT, nullptr);
}
if (!list_to_add) {
BAD_PARAMETER.error("CLIST_ITERATOR::add_list_before", ABORT, "list_to_add is nullptr");
}
#endif
if (!list_to_add->empty()) { if (!list_to_add->empty()) {
if (list->empty()) { if (list->empty()) {
list->last = list_to_add->last; list->last = list_to_add->last;
@ -567,9 +523,6 @@ inline void CLIST_ITERATOR::add_list_before(CLIST *list_to_add) {
inline void *CLIST_ITERATOR::extract() { inline void *CLIST_ITERATOR::extract() {
#ifndef NDEBUG #ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::extract", ABORT, nullptr);
}
if (!current) { // list empty or if (!current) { // list empty or
// element extracted // element extracted
NULL_CURRENT.error("CLIST_ITERATOR::extract", ABORT, nullptr); NULL_CURRENT.error("CLIST_ITERATOR::extract", ABORT, nullptr);
@ -605,12 +558,6 @@ inline void *CLIST_ITERATOR::extract() {
**********************************************************************/ **********************************************************************/
inline void *CLIST_ITERATOR::move_to_first() { inline void *CLIST_ITERATOR::move_to_first() {
#ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::move_to_first", ABORT, nullptr);
}
#endif
current = list->First(); current = list->First();
prev = list->last; prev = list->last;
next = current != nullptr ? current->next : nullptr; next = current != nullptr ? current->next : nullptr;
@ -651,12 +598,6 @@ inline void CLIST_ITERATOR::mark_cycle_pt() {
**********************************************************************/ **********************************************************************/
inline bool CLIST_ITERATOR::at_first() const { inline bool CLIST_ITERATOR::at_first() const {
#ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::at_first", ABORT, nullptr);
}
#endif
// we're at a deleted // we're at a deleted
return ((list->empty()) || (current == list->First()) || return ((list->empty()) || (current == list->First()) ||
((current == nullptr) && (prev == list->last) && // NON-last pt between ((current == nullptr) && (prev == list->last) && // NON-last pt between
@ -671,12 +612,6 @@ inline bool CLIST_ITERATOR::at_first() const {
**********************************************************************/ **********************************************************************/
inline bool CLIST_ITERATOR::at_last() const { inline bool CLIST_ITERATOR::at_last() const {
#ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::at_last", ABORT, nullptr);
}
#endif
// we're at a deleted // we're at a deleted
return ((list->empty()) || (current == list->last) || return ((list->empty()) || (current == list->last) ||
((current == nullptr) && (prev == list->last) && // last point between ((current == nullptr) && (prev == list->last) && // last point between
@ -691,12 +626,6 @@ inline bool CLIST_ITERATOR::at_last() const {
**********************************************************************/ **********************************************************************/
inline bool CLIST_ITERATOR::cycled_list() const { inline bool CLIST_ITERATOR::cycled_list() const {
#ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::cycled_list", ABORT, nullptr);
}
#endif
return ((list->empty()) || ((current == cycle_pt) && started_cycling)); return ((list->empty()) || ((current == cycle_pt) && started_cycling));
} }
@ -708,12 +637,6 @@ inline bool CLIST_ITERATOR::cycled_list() const {
**********************************************************************/ **********************************************************************/
inline int32_t CLIST_ITERATOR::length() const { inline int32_t CLIST_ITERATOR::length() const {
#ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::length", ABORT, nullptr);
}
#endif
return list->length(); return list->length();
} }
@ -727,12 +650,6 @@ inline int32_t CLIST_ITERATOR::length() const {
inline void CLIST_ITERATOR::sort( // sort elements inline void CLIST_ITERATOR::sort( // sort elements
int comparator( // comparison routine int comparator( // comparison routine
const void *, const void *)) { const void *, const void *)) {
#ifndef NDEBUG
if (!list) {
NO_LIST.error("CLIST_ITERATOR::sort", ABORT, nullptr);
}
#endif
list->sort(comparator); list->sort(comparator);
move_to_first(); move_to_first();
} }