automatic commit

[folded-ctf.git] / rich_image.cc

diff --git a/rich_image.cc b/rich_image.cc
index f3b4b54..a728950 100644 (file)
--- a/rich_image.cc
+++ b/rich_image.cc
@@ -12,7 +12,9 @@
 // You should have received a copy of the GNU General Public License     //
 // along with this program. If not, see <http://www.gnu.org/licenses/>.  //
 //                                                                       //
-// Written by Francois Fleuret, (C) IDIAP                                //
+// Written by Francois Fleuret                                           //
+// (C) Idiap Research Institute                                          //
+//                                                                       //
 // Contact <francois.fleuret@idiap.ch> for comments & bug reports        //
 ///////////////////////////////////////////////////////////////////////////
 
@@ -143,22 +145,22 @@ void RichImage::compute_one_scale_edge_maps(int width, int height,
       scale_edge_map[first_gray_tag +
                      (local_pixel_map[0] / gray_bin_width)][0][d]++;
 
-      if(x - int(var_square_size/2) >= 0 &&
-         x + int(var_square_size/2) < width &&
-         y - int(var_square_size/2) >= 0 &&
-         y + int(var_square_size/2) < height) {
+      if(x - int(var_square_size / 2) >= 0 &&
+         x + int(var_square_size / 2) < width &&
+         y - int(var_square_size / 2) >= 0 &&
+         y + int(var_square_size / 2) < height) {
 
         unsigned int s =
-          + local_sum_pixel_map[ - var_square_size/2 + width * ( - var_square_size / 2)]
-          + local_sum_pixel_map[ + var_square_size/2 + width * ( + var_square_size / 2)]
-          - local_sum_pixel_map[ - var_square_size/2 + width * ( + var_square_size / 2)]
-          - local_sum_pixel_map[ + var_square_size/2 + width * ( - var_square_size / 2)];
+          + *(local_sum_pixel_map - var_square_size / 2 + width * ( - var_square_size / 2))
+          + *(local_sum_pixel_map + var_square_size / 2 + width * ( + var_square_size / 2))
+          - *(local_sum_pixel_map - var_square_size / 2 + width * ( + var_square_size / 2))
+          - *(local_sum_pixel_map + var_square_size / 2 + width * ( - var_square_size / 2));
 
         unsigned int s_sq =
-          + local_sum_sq_pixel_map[ - var_square_size/2 + width * ( - var_square_size / 2)]
-          + local_sum_sq_pixel_map[ + var_square_size/2 + width * ( + var_square_size / 2)]
-          - local_sum_sq_pixel_map[ - var_square_size/2 + width * ( + var_square_size / 2)]
-          - local_sum_sq_pixel_map[ + var_square_size/2 + width * ( - var_square_size / 2)];
+          + *(local_sum_sq_pixel_map - var_square_size / 2 + width * ( - var_square_size / 2))
+          + *(local_sum_sq_pixel_map + var_square_size / 2 + width * ( + var_square_size / 2))
+          - *(local_sum_sq_pixel_map - var_square_size / 2 + width * ( + var_square_size / 2))
+          - *(local_sum_sq_pixel_map + var_square_size / 2 + width * ( - var_square_size / 2));
 
         if(sq(var_square_size) * s_sq - sq(s) >=
            100 * sq(var_square_size) * (sq(var_square_size) - 1)) {
@@ -384,11 +386,6 @@ void RichImage::compute_rich_structure() {
   delete[] scale_pixel_maps;
 }
 
-void RichImage::crop(int xmin, int ymin, int width, int height) {
-  free();
-  Image::crop(xmin, ymin, width, height);
-}
-
 RichImage::RichImage() : Image() {
   _width_at_scale = 0;
   _height_at_scale = 0;