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

Code clean up.

Browse Source
This commit is contained in:
Alexander Smorkalov
2012-10-22 16:43:20 +04:00
committed by Andrey Kamaev
parent c64ee44c9e
commit 898320a0f6
44 changed files with 34 additions and 1226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
samples/android/tutorial-4-mixed/AndroidManifest.xml
+1 -1
View File
@@ -22,7 +22,7 @@
android:largeScreens="true"
android:anyDensity="true" />
<uses-sdk android:minSdkVersion="11" />
<uses-sdk android:minSdkVersion="8" />
<uses-permission android:name="android.permission.CAMERA"/>
samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4Mixed.java
-6
View File
@@ -6,7 +6,6 @@ import org.opencv.android.OpenCVLoader;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
import org.opencv.framework.OpenCvJavaCameraView;
import org.opencv.framework.OpenCvNativeCameraView;
import org.opencv.framework.OpenCvCameraBridgeViewBase.CvCameraViewListener;
import org.opencv.highgui.Highgui;
import org.opencv.imgproc.Imgproc;
@@ -122,8 +121,6 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener {
public Mat onCameraFrame(Mat inputFrame) {
final int viewMode = mViewMode;
Log.d(TAG, "Input format: " + inputFrame);
switch (viewMode) {
case VIEW_MODE_GRAY:
// input frame has gray scale format
@@ -140,15 +137,12 @@ public class Sample4Mixed extends Activity implements CvCameraViewListener {
break;
case VIEW_MODE_FEATURES:
// input frame has RGBA format
//Imgproc.cvtColor(mYuv, mRgba, Imgproc.COLOR_YUV420sp2RGB, 4);
inputFrame.copyTo(mRgba);
Imgproc.cvtColor(mRgba, mGrayMat, Imgproc.COLOR_RGBA2GRAY);
FindFeatures(mGrayMat.getNativeObjAddr(), mRgba.getNativeObjAddr());
break;
}
Log.d(TAG, "Output format: " + mRgba);
return mRgba;
}