commit for github

[ozzloy@gmail.com/oble] / hello-world.cpp

diff --git a/hello-world.cpp b/hello-world.cpp
index 01e749b0c68c533b2dae79e2b23daa6e7d15013c..7d68365d76f153bf8073e24d9bb86514fc125d96 100644 (file)
--- a/hello-world.cpp
+++ b/hello-world.cpp
@@ -7,9 +7,9 @@ CvHaarClassifierCascade* load_object_detector(const char* cascade_path)
        return (CvHaarClassifierCascade*)cvLoad( cascade_path );
 }
 
-void detect_and_draw_objects( IplImage* image,
+void detect_and_draw_objects(IplImage* image,
                CvHaarClassifierCascade* cascade,
-               int do_pyramids )
+               int do_pyramids)
 {
        IplImage* small_image = image;
        CvMemStorage* storage = cvCreateMemStorage(0);
@@ -45,7 +45,8 @@ void detect_and_draw_objects( IplImage* image,
        cvReleaseMemStorage( &storage );
 }
 
-// A Simple Camera Capture Framework.  serious conflict right here
+// A Simple Camera Capture Framework.
+>>>>>>> experimental:hello-world.cpp
 int main( int argc, char** argv )
 {
        CvHaarClassifierCascade* cascade = load_object_detector(argv[1]);