[libcvd-members] libcvd Makefile.in cvd/fast_corner.h [FAST_cleanup]

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Branch:         FAST_cleanup
Changes by:     Edward Rosten <edrosten>        07/06/27 22:36:43

Modified files:
        .              : Makefile.in 
        cvd            : fast_corner.h 

Log message:
        faster_corner_detect is now gone.
        
        The build system chooses between the SSE2 version (the old 
faster_corner_detect) and the plain C++ version.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/Makefile.in?cvsroot=libcvd&only_with_tag=FAST_cleanup&r1=1.52.2.1&r2=1.52.2.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/fast_corner.h?cvsroot=libcvd&only_with_tag=FAST_cleanup&r1=1.14&r2=1.14.2.1

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/Makefile.in,v
retrieving revision 1.52.2.1
retrieving revision 1.52.2.2
diff -u -b -r1.52.2.1 -r1.52.2.2
--- Makefile.in 27 Jun 2007 22:26:53 -0000      1.52.2.1
+++ Makefile.in 27 Jun 2007 22:36:43 -0000      1.52.2.2
@@ -104,10 +104,7 @@
                        cvd_src/nonmax_suppression.o                    \
                        cvd_src/fast/address@hidden@address@hidden@.o   \
                        cvd_src/fast/address@hidden@address@hidden@.o   \
-                       cvd_src/fast/address@hidden@address@hidden@.o   \
-                       cvd_src/fast/address@hidden@address@hidden@.o  \
                        cvd_src/fast/address@hidden@address@hidden@.o  \
-                       cvd_src/fast/address@hidden@address@hidden@.o  \
                        cvd_src/timeddiskbuffer.o    \
                        cvd_src/videosource.o
 
################################################################################
@@ -218,6 +215,21 @@
        CVD_OBJS+=cvd_src/yuv411_to_stuff.o
 endif
 
+
+ifeq (@have_sse2@,yes)
+       CVD_OBJS+=cvd_src/faster_corner.o
+else
+       CVD_OBJS+=\
+                       cvd_src/fast/address@hidden@address@hidden@.o   \
+                       cvd_src/fast/address@hidden@address@hidden@.o  \
+                       cvd_src/fast/address@hidden@address@hidden@.o  \
+endif
+
+
+################################################################################
+#
+#
+
 OBJS=$(CVD_OBJS)
 
 

Index: cvd/fast_corner.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/fast_corner.h,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -b -r1.14 -r1.14.2.1
--- cvd/fast_corner.h   26 Jan 2007 15:51:59 -0000      1.14
+++ cvd/fast_corner.h   27 Jun 2007 22:36:43 -0000      1.14.2.1
@@ -153,13 +153,6 @@
        void fast_corner_detect_12(const BasicImage<byte>& im, 
std::vector<ImageRef>& corners, int barrier);
 
 
-#if (CVD_HAVE_EMMINTRIN && CVD_HAVE_SSE2)
-       void faster_corner_detect_12(const BasicImage<byte>& I, 
std::vector<ImageRef>& corners, int barrier);
-       void faster_corner_detect_10(const BasicImage<byte>& I, 
std::vector<ImageRef>& corners, int barrier);
-       void faster_corner_detect_9(const BasicImage<byte>& I, 
std::vector<ImageRef>& corners, int barrier);
-#endif
-
-
        /// Score corners detected by FAST as the maximum barrier at which the 
corner is still a corner.
        ///     
        ///     @param  im              The input image