fixed the bug. still seg fault persists.

qihang0233 · Jul 14, 2015 · 02e7468 · 02e7468
1 parent 9c79923
commit 02e7468
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 8 deletions.
diff --git a/Makefile b/Makefile
@@ -18,7 +18,7 @@ LDFLAGS = -ljpeg -mavx -lm -lpthread -lX11 `pkg-config --libs opencv` -DDLIB_HAV
 # $^ stores the dependency
 all: bin/oic
 
-bin/oic: obj/dlib.o obj/faceDetection.o obj/pupilDetection.o obj/kalmanFilters.o obj/util.o obj/oic.o
+bin/oic: obj/dlib.o obj/faceDetection.o obj/pupilDetection.o obj/kalmanFilters.o obj/util.o obj/kmeansUtils.o obj/oic.o
 	$(CXX) -o $@ $^ $(LDFLAGS)
 
 obj/dlib.o: src/dlib/all/source.cpp
@@ -37,6 +37,9 @@ obj/kalmanFilters.o: src/kalmanFilters.cpp
 obj/util.o: src/util.cpp
 	$(CXX) -c $(CXXFLAGS) -o $@ $<
 
+obj/kmeansUtils.o: src/kmeansUtils.cpp
+	$(CXX) -c $(CXXFLAGS) -o $@ $<
+
 #obj/viewUtils.o: src/viewUtils.cpp
 #	$(CXX) -c $(CXXFLAGS) -o $@ $<
 

diff --git a/include/kmeansUtils.h b/include/kmeansUtils.h
@@ -2,6 +2,6 @@
 #define KMEANS_UTILs_H
 
 void kmeans_array_generate(cv::Mat src, std::vector<std::vector<double> > vec, int mode);
-void kmeans_clusters_view(cv::Mat& src, std::vector<std::vector<double> > vec_labels);
+void kmeans_clusters_view(cv::Mat& src, std::vector<int> vec_labels);
 
 #endif
diff --git a/obj/dlib.o b/obj/dlib.o
diff --git a/obj/faceDetection.o b/obj/faceDetection.o
diff --git a/obj/kalmanFilters.o b/obj/kalmanFilters.o
diff --git a/obj/oic.o b/obj/oic.o
diff --git a/obj/pupilDetection.o b/obj/pupilDetection.o
diff --git a/obj/util.o b/obj/util.o
diff --git a/out.txt b/out.txt
@@ -0,0 +1,20 @@
+mkdir -p obj bin
+g++ -c -g -I./include -I./src/dlib/all/source.cpp -ljpeg -mavx -lm -lpthread -lX11 -DDLIB_HAVE_BLAS -DNDEBUG  -DDLIB_JPEG_SUPPORT -DDLIB_HAVE_AVX  -O3 `pkg-config --cflags opencv` -o obj/faceDetection.o src/faceDetection.cpp
+g++ -c -g -I./include -I./src/dlib/all/source.cpp -ljpeg -mavx -lm -lpthread -lX11 -DDLIB_HAVE_BLAS -DNDEBUG  -DDLIB_JPEG_SUPPORT -DDLIB_HAVE_AVX  -O3 `pkg-config --cflags opencv` -o obj/pupilDetection.o src/pupilDetection.cpp
+g++ -c -g -I./include -I./src/dlib/all/source.cpp -ljpeg -mavx -lm -lpthread -lX11 -DDLIB_HAVE_BLAS -DNDEBUG  -DDLIB_JPEG_SUPPORT -DDLIB_HAVE_AVX  -O3 `pkg-config --cflags opencv` -o obj/kalmanFilters.o src/kalmanFilters.cpp
+g++ -c -g -I./include -I./src/dlib/all/source.cpp -ljpeg -mavx -lm -lpthread -lX11 -DDLIB_HAVE_BLAS -DNDEBUG  -DDLIB_JPEG_SUPPORT -DDLIB_HAVE_AVX  -O3 `pkg-config --cflags opencv` -o obj/dlib.o src/dlib/all/source.cpp
+cc1plus: warning: ./src/dlib/all/source.cpp: not a directory [enabled by default]
+cc1plus: warning: ./src/dlib/all/source.cpp: not a directory [enabled by default]
+cc1plus: warning: ./src/dlib/all/source.cpp: not a directory [enabled by default]
+cc1plus: warning: ./src/dlib/all/source.cpp: not a directory [enabled by default]
+g++ -c -g -I./include -I./src/dlib/all/source.cpp -ljpeg -mavx -lm -lpthread -lX11 -DDLIB_HAVE_BLAS -DNDEBUG  -DDLIB_JPEG_SUPPORT -DDLIB_HAVE_AVX  -O3 `pkg-config --cflags opencv` -o obj/util.o src/util.cpp
+cc1plus: warning: ./src/dlib/all/source.cpp: not a directory [enabled by default]
+g++ -c -g -I./include -I./src/dlib/all/source.cpp -ljpeg -mavx -lm -lpthread -lX11 -DDLIB_HAVE_BLAS -DNDEBUG  -DDLIB_JPEG_SUPPORT -DDLIB_HAVE_AVX  -O3 `pkg-config --cflags opencv` -o obj/kmeansUtils.o src/kmeansUtils.cpp
+cc1plus: warning: ./src/dlib/all/source.cpp: not a directory [enabled by default]
+g++ -c -g -I./include -I./src/dlib/all/source.cpp -ljpeg -mavx -lm -lpthread -lX11 -DDLIB_HAVE_BLAS -DNDEBUG  -DDLIB_JPEG_SUPPORT -DDLIB_HAVE_AVX  -O3 `pkg-config --cflags opencv` -o obj/oic.o src/oic.cpp
+cc1plus: warning: ./src/dlib/all/source.cpp: not a directory [enabled by default]
+make: *** [obj/dlib.o] Interrupt
+make: *** [obj/util.o] Interrupt
+make: *** wait: No child processes.  Stop.
+make: *** Waiting for unfinished jobs....
+make: *** wait: No child processes.  Stop.
diff --git a/src/kmeansUtils.cpp b/src/kmeansUtils.cpp
@@ -35,7 +35,7 @@ void kmeans_array_generate(cv::Mat src, std::vector<std::vector<double> > vec, i
 	}
 }
 
-void kmeans_clusters_view(cv::Mat& src, std::vector<std::vector<double> > vec_labels) {
+void kmeans_clusters_view(cv::Mat& src, std::vector<int> vec_labels) {
 	int rows = src.rows;
 	int cols = src.cols;
 
@@ -44,9 +44,12 @@ void kmeans_clusters_view(cv::Mat& src, std::vector<std::vector<double> > vec_la
 	for(int i=0;i<rows;i++) {
 		for(int j=0;j<cols;j++) {
 			int clr = vec_labels[idx]*100 + 50;
-			src.at<Vec3b>(i, j)[0] = clr;
-			src.at<Vec3b>(i, j)[1] = clr;
-			src.at<Vec3b>(i, j)[2] = clr;
+
+			src.at<cv::Vec3b>(i, j)[0] = clr;
+			src.at<cv::Vec3b>(i, j)[1] = clr;
+			src.at<cv::Vec3b>(i, j)[2] = clr;
+
+			idx++;
 		}
 	}
 }
diff --git a/src/oic.cpp b/src/oic.cpp
@@ -53,7 +53,8 @@ int main(int argc, char** argv) {
 		std::vector<double> center_eye_proj(3);
 		std::vector<double> vec_cp_kalman_avg(3);
 
-		std::vector<std::vector<double> > vec_kmeans_data_l, vec_kmeans_labels_l, vec_kmeans_centers_l;
+		std::vector<std::vector<double> > vec_kmeans_data_l, vec_kmeans_centers_l;
+		std::vector<int> vec_kmeans_labels_l;
 
 		double Cf_left, Cf_right;
 
@@ -194,7 +195,7 @@ int main(int argc, char** argv) {
 				cv_image<bgr_pixel> cimg_kmeans_clr_l(roi1_clr);
 				kmeans_array_generate(roi1_clr, vec_kmeans_data_l, 0);
 				cv::kmeans(vec_kmeans_data_l, 3, vec_kmeans_labels_l, cv::TermCriteria(CV_TERMCRIT_EPS+CV_TERMCRIT_ITER, 10, 1.0),
-					3, cv::KMEANS_PP_CENTERS, vec_kmeans_centers_l);
+					3, cv::KMEANS_PP_CENTERS);//, vec_kmeans_centers_l);
 
 				kmeans_clusters_view(roi1_clr, vec_kmeans_labels_l);