From dbd30d4fbaec457c48aeef3464ef02cf92c95ee1 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Mon, 15 Oct 2012 17:53:57 +0400 Subject: [PATCH] Revert "fixing Java test and sample after moving drawContours() from Imgproc to Core" This reverts commit eb4ce67dac4b0ebdb7e0c6f97cecd3bf263c14e5. Conflicts: samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java --- .../android_test/src/org/opencv/test/imgproc/ImgprocTest.java | 4 ++-- .../samples/colorblobdetect/ColorBlobDetectionView.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java b/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java index 5aec91831..2c3b58e81 100644 --- a/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java +++ b/modules/java/android_test/src/org/opencv/test/imgproc/ImgprocTest.java @@ -678,7 +678,7 @@ public class ImgprocTest extends OpenCVTestCase { List contours = new ArrayList(); Imgproc.findContours(gray0, contours, new Mat(), Imgproc.RETR_EXTERNAL, Imgproc.CHAIN_APPROX_SIMPLE); - Core.drawContours(gray0, contours, -1, new Scalar(0)); + Imgproc.drawContours(gray0, contours, -1, new Scalar(0)); assertEquals(0, Core.countNonZero(gray0)); } @@ -688,7 +688,7 @@ public class ImgprocTest extends OpenCVTestCase { List contours = new ArrayList(); Imgproc.findContours(gray0, contours, new Mat(), Imgproc.RETR_EXTERNAL, Imgproc.CHAIN_APPROX_SIMPLE); - Core.drawContours(gray0, contours, -1, new Scalar(0), Core.FILLED); + Imgproc.drawContours(gray0, contours, -1, new Scalar(0), Core.FILLED); assertEquals(0, Core.countNonZero(gray0)); } diff --git a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java index e7fdbcf21..6ad57daa3 100644 --- a/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java +++ b/samples/android/color-blob-detection/src/org/opencv/samples/colorblobdetect/ColorBlobDetectionView.java @@ -116,7 +116,7 @@ public class ColorBlobDetectionView extends SampleCvViewBase implements OnTouchL mDetector.process(mRgba); List contours = mDetector.getContours(); Log.e(TAG, "Contours count: " + contours.size()); - Core.drawContours(mRgba, contours, -1, CONTOUR_COLOR); + Imgproc.drawContours(mRgba, contours, -1, CONTOUR_COLOR); Mat colorLabel = mRgba.submat(2, 34, 2, 34); colorLabel.setTo(mBlobColorRgba);