Commit 69322033 authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed Android samples; updated black list of enums.

parent 1fc895ff
...@@ -99,6 +99,14 @@ const_ignore_list = ( ...@@ -99,6 +99,14 @@ const_ignore_list = (
"CV_CAP_PROP_MAX_DC1394", "CV_CAP_PROP_MAX_DC1394",
"CV_CAP_GSTREAMER_QUEUE_LENGTH", "CV_CAP_GSTREAMER_QUEUE_LENGTH",
"CV_CAP_PROP_PVAPI_MULTICASTIP", "CV_CAP_PROP_PVAPI_MULTICASTIP",
"CV_CAP_PROP_SUPPORTED_PREVIEW_SIZES_STRING",
"EVENT_.*",
"CV_L?(BGRA?|RGBA?|GRAY|XYZ|YCrCb|Luv|Lab|HLS|YUV|HSV)\d*2L?(BGRA?|RGBA?|GRAY|XYZ|YCrCb|Luv|Lab|HLS|YUV|HSV).*",
"CV_COLORCVT_MAX",
"CV_.*Bayer.*",
"CV_YUV420i2.+",
"CV_TM_.+",
"CV_FLOODFILL_.+",
) )
......
...@@ -86,7 +86,7 @@ class ImageManipulationsView extends SampleCvViewBase { ...@@ -86,7 +86,7 @@ class ImageManipulationsView extends SampleCvViewBase {
CreateAuxiliaryMats(); CreateAuxiliaryMats();
imgproc.Canny(mGrayInnerWindow, mGrayInnerWindow, 80, 90); imgproc.Canny(mGrayInnerWindow, mGrayInnerWindow, 80, 90);
imgproc.cvtColor(mGrayInnerWindow, mRgbaInnerWindow, imgproc.CV_GRAY2BGRA, 4); imgproc.cvtColor(mGrayInnerWindow, mRgbaInnerWindow, imgproc.COLOR_GRAY2BGRA, 4);
break; break;
case ImageManipulationsActivity.VIEW_MODE_SOBEL: case ImageManipulationsActivity.VIEW_MODE_SOBEL:
...@@ -98,7 +98,7 @@ class ImageManipulationsView extends SampleCvViewBase { ...@@ -98,7 +98,7 @@ class ImageManipulationsView extends SampleCvViewBase {
imgproc.Sobel(mGrayInnerWindow, mIntermediateMat, CvType.CV_8U, 1, 1); imgproc.Sobel(mGrayInnerWindow, mIntermediateMat, CvType.CV_8U, 1, 1);
core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 10); core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 10);
imgproc.cvtColor(mIntermediateMat, mRgbaInnerWindow, imgproc.CV_GRAY2BGRA, 4); imgproc.cvtColor(mIntermediateMat, mRgbaInnerWindow, imgproc.COLOR_GRAY2BGRA, 4);
break; break;
case ImageManipulationsActivity.VIEW_MODE_SEPIA: case ImageManipulationsActivity.VIEW_MODE_SEPIA:
...@@ -117,9 +117,9 @@ class ImageManipulationsView extends SampleCvViewBase { ...@@ -117,9 +117,9 @@ class ImageManipulationsView extends SampleCvViewBase {
capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
if (mZoomCorner == null || mZoomWindow == null) if (mZoomCorner == null || mZoomWindow == null)
CreateAuxiliaryMats(); CreateAuxiliaryMats();
imgproc.resize(mZoomWindow, mZoomCorner, mZoomCorner.Size()); imgproc.resize(mZoomWindow, mZoomCorner, mZoomCorner.size());
Size wsize = mZoomWindow.Size(); Size wsize = mZoomWindow.size();
core.rectangle(mZoomWindow, new Point(1, 1), new Point(wsize.width - 2, wsize.height - 2), new Scalar(255, 0, 0, 255), 2); core.rectangle(mZoomWindow, new Point(1, 1), new Point(wsize.width - 2, wsize.height - 2), new Scalar(255, 0, 0, 255), 2);
break; break;
} }
......
...@@ -36,15 +36,15 @@ class Sample1View extends SampleViewBase { ...@@ -36,15 +36,15 @@ class Sample1View extends SampleViewBase {
switch (Sample1Java.viewMode) { switch (Sample1Java.viewMode) {
case Sample1Java.VIEW_MODE_GRAY: case Sample1Java.VIEW_MODE_GRAY:
imgproc.cvtColor(mGraySubmat, mRgba, imgproc.CV_GRAY2RGBA, 4); imgproc.cvtColor(mGraySubmat, mRgba, imgproc.COLOR_GRAY2RGBA, 4);
break; break;
case Sample1Java.VIEW_MODE_RGBA: case Sample1Java.VIEW_MODE_RGBA:
imgproc.cvtColor(mYuv, mRgba, imgproc.CV_YUV420i2RGB, 4); imgproc.cvtColor(mYuv, mRgba, imgproc.COLOR_YUV420i2RGB, 4);
core.putText(mRgba, "OpenCV + Android", new Point(10, 100), 3/* CV_FONT_HERSHEY_COMPLEX */, 2, new Scalar(255, 0, 0, 255), 3); core.putText(mRgba, "OpenCV + Android", new Point(10, 100), 3/* CV_FONT_HERSHEY_COMPLEX */, 2, new Scalar(255, 0, 0, 255), 3);
break; break;
case Sample1Java.VIEW_MODE_CANNY: case Sample1Java.VIEW_MODE_CANNY:
imgproc.Canny(mGraySubmat, mIntermediateMat, 80, 100); imgproc.Canny(mGraySubmat, mIntermediateMat, 80, 100);
imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.COLOR_GRAY2BGRA, 4);
break; break;
} }
......
...@@ -32,7 +32,7 @@ class Sample2View extends SampleCvViewBase { ...@@ -32,7 +32,7 @@ class Sample2View extends SampleCvViewBase {
switch (Sample2NativeCamera.viewMode) { switch (Sample2NativeCamera.viewMode) {
case Sample2NativeCamera.VIEW_MODE_GRAY: case Sample2NativeCamera.VIEW_MODE_GRAY:
capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME); capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME);
imgproc.cvtColor(mGray, mRgba, imgproc.CV_GRAY2RGBA, 4); imgproc.cvtColor(mGray, mRgba, imgproc.COLOR_GRAY2RGBA, 4);
break; break;
case Sample2NativeCamera.VIEW_MODE_RGBA: case Sample2NativeCamera.VIEW_MODE_RGBA:
capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA); capture.retrieve(mRgba, highgui.CV_CAP_ANDROID_COLOR_FRAME_RGBA);
...@@ -41,7 +41,7 @@ class Sample2View extends SampleCvViewBase { ...@@ -41,7 +41,7 @@ class Sample2View extends SampleCvViewBase {
case Sample2NativeCamera.VIEW_MODE_CANNY: case Sample2NativeCamera.VIEW_MODE_CANNY:
capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME); capture.retrieve(mGray, highgui.CV_CAP_ANDROID_GREY_FRAME);
imgproc.Canny(mGray, mIntermediateMat, 80, 100); imgproc.Canny(mGray, mIntermediateMat, 80, 100);
imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.COLOR_GRAY2BGRA, 4);
break; break;
} }
......
...@@ -36,17 +36,17 @@ class Sample4View extends SampleViewBase { ...@@ -36,17 +36,17 @@ class Sample4View extends SampleViewBase {
switch (Sample4Mixed.viewMode) { switch (Sample4Mixed.viewMode) {
case Sample4Mixed.VIEW_MODE_GRAY: case Sample4Mixed.VIEW_MODE_GRAY:
imgproc.cvtColor(mGraySubmat, mRgba, imgproc.CV_GRAY2RGBA, 4); imgproc.cvtColor(mGraySubmat, mRgba, imgproc.COLOR_GRAY2RGBA, 4);
break; break;
case Sample4Mixed.VIEW_MODE_RGBA: case Sample4Mixed.VIEW_MODE_RGBA:
imgproc.cvtColor(mYuv, mRgba, imgproc.CV_YUV420i2RGB, 4); imgproc.cvtColor(mYuv, mRgba, imgproc.COLOR_YUV420i2RGB, 4);
break; break;
case Sample4Mixed.VIEW_MODE_CANNY: case Sample4Mixed.VIEW_MODE_CANNY:
imgproc.Canny(mGraySubmat, mIntermediateMat, 80, 100); imgproc.Canny(mGraySubmat, mIntermediateMat, 80, 100);
imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.CV_GRAY2BGRA, 4); imgproc.cvtColor(mIntermediateMat, mRgba, imgproc.COLOR_GRAY2BGRA, 4);
break; break;
case Sample4Mixed.VIEW_MODE_FEATURES: case Sample4Mixed.VIEW_MODE_FEATURES:
imgproc.cvtColor(mYuv, mRgba, imgproc.CV_YUV420i2RGB, 4); imgproc.cvtColor(mYuv, mRgba, imgproc.COLOR_YUV420i2RGB, 4);
FindFeatures(mGraySubmat.getNativeObjAddr(), mRgba.getNativeObjAddr()); FindFeatures(mGraySubmat.getNativeObjAddr(), mRgba.getNativeObjAddr());
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment