potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-31 00:03:03 +04:00
Code Packages Releases Wiki Activity

reverted occasional commit

Browse Source
This commit is contained in:
Kirill Kornyakov
2011-11-24 12:20:45 +00:00
parent 913811836a
commit 7d8f487b03
7 changed files with 15 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/android/tutorial-0-androidcamera/src/org/opencv/samples/tutorial0/SampleViewBase.java
+5 -5
View File
@@ -59,11 +59,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
params.setPreviewSize(getFrameWidth(), getFrameHeight());
mCamera.setParameters(params);
// try {
// mCamera.setPreviewDisplay(null);
// } catch (IOException e) {
// Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
// }
try {
mCamera.setPreviewDisplay(null);
} catch (IOException e) {
Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
}
mCamera.startPreview();
}
}
samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/SampleViewBase.java
+5 -5
View File
@@ -59,11 +59,11 @@ public abstract class SampleViewBase extends SurfaceView implements SurfaceHolde
params.setPreviewSize(getFrameWidth(), getFrameHeight());
mCamera.setParameters(params);
// try {
// mCamera.setPreviewDisplay(null);
// } catch (IOException e) {
// Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
// }
try {
mCamera.setPreviewDisplay(null);
} catch (IOException e) {
Log.e(TAG, "mCamera.setPreviewDisplay fails: " + e);
}
mCamera.startPreview();
}
}
samples/c/facedetect.cpp
+1 -18
View File
@@ -8,23 +8,6 @@
using namespace std;
using namespace cv;
int main( int argc, const char** argv )
{
vector<Point2f> points;
points.push_back(Point2f(0.0, 0.0));
points.push_back(Point2f(-1.0, 1.0));
points.push_back(Point2f(1.0, 1.0));
points.push_back(Point2f(1.0, -1.0));
points.push_back(Point2f(-1.0, -1.0));
RotatedRect rrect;
rrect = fitEllipse(points);
cout << rrect.center << endl;
cout << rrect.size.width << endl;
cout << rrect.size.height << endl;
}
void help()
{
cout << "\nThis program demonstrates the cascade recognizer. Now you can use Haar or LBP features.\n"
@@ -47,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;