generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed android samples; fixed cmake files

Browse Source
This commit is contained in:
Andrey Kamaev
2011-07-22 13:34:25 +00:00
parent cb9dd71f82
commit ebf9916242
8 changed files with 19 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
View File

@@ -1,6 +1,6 @@
package org.opencv.samples.puzzle15;
import org.opencv.android;
import org.opencv.Android;
import org.opencv.core.Core;
import org.opencv.core.Mat;
import org.opencv.core.Size;
@@ -137,7 +137,7 @@ public class puzzle15View extends SampleCvViewBase implements OnTouchListener {
drawGrid(cols, rows);
Bitmap bmp = Bitmap.createBitmap(cols, rows, Bitmap.Config.ARGB_8888);
if (android.MatToBitmap(mRgba15, bmp))
if (Android.MatToBitmap(mRgba15, bmp))
return bmp;
bmp.recycle();

2
samples/android/CMakeLists.txt
View File

@@ -33,7 +33,7 @@ if (BUILD_ANDROID_EXAMPLES)
SET(sample_dir "${CMAKE_CURRENT_BINARY_DIR}/${sample}")
add_custom_target(${sample} ALL)
add_dependencies(${sample} opencv_java opencv_java_api)
add_dependencies(${sample} opencv_java)
set_target_properties(${sample} PROPERTIES
PROJECT_LABEL "(ANDROID EXAMPLE) ${sample}")

6
samples/android/face-detection/src/org/opencv/samples/fd/FdView.java
View File

@@ -7,7 +7,7 @@ import java.io.InputStream;
import java.util.LinkedList;
import java.util.List;
import org.opencv.android;
import org.opencv.Android;
import org.opencv.core.Core;
import org.opencv.core.Mat;
import org.opencv.core.Rect;
@@ -91,7 +91,7 @@ class FdView extends SampleCvViewBase {
Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888);
if (android.MatToBitmap(mRgba, bmp))
if (Android.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();
@@ -113,4 +113,4 @@ class FdView extends SampleCvViewBase {
mGray = null;
}
}
}
}

6
samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java
View File

@@ -1,6 +1,6 @@
package org.opencv.samples.imagemanipulations;
import org.opencv.android;
import org.opencv.Android;
import org.opencv.core.Core;
import org.opencv.core.Mat;
import org.opencv.core.Size;
@@ -135,7 +135,7 @@ class ImageManipulationsView extends SampleCvViewBase {
Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888);
if (android.MatToBitmap(mRgba, bmp))
if (Android.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();
@@ -175,4 +175,4 @@ class ImageManipulationsView extends SampleCvViewBase {
mZoomWindow = null;
}
}
}
}

6
samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java
View File

@@ -1,6 +1,6 @@
package org.opencv.samples.tutorial1;
import org.opencv.android;
import org.opencv.Android;
import org.opencv.core.Core;
import org.opencv.core.Mat;
import org.opencv.core.Point;
@@ -56,7 +56,7 @@ class Sample1View extends SampleViewBase {
Bitmap bmp = Bitmap.createBitmap(getFrameWidth(), getFrameHeight(), Bitmap.Config.ARGB_8888);
if (android.MatToBitmap(mRgba, bmp))
if (Android.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();
@@ -84,4 +84,4 @@ class Sample1View extends SampleViewBase {
mIntermediateMat = null;
}
}
}
}

6
samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java
View File

@@ -1,6 +1,6 @@
package org.opencv.samples.tutorial2;
import org.opencv.android;
import org.opencv.Android;
import org.opencv.core.Core;
import org.opencv.core.Mat;
import org.opencv.core.Point;
@@ -54,7 +54,7 @@ class Sample2View extends SampleCvViewBase {
Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888);
if (android.MatToBitmap(mRgba, bmp))
if (Android.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();
@@ -79,4 +79,4 @@ class Sample2View extends SampleCvViewBase {
mIntermediateMat = null;
}
}
}
}

6
samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java
View File

@@ -1,6 +1,6 @@
package org.opencv.samples.tutorial4;
import org.opencv.android;
import org.opencv.Android;
import org.opencv.core.Mat;
import org.opencv.core.CvType;
import org.opencv.imgproc.Imgproc;
@@ -56,7 +56,7 @@ class Sample4View extends SampleViewBase {
Bitmap bmp = Bitmap.createBitmap(getFrameWidth(), getFrameHeight(), Bitmap.Config.ARGB_8888);
if (android.MatToBitmap(mRgba, bmp))
if (Android.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();
@@ -90,4 +90,4 @@ class Sample4View extends SampleViewBase {
static {
System.loadLibrary("mixed_sample");
}
}
}