Fixed some warnings to make the VC2010 compiler happy:

C4355: 'this' : used in base member initializer list
C4099: type name first seen using 'class' now seen using 'struct'

git-svn-id: https://tesseract-ocr.googlecode.com/svn/trunk@630 d0cd1f9f-072b-0410-8dd7-cf729c803f20

ccstruct/normalis.h

@@ -31,9 +31,9 @@ struct Pix;
 class ROW;                          // Forward decl
 class BLOCK;
 class FCOORD;
-class TBLOB;
+struct TBLOB;
 class TBOX;
-class TPOINT;
+struct TPOINT;
 
 class DENORM_SEG {
  public:

ccstruct/vecfuncs.h

@@ -28,7 +28,7 @@
 #include <math.h>
 #include "blobs.h"
 
-class EDGEPT;
+struct EDGEPT;
 
 /*----------------------------------------------------------------------
               M a c r o s

wordrec/wordrec.cpp

@@ -26,100 +26,100 @@ namespace tesseract {
 Wordrec::Wordrec() :
   // control parameters
   BOOL_MEMBER(wordrec_no_block, FALSE, "Don't output block information",
-              this->params()),
+              params()),
   BOOL_MEMBER(wordrec_enable_assoc, TRUE, "Associator Enable",
-              this->params()),
+              params()),
   BOOL_MEMBER(force_word_assoc, FALSE,
               "force associator to run regardless of what enable_assoc is."
               "This is used for CJK where component grouping is necessary.",
-              this->params()),
+              CCUtil::params()),
   INT_MEMBER(wordrec_num_seg_states, 30, "Segmentation states",
-             this->params()),
+             CCUtil::params()),
   double_MEMBER(wordrec_worst_state, 1.0, "Worst segmentation state",
-                this->params()),
+                params()),
   BOOL_MEMBER(fragments_guide_chopper, FALSE,
               "Use information from fragments to guide chopping process",
-              this->params()),
+              params()),
   INT_MEMBER(repair_unchopped_blobs, 1, "Fix blobs that aren't chopped",
-             this->params()),
+             params()),
   double_MEMBER(tessedit_certainty_threshold, -2.25, "Good blob limit",
-                this->params()),
+                params()),
   INT_MEMBER(chop_debug, 0, "Chop debug",
-             this->params()),
+             params()),
   BOOL_MEMBER(chop_enable, 1, "Chop enable",
-              this->params()),
+              params()),
   BOOL_MEMBER(chop_vertical_creep, 0, "Vertical creep",
-            this->params()),
+            params()),
   INT_MEMBER(chop_split_length, 10000, "Split Length",
-             this->params()),
+             params()),
   INT_MEMBER(chop_same_distance, 2, "Same distance",
-             this->params()),
+             params()),
   INT_MEMBER(chop_min_outline_points, 6, "Min Number of Points on Outline",
-             this->params()),
+             params()),
   INT_MEMBER(chop_inside_angle, -50, "Min Inside Angle Bend",
-             this->params()),
+             params()),
   INT_MEMBER(chop_min_outline_area, 2000, "Min Outline Area",
-             this->params()),
+             params()),
   double_MEMBER(chop_split_dist_knob, 0.5, "Split length adjustment",
-                this->params()),
+                params()),
   double_MEMBER(chop_overlap_knob, 0.9, "Split overlap adjustment",
-                this->params()),
+                params()),
   double_MEMBER(chop_center_knob, 0.15, "Split center adjustment",
-                this->params()),
+                params()),
   double_MEMBER(chop_sharpness_knob, 0.06, "Split sharpness adjustment",
-                this->params()),
+                params()),
   double_MEMBER(chop_width_change_knob, 5.0, "Width change adjustment",
-                this->params()),
+                params()),
   double_MEMBER(chop_ok_split, 100.0, "OK split limit",
-                this->params()),
+                params()),
   double_MEMBER(chop_good_split, 50.0, "Good split limit",
-                this->params()),
+                params()),
   INT_MEMBER(chop_x_y_weight, 3, "X / Y  length weight",
-             this->params()),
+             params()),
   INT_MEMBER(segment_adjust_debug, 0, "Segmentation adjustment debug",
-             this->params()),
+             params()),
   BOOL_MEMBER(assume_fixed_pitch_char_segment, FALSE,
               "include fixed-pitch heuristics in char segmentation",
-              this->params()),
+              params()),
   BOOL_MEMBER(use_new_state_cost, FALSE,
               "use new state cost heuristics for segmentation state evaluation",
-              this->params()),
+              params()),
   double_MEMBER(heuristic_segcost_rating_base, 1.25,
                 "base factor for adding segmentation cost into word rating."
                 "It's a multiplying factor, the larger the value above 1, "
                 "the bigger the effect of segmentation cost.",
-                this->params()),
+                params()),
   double_MEMBER(heuristic_weight_rating, 1.0,
                 "weight associated with char rating in combined cost of state",
-                this->params()),
+                params()),
   double_MEMBER(heuristic_weight_width, 1000.0,
                 "weight associated with width evidence in combined cost of"
-                " state", this->params()),
+                " state", params()),
   double_MEMBER(heuristic_weight_seamcut, 0.0,
                 "weight associated with seam cut in combined cost of state",
-                this->params()),
+                params()),
   double_MEMBER(heuristic_max_char_wh_ratio, 2.0,
                 "max char width-to-height ratio allowed in segmentation",
-                this->params()),
+                params()),
   INT_MEMBER(wordrec_debug_level, 0,
-             "Debug level for wordrec", this->params()),
+             "Debug level for wordrec", params()),
   BOOL_INIT_MEMBER(enable_new_segsearch, false,
-                   "Enable new segmentation search path.", this->params()),
+                   "Enable new segmentation search path.", params()),
   INT_MEMBER(segsearch_debug_level, 0,
-             "SegSearch debug level", this->params()),
+             "SegSearch debug level", params()),
   INT_MEMBER(segsearch_max_pain_points, 2000,
              "Maximum number of pain points stored in the queue",
-             this->params()),
+             params()),
   INT_MEMBER(segsearch_max_futile_classifications, 10,
              "Maximum number of pain point classifications per word that"
              "did not result in finding a better word choice.",
-             this->params()),
+             params()),
   double_MEMBER(segsearch_max_char_wh_ratio, 2.0,
-                "Maximum character width-to-height ratio", this->params()),
+                "Maximum character width-to-height ratio", params()),
   double_MEMBER(segsearch_max_fixed_pitch_char_wh_ratio, 2.0,
                 "Maximum character width-to-height ratio for"
                 " fixed-pitch fonts",
-                this->params()) {
+                params()) {
   states_before_best = NULL;
   best_certainties[0] = NULL;
   best_certainties[1] = NULL;