Removed the definition of basename, which confuses an existing system one.

[folded-ctf.git] / image.cc

diff --git a/image.cc b/image.cc
index e9eb83f..3161e97 100644 (file)
--- a/image.cc
+++ b/image.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 "image.h"
 
@@ -34,21 +40,6 @@ Image::~Image() {
   delete[] _content;
 }
 
-void Image::crop(int xmin, int ymin, int width, int height) {
-  ASSERT(xmin >= 0 && xmin + width <= _width &&
-         ymin >= 0 && ymin + height <= _height);
-  unsigned char *new_content = new unsigned char[width * height];
-  for(int y = 0; y < height; y++) {
-    for(int x = 0; x < width; x++) {
-      new_content[x + (y * width)] = _content[x + xmin + _width * (y + ymin)];
-    }
-  }
-  delete[] _content;
-  _content = new_content;
-  _width = width;
-  _height = height;
-}
-
 void Image::to_rgb(RGBImage *image) {
   int c;
   for(int y = 0; y < _height; y++) {