X-Git-Url: https://www.fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=folded-ctf.git;a=blobdiff_plain;f=pi_referential.cc;h=979f5d9b3a67dd84783721df6239466f7cf791da;hp=c2b716e34862183eccd9eb00f14d49700ee23fb1;hb=HEAD;hpb=33852c7b378d419be75d15a9663ee6b071c2f534

diff --git a/pi_referential.cc b/pi_referential.cc
index c2b716e..979f5d9 100644
--- a/pi_referential.cc
+++ b/pi_referential.cc
@@ -1,20 +1,26 @@
-
-///////////////////////////////////////////////////////////////////////////
-// This program is free software: you can redistribute it and/or modify  //
-// it under the terms of the version 3 of the GNU General Public License //
-// as published by the Free Software Foundation.                         //
-//                                                                       //
-// This program is distributed in the hope that it will be useful, but   //
-// WITHOUT ANY WARRANTY; without even the implied warranty of            //
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      //
-// General Public License for more details.                              //
-//                                                                       //
-// 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                                //
-// Contact <francois.fleuret@idiap.ch> for comments & bug reports        //
-///////////////////////////////////////////////////////////////////////////
+/*
+ *  folded-ctf is an implementation of the folded hierarchy of
+ *  classifiers for object detection, developed by Francois Fleuret
+ *  and Donald Geman.
+ *
+ *  Copyright (c) 2008 Idiap Research Institute, http://www.idiap.ch/
+ *  Written by Francois Fleuret <francois.fleuret@idiap.ch>
+ *
+ *  This file is part of folded-ctf.
+ *
+ *  folded-ctf is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License version 3 as
+ *  published by the Free Software Foundation.
+ *
+ *  folded-ctf is distributed in the hope that it will be useful, but
+ *  WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with folded-ctf.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
 
 #include "pi_referential.h"
 #include "global.h"
@@ -149,110 +155,6 @@ void PiReferential::draw_window(RGBImage *image,
 
 }
 
-void PiReferential::draw_edge_and_scale(RGBImage *image,
-                                        int registration_mode, Rectangle *window,
-                                        int _tag, int _edge_scale) {
-  const int ref_radius = 10;
-  int r, g, b;
-  int edges = 0;
-
-  switch(registration_mode) {
-
-  case PiReferential::RM_HEAD:
-    r = 0; g = 255; b = 0;
-    break;
-
-  case PiReferential::RM_HEAD_NO_POLARITY:
-    r = 128; g = 255; b = 128;
-    break;
-
-  case PiReferential::RM_BELLY:
-    r = 64; g = 0; b = 255;
-    break;
-
-  case PiReferential::RM_BELLY_NO_POLARITY:
-    r = 192; g = 128; b = 255;
-    break;
-
-  case PiReferential::RM_HEAD_BELLY_EDGES:
-    edges = 1;
-  case PiReferential::RM_HEAD_BELLY:
-    r = 255; g = 0; b = 0;
-    break;
-
-  default:
-    cerr << "INCONSISTENCY" << endl;
-    abort();
-  }
-
-  scalar_t xc = (window->xmin + window->xmax)/2;
-  scalar_t yc = (window->ymin + window->ymax)/2;
-  int radius = ref_radius * (1 << _edge_scale);
-
-  image->draw_ellipse(1, r, g, b, xc, yc, radius, radius, 0);
-
-  if(_tag >= RichImage::first_edge_tag && _tag < RichImage::first_edge_tag + RichImage::nb_edge_tags) {
-
-    scalar_t dx, dy;
-
-    switch(_tag - RichImage::first_edge_tag) {
-    case 0:
-      dx =  0; dy = -1;
-      break;
-
-    case 1:
-      dx =  1; dy = -1;
-      break;
-
-    case 2:
-      dx =  1; dy =  0;
-      break;
-
-    case 3:
-      dx =  1; dy =  1;
-      break;
-
-    case 4:
-      dx =  0; dy =  1;
-      break;
-
-    case 5:
-      dx = -1; dy =  1;
-      break;
-
-    case 6:
-      dx = -1; dy =  0;
-      break;
-
-    case 7:
-      dx = -1; dy = -1;
-      break;
-
-    default:
-      abort();
-    }
-
-    scalar_t l = sqrt(dx * dx + dy * dy);
-
-    if(edges) {
-      int delta = 3;
-      image->draw_ellipse(1, r, g, b, xc, yc, radius + delta, radius + delta, 0);
-    }
-
-    for(scalar_t u = 0; u <= radius; u += 0.1) {
-      scalar_t s = sqrt(radius * radius - (u * u * l * l))/l;
-      image->draw_line(2, r, g, b,
-                       int(xc + u * dx - s * dy), int(yc + u * dy + s * dx),
-                       int(xc + u * dx + s * dy), int(yc + u * dy - s * dx));
-    }
-
-  }
-
-  else if(_tag == RichImage::variance_tag) {
-    image->draw_ellipse(1, r, g, b, xc, yc, 8, 8, 0);
-  }
-}
-
 PiReferential::PiReferential(PoseCell *cell) {
   scalar_t head_radius = sqrt(scalar_t(cell->_head_radius.min * cell->_head_radius.max));
 
@@ -272,14 +174,16 @@ PiReferential::PiReferential(PoseCell *cell) {
 
   // Body location
 
+  // **********************************************************************
+  // Useless code, but necessary to keep the exact same results with
+  // g++ 4.1 and -O3 options on reference experiments.
   _body_xc = cell->_belly_xc.middle() * discrete_scale_ratio;
   _body_yc = cell->_belly_yc.middle() * discrete_scale_ratio;
-
   _body_tilt = 0;
-
   if((_head_xc - _body_xc) * cos(_body_tilt) + (_head_yc - _body_yc) * sin(_body_tilt) > 0) {
     _body_tilt += M_PI;
   }
+  // **********************************************************************
 
   // Belly location
 
@@ -298,7 +202,7 @@ PiReferential::PiReferential(PoseCell *cell) {
   // Frames
 
   if(_body_xc >= _head_xc) {
-//   if(_belly_xc >= _head_xc) {
+    //   if(_belly_xc >= _head_xc) {
     _horizontal_polarity = 1;
   } else {
     _horizontal_polarity = -1;