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

Java API: fixing converters (copyData=true) and samples compilation

Browse Source 
Testing: 1079/0/592
This commit is contained in:
Andrey Pavlenko
2011-08-03 11:57:00 +00:00
parent 6935e95c2a
commit fa0daa4809
9 changed files with 33 additions and 28 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.Utils;
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 (Utils.MatToBitmap(mRgba15, bmp))
return bmp;
bmp.recycle();

4
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.Utils;
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 (Utils.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();

4
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.Utils;
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 (Utils.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();

4
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.Utils;
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 (Utils.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();

4
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.Utils;
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 (Utils.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();

4
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.Utils;
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 (Utils.MatToBitmap(mRgba, bmp))
return bmp;
bmp.recycle();