[libcvd-members] libcvd Makefile.in cvd/connected_components.h c...

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    libcvd
Changes by:     Edward Rosten <edrosten>        08/12/05 12:39:21

Modified files:
        .              : Makefile.in 
        cvd            : connected_components.h 
        cvd_src        : connected_components.cc 

Log message:
        Make connected components actually compile...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/Makefile.in?cvsroot=libcvd&r1=1.82&r2=1.83
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/connected_components.h?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd_src/connected_components.cc?cvsroot=libcvd&r1=1.1&r2=1.2

Patches:
Index: Makefile.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/Makefile.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -b -r1.82 -r1.83
--- Makefile.in 2 Dec 2008 16:10:06 -0000       1.82
+++ Makefile.in 5 Dec 2008 12:39:20 -0000       1.83
@@ -103,6 +103,7 @@
                        cvd_src/nonmax_suppression.o                    \
                        cvd_src/timeddiskbuffer.o                       \
                        cvd_src/videosource.o                           \
+                       cvd_src/connected_components.o                  \
                        @dep_objects@
 
 
################################################################################

Index: cvd/connected_components.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/connected_components.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cvd/connected_components.h  5 Dec 2008 12:36:52 -0000       1.1
+++ cvd/connected_components.h  5 Dec 2008 12:39:20 -0000       1.2
@@ -35,7 +35,7 @@
        ///@param v List of pixel positions
        ///@param r List of segments.
        ///@ingroup gVision
-       void connected_components(const vector<ImageRef>& v, 
vector<vector<ImageRef> >& r);
+       void connected_components(const std::vector<ImageRef>& v, 
std::vector<std::vector<ImageRef> >& r);
 }
 
 #endif

Index: cvd_src/connected_components.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd_src/connected_components.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cvd_src/connected_components.cc     5 Dec 2008 12:36:52 -0000       1.1
+++ cvd_src/connected_components.cc     5 Dec 2008 12:39:20 -0000       1.2
@@ -1,4 +1,7 @@
 #include "cvd/connected_components.h"
+#include <climits> 
+#include <algorithm> 
+
 using namespace std;
 namespace CVD{
 static unsigned int root_of(const vector<unsigned int>& parents, unsigned int 
n) 
@@ -8,6 +11,14 @@
        return n;
 }
 
+struct CompareFistIntLessThan
+{
+       bool operator()(const pair<int, int>& p1, const pair<int, int>& p2)
+       {
+               return p1.first < p2.first;
+       }
+};
+
 void connected_components(const vector<ImageRef>& v, vector<vector<ImageRef> 
>& r)
 {
        int current_label = -1;