[libcvd-members] libcvd/cvd harris_corner.h

[Gerhard Reitmayr]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Gerhard Reitmayr <gerhard>      09/11/02 19:08:06

Modified files:
        cvd            : harris_corner.h 

Log message:
        use subimage

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/harris_corner.h?cvsroot=libcvd&r1=1.1&r2=1.2

Patches:
Index: harris_corner.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/harris_corner.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- harris_corner.h     9 Feb 2009 17:19:39 -0000       1.1
+++ harris_corner.h     2 Nov 2009 19:08:06 -0000       1.2
@@ -78,7 +78,7 @@
        ///@param xy Holds the result of blurred, X times Y gradient.
        ///@param yy Holds the result of blurred, squared Y gradient.
        ///@ingroup gVision
-       template<class Score, class Inserter, class C, class B> void 
harrislike_corner_detect(const BasicImage<B>& i, C& c, unsigned int N, float 
blur, float sigmas, BasicImage<float>& xx, BasicImage<float>& xy, 
BasicImage<float>& yy)
+       template<class Score, class Inserter, class C, class B> void 
harrislike_corner_detect(const SubImage<B>& i, C& c, unsigned int N, float 
blur, float sigmas, BasicImage<float>& xx, BasicImage<float>& xy, 
BasicImage<float>& yy)
        {
                using std::pair;
                using std::greater;
@@ -175,13 +175,13 @@
                        Inserter::insert(c, corner_heap[i]);
        }
 
-       template<class C> void harris_corner_detect(const Image<C>& i, 
std::vector<ImageRef>& c, unsigned int N, float blur=1.0, float sigmas = 3.0)
+       template<class C> void harris_corner_detect(const SubImage<C>& i, 
std::vector<ImageRef>& c, unsigned int N, float blur=1.0, float sigmas = 3.0)
        {
                Image<float> xx(i.size()), xy(i.size()), yy(i.size());
                harrislike_corner_detect<Harris::HarrisScore, 
Harris::PosInserter>(i, c, N, blur, sigmas, xx, xy, yy);
        }
 
-       template<class C> void shitomasi_corner_detect(const Image<C>& i, 
std::vector<ImageRef>& c, unsigned int N, float blur=1.0, float sigmas = 3.0)
+       template<class C> void shitomasi_corner_detect(const SubImage<C>& i, 
std::vector<ImageRef>& c, unsigned int N, float blur=1.0, float sigmas = 3.0)
        {
                Image<float> xx(i.size()), xy(i.size()), yy(i.size());
                harrislike_corner_detect<Harris::ShiTomasiScore, 
Harris::PosInserter>(i, c, N, blur, sigmas, xx, xy, yy);