diff --git a/.DS_Store b/.DS_Store index 9ad102e..0ed014c 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/inverse_perspective_mapping/.DS_Store b/inverse_perspective_mapping/.DS_Store index a18425d..0f1a464 100644 Binary files a/inverse_perspective_mapping/.DS_Store and b/inverse_perspective_mapping/.DS_Store differ diff --git a/opencv-haar-classifier/.DS_Store b/opencv-haar-classifier/.DS_Store index 3e8164d..efe660e 100644 Binary files a/opencv-haar-classifier/.DS_Store and b/opencv-haar-classifier/.DS_Store differ diff --git a/opencv-haar-classifier/negatives.txt b/opencv-haar-classifier/negatives.txt index 372ee12..932a9fd 100644 --- a/opencv-haar-classifier/negatives.txt +++ b/opencv-haar-classifier/negatives.txt @@ -1,100 +1,100 @@ -./negative_images/78.bmp -./negative_images/65.bmp -./negative_images/72.bmp -./negative_images/47.bmp -./negative_images/22.bmp -./negative_images/90.bmp -./negative_images/88.bmp +./negative_images/1.bmp +./negative_images/10.bmp +./negative_images/100.bmp +./negative_images/11.bmp +./negative_images/12.bmp ./negative_images/13.bmp -./negative_images/32.bmp ./negative_images/14.bmp -./negative_images/99.bmp -./negative_images/50.bmp +./negative_images/15.bmp +./negative_images/16.bmp +./negative_images/17.bmp +./negative_images/18.bmp ./negative_images/19.bmp +./negative_images/2.bmp +./negative_images/20.bmp +./negative_images/21.bmp +./negative_images/22.bmp +./negative_images/23.bmp +./negative_images/24.bmp +./negative_images/25.bmp +./negative_images/26.bmp +./negative_images/27.bmp +./negative_images/28.bmp +./negative_images/29.bmp +./negative_images/3.bmp +./negative_images/30.bmp +./negative_images/31.bmp +./negative_images/32.bmp +./negative_images/33.bmp +./negative_images/34.bmp +./negative_images/35.bmp +./negative_images/36.bmp +./negative_images/37.bmp +./negative_images/38.bmp +./negative_images/39.bmp +./negative_images/4.bmp +./negative_images/40.bmp +./negative_images/41.bmp +./negative_images/42.bmp +./negative_images/43.bmp +./negative_images/44.bmp +./negative_images/45.bmp +./negative_images/46.bmp +./negative_images/47.bmp +./negative_images/48.bmp +./negative_images/49.bmp +./negative_images/5.bmp +./negative_images/50.bmp +./negative_images/51.bmp +./negative_images/52.bmp +./negative_images/53.bmp ./negative_images/54.bmp ./negative_images/55.bmp ./negative_images/56.bmp -./negative_images/40.bmp -./negative_images/44.bmp -./negative_images/42.bmp -./negative_images/81.bmp -./negative_images/33.bmp -./negative_images/79.bmp -./negative_images/64.bmp -./negative_images/16.bmp -./negative_images/1.bmp -./negative_images/80.bmp -./negative_images/4.bmp +./negative_images/57.bmp ./negative_images/58.bmp -./negative_images/77.bmp -./negative_images/37.bmp -./negative_images/7.bmp -./negative_images/63.bmp -./negative_images/23.bmp -./negative_images/9.bmp +./negative_images/59.bmp +./negative_images/6.bmp +./negative_images/60.bmp +./negative_images/61.bmp ./negative_images/62.bmp -./negative_images/96.bmp -./negative_images/100.bmp -./negative_images/24.bmp +./negative_images/63.bmp +./negative_images/64.bmp +./negative_images/65.bmp +./negative_images/66.bmp +./negative_images/67.bmp +./negative_images/68.bmp +./negative_images/69.bmp +./negative_images/7.bmp ./negative_images/70.bmp -./negative_images/46.bmp +./negative_images/71.bmp +./negative_images/72.bmp +./negative_images/73.bmp ./negative_images/74.bmp -./negative_images/6.bmp -./negative_images/28.bmp -./negative_images/85.bmp -./negative_images/66.bmp -./negative_images/86.bmp -./negative_images/45.bmp -./negative_images/59.bmp -./negative_images/5.bmp -./negative_images/61.bmp -./negative_images/36.bmp -./negative_images/87.bmp ./negative_images/75.bmp -./negative_images/95.bmp -./negative_images/21.bmp +./negative_images/76.bmp +./negative_images/77.bmp +./negative_images/78.bmp +./negative_images/79.bmp ./negative_images/8.bmp -./negative_images/94.bmp -./negative_images/31.bmp -./negative_images/71.bmp -./negative_images/73.bmp -./negative_images/3.bmp -./negative_images/29.bmp -./negative_images/52.bmp +./negative_images/80.bmp +./negative_images/81.bmp ./negative_images/82.bmp -./negative_images/10.bmp -./negative_images/38.bmp -./negative_images/26.bmp ./negative_images/83.bmp +./negative_images/84.bmp +./negative_images/85.bmp +./negative_images/86.bmp +./negative_images/87.bmp +./negative_images/88.bmp ./negative_images/89.bmp -./negative_images/20.bmp -./negative_images/39.bmp -./negative_images/60.bmp -./negative_images/25.bmp -./negative_images/17.bmp -./negative_images/34.bmp -./negative_images/30.bmp -./negative_images/97.bmp -./negative_images/18.bmp -./negative_images/48.bmp -./negative_images/43.bmp -./negative_images/49.bmp -./negative_images/68.bmp -./negative_images/53.bmp -./negative_images/51.bmp -./negative_images/12.bmp -./negative_images/93.bmp -./negative_images/76.bmp +./negative_images/9.bmp +./negative_images/90.bmp +./negative_images/91.bmp ./negative_images/92.bmp -./negative_images/41.bmp -./negative_images/15.bmp -./negative_images/35.bmp -./negative_images/11.bmp -./negative_images/67.bmp +./negative_images/93.bmp +./negative_images/94.bmp +./negative_images/95.bmp +./negative_images/96.bmp +./negative_images/97.bmp ./negative_images/98.bmp -./negative_images/69.bmp -./negative_images/57.bmp -./negative_images/91.bmp -./negative_images/84.bmp -./negative_images/27.bmp -./negative_images/2.bmp +./negative_images/99.bmp diff --git a/opencv-haar-classifier/positives.txt b/opencv-haar-classifier/positives.txt index cffa705..5eadaad 100644 --- a/opencv-haar-classifier/positives.txt +++ b/opencv-haar-classifier/positives.txt @@ -1,8 +1,8 @@ ./positive_images/1.bmp +./positive_images/2.bmp +./positive_images/3.bmp ./positive_images/4.bmp -./positive_images/7.bmp -./positive_images/6.bmp ./positive_images/5.bmp +./positive_images/6.bmp +./positive_images/7.bmp ./positive_images/8.bmp -./positive_images/3.bmp -./positive_images/2.bmp diff --git a/opencv-haar-classifier/samples.txt b/opencv-haar-classifier/samples.txt index cc5fa11..b3002e8 100644 --- a/opencv-haar-classifier/samples.txt +++ b/opencv-haar-classifier/samples.txt @@ -1,7 +1,8 @@ -./samples/8.bmp.vec -./samples/6.bmp.vec -./samples/5.bmp.vec -./samples/4.bmp.vec ./samples/1.bmp.vec -./samples/7.bmp.vec +./samples/2.bmp.vec ./samples/3.bmp.vec +./samples/4.bmp.vec +./samples/5.bmp.vec +./samples/6.bmp.vec +./samples/7.bmp.vec +./samples/8.bmp.vec diff --git a/opencv-haar-classifier/samples/1.bmp.vec b/opencv-haar-classifier/samples/1.bmp.vec index 6160fc7..eb2fb3e 100644 Binary files a/opencv-haar-classifier/samples/1.bmp.vec and b/opencv-haar-classifier/samples/1.bmp.vec differ diff --git a/opencv-haar-classifier/samples/3.bmp.vec b/opencv-haar-classifier/samples/3.bmp.vec index cc251c2..095db4e 100644 Binary files a/opencv-haar-classifier/samples/3.bmp.vec and b/opencv-haar-classifier/samples/3.bmp.vec differ diff --git a/opencv-haar-classifier/samples/4.bmp.vec b/opencv-haar-classifier/samples/4.bmp.vec index 9ba6467..2727024 100644 Binary files a/opencv-haar-classifier/samples/4.bmp.vec and b/opencv-haar-classifier/samples/4.bmp.vec differ diff --git a/opencv-haar-classifier/samples/5.bmp.vec b/opencv-haar-classifier/samples/5.bmp.vec index 034c989..f35aacb 100644 Binary files a/opencv-haar-classifier/samples/5.bmp.vec and b/opencv-haar-classifier/samples/5.bmp.vec differ diff --git a/opencv-haar-classifier/samples/6.bmp.vec b/opencv-haar-classifier/samples/6.bmp.vec index 9bf7c28..c961c6a 100644 Binary files a/opencv-haar-classifier/samples/6.bmp.vec and b/opencv-haar-classifier/samples/6.bmp.vec differ diff --git a/opencv-haar-classifier/samples/7.bmp.vec b/opencv-haar-classifier/samples/7.bmp.vec index 262cc34..74ddcb2 100644 Binary files a/opencv-haar-classifier/samples/7.bmp.vec and b/opencv-haar-classifier/samples/7.bmp.vec differ diff --git a/test_image_haar/.DS_Store b/test_image_haar/.DS_Store index f5947d4..f7b7dc3 100644 Binary files a/test_image_haar/.DS_Store and b/test_image_haar/.DS_Store differ diff --git a/xt detection/.DS_Store b/xt detection/.DS_Store index b6190be..9aeef46 100644 Binary files a/xt detection/.DS_Store and b/xt detection/.DS_Store differ diff --git a/xt detection/lsd_1.6/lsd b/xt detection/lsd_1.6/lsd index ba0b90c..a73c068 100755 Binary files a/xt detection/lsd_1.6/lsd and b/xt detection/lsd_1.6/lsd differ diff --git a/xt detection/lsd_1.6/lsd_call_example b/xt detection/lsd_1.6/lsd_call_example index 42c8af0..98fcd29 100755 Binary files a/xt detection/lsd_1.6/lsd_call_example and b/xt detection/lsd_1.6/lsd_call_example differ diff --git a/xt detection/thinning_algorithm/guohallthinning_test b/xt detection/thinning_algorithm/guohallthinning_test index 098aa4e..086a2a7 100755 Binary files a/xt detection/thinning_algorithm/guohallthinning_test and b/xt detection/thinning_algorithm/guohallthinning_test differ diff --git a/xt detection/thinning_algorithm/guohallthinning_test.cpp b/xt detection/thinning_algorithm/guohallthinning_test.cpp index b1611a4..0b89341 100644 --- a/xt detection/thinning_algorithm/guohallthinning_test.cpp +++ b/xt detection/thinning_algorithm/guohallthinning_test.cpp @@ -74,7 +74,7 @@ void thinningGuoHallIteration(bool testcase[testcase_height][testcase_width], in } } -main(void) +int main() { IplImage* sample = cvCreateImage(cvSize(testcase_width*40,testcase_height*40), 8, 3); IplImage* iteration = cvCreateImage(cvSize(testcase_width*40,testcase_height*40), 8, 3); @@ -97,4 +97,5 @@ main(void) thinningGuoHallIteration(testcase,0,iteration); thinningGuoHallIteration(testcase,1,iteration); cvWaitKey(); + return 0; } \ No newline at end of file diff --git a/xt detection/thinning_algorithm/image_zhangsuenthinning b/xt detection/thinning_algorithm/image_zhangsuenthinning index db5baaf..f0f8bc2 100755 Binary files a/xt detection/thinning_algorithm/image_zhangsuenthinning and b/xt detection/thinning_algorithm/image_zhangsuenthinning differ diff --git a/xt detection/thinning_algorithm/zhangsuenthinning_test b/xt detection/thinning_algorithm/zhangsuenthinning_test index 96f76f2..cdd562f 100755 Binary files a/xt detection/thinning_algorithm/zhangsuenthinning_test and b/xt detection/thinning_algorithm/zhangsuenthinning_test differ diff --git a/xt detection/thinning_algorithm/zhangsuenthinning_test.cpp b/xt detection/thinning_algorithm/zhangsuenthinning_test.cpp index e41048a..3a51994 100644 --- a/xt detection/thinning_algorithm/zhangsuenthinning_test.cpp +++ b/xt detection/thinning_algorithm/zhangsuenthinning_test.cpp @@ -44,8 +44,8 @@ void thinningZhangSuenIteration(bool testcase[testcase_height][testcase_width], bool p8 = testcase[i][j-1]; bool p9 = testcase[i-1][j-1]; - int A = (p2 == 0 && p3 == 1) + (p3 == 0 && p4 == 1) + - (p4 == 0 && p5 == 1) + (p5 == 0 && p6 == 1) + + int A = (p2 == 0 && p3 == 1) + (p3 == 0 && p4 == 1) + + (p4 == 0 && p5 == 1) + (p5 == 0 && p6 == 1) + (p6 == 0 && p7 == 1) + (p7 == 0 && p8 == 1) + (p8 == 0 && p9 == 1) + (p9 == 0 && p2 == 1); int B = p2 + p3 + p4 + p5 + p6 + p7 + p8 + p9; @@ -77,7 +77,7 @@ void thinningZhangSuenIteration(bool testcase[testcase_height][testcase_width], } } -main(void) +int main() { IplImage* sample = cvCreateImage(cvSize(testcase_width*10,testcase_height*10), 8, 3); IplImage* iteration = cvCreateImage(cvSize(testcase_width*10,testcase_height*10), 8, 3); @@ -101,8 +101,8 @@ main(void) { printf("iteration : %d\n", i + 1); thinningZhangSuenIteration(testcase,0,iteration); - thinningZhangSuenIteration(testcase,1,iteration); + thinningZhangSuenIteration(testcase,1,iteration); cvWaitKey(); } cvWaitKey(); -} \ No newline at end of file +}