Fix some minor issues reported by Coverity Scan (#1321)

* Dereference pointer after NULL check (CID 1385638)

Move the statement which dereferences the pointer variable "current"
after the NULL check.

Signed-off-by: Stefan Weil <[email protected]>

* Dereference pointer after NULL check (CID 1385635)

Move the statement which dereferences the pointer variable "current"
after the NULL check.

Signed-off-by: Stefan Weil <[email protected]>

* Dereference pointer after NULL check (CID 1385634)

Move the statement which dereferences the pointer variable "current"
after the NULL check.

Signed-off-by: Stefan Weil <[email protected]>

* Fix CID 1164527 'Constant' variable guards dead code

Signed-off-by: Stefan Weil <[email protected]>

Author: stweil

ccmain/pageiterator.cpp

@@ -540,7 +540,7 @@ void PageIterator::Orientation(tesseract::Orientation *orientation,
                 : WRITING_DIRECTION_LEFT_TO_RIGHT);
 
   // Textline Order
-  bool is_mongolian = false;  // TODO(eger): fix me
+  const bool is_mongolian = false;  // TODO(eger): fix me
   *textline_order = is_vertical_text
       ? (is_mongolian
          ? TEXTLINE_ORDER_LEFT_TO_RIGHT

ccutil/clst.cpp

@@ -261,7 +261,6 @@ void *CLIST_ITERATOR::forward() {
       cycle_pt = next;
     current = next;
   }
-  next = current->next;
 
   #ifndef NDEBUG
   if (!current)
@@ -270,6 +269,8 @@ void *CLIST_ITERATOR::forward() {
     NULL_NEXT.error ("CLIST_ITERATOR::forward", ABORT,
                      "This is: %p  Current is: %p", this, current);
   #endif
+
+  next = current->next;
   return current->data;
 }
 

ccutil/elst2.cpp

@@ -204,15 +204,20 @@ ELIST2_LINK *ELIST2_ITERATOR::forward() {
       cycle_pt = next;
     current = next;
   }
-  next = current->next;
 
-  #ifndef NDEBUG
+#ifndef NDEBUG
   if (!current)
     NULL_DATA.error ("ELIST2_ITERATOR::forward", ABORT, NULL);
+#endif
+
+  next = current->next;
+
+#ifndef NDEBUG
   if (!next)
     NULL_NEXT.error ("ELIST2_ITERATOR::forward", ABORT,
                      "This is: %p  Current is: %p", this, current);
-  #endif
+#endif
+
   return current;
 }
 
@@ -242,7 +247,6 @@ ELIST2_LINK *ELIST2_ITERATOR::backward() {
       cycle_pt = prev;
     current = prev;
   }
-  prev = current->prev;
 
   #ifndef NDEBUG
   if (!current)
@@ -251,6 +255,8 @@ ELIST2_LINK *ELIST2_ITERATOR::backward() {
     NULL_PREV.error ("ELIST2_ITERATOR::backward", ABORT,
       "This is: %p  Current is: %p", this, current);
   #endif
+
+  prev = current->prev;
   return current;
 }