reverted

diff --git a/samples/android/hello-android/cmake_android.sh b/samples/android/hello-android/cmake_android.sh
index affb5eb..f233e30 100644 (file)
--- a/samples/android/hello-android/cmake_android.sh
+++ b/samples/android/hello-android/cmake_android.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 cd `dirname $0`
 
-BUILD_DIR=build
-opencv_android=/home/kir/work/ros_opencv_trunk/opencv/android
+BUILD_DIR=build_armeabi
+opencv_android=`pwd`/../../../android
 opencv_build_dir=$opencv_android/$BUILD_DIR
 
 mkdir -p $BUILD_DIR

diff --git a/samples/android/hello-android/main.cpp b/samples/android/hello-android/main.cpp
index 2723b94..cfe6a30 100644 (file)
--- a/samples/android/hello-android/main.cpp
+++ b/samples/android/hello-android/main.cpp
@@ -1,95 +1,10 @@
 #include <opencv2/core/core.hpp>\r
-#include <opencv2/imgproc/imgproc.hpp>\r
-#include <opencv2/contrib/contrib.hpp>\r
 #include <opencv2/highgui/highgui.hpp>\r
 \r
 using namespace cv;\r
-\r
-int main11(int argc, char* argv[])\r
-{\r
-    TickMeter timer;\r
-    vector<double> times;\r
-\r
-    Scalar x;\r
-    double s = 0.0;\r
-    \r
-    int nIters = 100;\r
-    for (int i = 0; i < nIters; i++)\r
-    {\r
-        timer.start();\r
-        \r
-            Mat m(4096, 1024, CV_32F);\r
-            //m.setTo(Scalar(33.0));\r
-            randu(m, 0, 256);\r
-            x = sum(m);\r
-                  \r
-        timer.stop();\r
-        times.push_back(timer.getTimeMilli());\r
-        timer.reset();\r
-        \r
-        x = sum(m);\r
-        s += x[0];\r
-    }\r
-\r
-    for (int i = 0; i < nIters; i++)\r
-        printf("time[%d] = %.2f ms\n", i, times[i]);\r
-    \r
-    printf("s = %f\n", s);\r
-}\r
-\r
-int main3(int argc, char* argv[])\r
-{\r
-    int w = 1280;\r
-    int h = 720;\r
-    \r
-    Mat m1(w, h, CV_8U);\r
-    Mat m2(w, h, CV_8U);\r
-    Mat m3(w, h, CV_8U);\r
-    Mat dst(w, h, CV_8U);\r
-    \r
-    Scalar x;\r
-    double s = 0.0;\r
-    \r
-    TickMeter timer1;\r
-    TickMeter timer2;\r
-    TickMeter timer3;\r
-    \r
-    int nIters = 100;\r
-    for (int i = 0; i < nIters; i++)\r
-    {\r
-        randu(m1, 0, 256);\r
-        randu(m2, 0, 256);\r
-        \r
-        equalizeHist(m1, m1);\r
-        equalizeHist(m2, m2);\r
-        \r
-        timer1.start();\r
-        add(m1, m2, dst);\r
-        timer1.stop();\r
-              \r
-        normalize(dst, dst, dst.total());\r
-        \r
-        timer2.start();\r
-        m3 = m1 + m2;\r
-        timer2.stop();\r
-        \r
-        timer3.start();        \r
-        dst = m3 + dst;\r
-        timer3.stop();\r
-        \r
-        x = sum(dst);\r
-        s += x[0];\r
-    }\r
-    \r
-    printf("s = %f\n", s);\r
-    printf("timer1 = %.2f ms\n", timer1.getTimeMilli()/nIters);\r
-    printf("timer2 = %.2f ms\n", timer2.getTimeMilli()/nIters);\r
-    printf("timer3 = %.2f ms\n", timer3.getTimeMilli()/nIters);\r
-}\r
-\r
 const char* message = "Hello Android!";\r
 \r
-int main2(int argc, char* argv[])\r
+int main(int argc, char* argv[])\r
 {\r
   // print message to console\r
   printf("%s\n", message);\r
@@ -98,7 +13,7 @@ int main2(int argc, char* argv[])
   Size textsize = getTextSize(message, CV_FONT_HERSHEY_COMPLEX, 3, 5, 0);\r
   Mat img(textsize.height + 20, textsize.width + 20, CV_32FC1, Scalar(230,230,230));\r
   putText(img, message, Point(10, img.rows - 10), CV_FONT_HERSHEY_COMPLEX, 3, Scalar(0, 0, 0), 5);\r
-  \r
+\r
   // save\show resulting image\r
 #if ANDROID\r
   imwrite("/mnt/sdcard/HelloAndroid.png", img);\r
@@ -106,7 +21,6 @@ int main2(int argc, char* argv[])
   imshow("test", img);\r
   waitKey();\r
 #endif\r
-\r
-return 0;\r
+  return 0;\r
 }\r
 \r

diff --git a/samples/c/facedetect.cpp b/samples/c/facedetect.cpp
index 73dbdc9..46b3a6c 100644 (file)
--- a/samples/c/facedetect.cpp
+++ b/samples/c/facedetect.cpp
@@ -8,21 +8,6 @@
 using namespace std;
 using namespace cv;
 
-int main(int argc, char** argv)
-{
-    vector<Point2f> points;
-    points.push_back(Point2f(1.0, 1.0));
-    points.push_back(Point2f(5.0, 1.0));
-    points.push_back(Point2f(4.0, 3.0));
-    points.push_back(Point2f(6.0, 2.0));
-
-    RotatedRect rrect = minAreaRect(points);
-
-    cout << rrect.center << endl;
-
-    return 0;
-}
-
 void help()
 {
     cout << "\nThis program demonstrates the cascade recognizer. Now you can use Haar or LBP features.\n"
@@ -45,7 +30,7 @@ void detectAndDraw( Mat& img,
 String cascadeName = "../../data/haarcascades/haarcascade_frontalface_alt.xml";
 String nestedCascadeName = "../../data/haarcascades/haarcascade_eye_tree_eyeglasses.xml";
 
-int main1( int argc, const char** argv )
+int main( int argc, const char** argv )
 {
     CvCapture* capture = 0;
     Mat frame, frameCopy, image;