From 670886942589b8a1a85b831077c56e4d996a895f Mon Sep 17 00:00:00 2001
From: Andrey Pavlenko <no@email>
Date: Thu, 22 Mar 2012 07:25:29 +0000
Subject: [PATCH] updating Java samples to meet Java API changes

---
 samples/android/face-detection/src/org/opencv/samples/fd/FdView.java    | 2 +-
 .../org/opencv/samples/imagemanipulations/ImageManipulationsView.java   | 2 +-
 samples/android/tutorial-0-androidcamera/.classpath                     | 1 +
 samples/android/tutorial-3-native/.classpath                            | 1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/samples/android/face-detection/src/org/opencv/samples/fd/FdView.java b/samples/android/face-detection/src/org/opencv/samples/fd/FdView.java
index cff1af3..facad4c 100644
--- a/samples/android/face-detection/src/org/opencv/samples/fd/FdView.java
+++ b/samples/android/face-detection/src/org/opencv/samples/fd/FdView.java
@@ -83,7 +83,7 @@ class FdView extends SampleCvViewBase {
             int faceSize = Math.round(height * FdActivity.minFaceSize);
             List<Rect> faces = new LinkedList<Rect>();
             mCascade.detectMultiScale(mGray, faces, 1.1, 2, 2 // TODO: objdetect.CV_HAAR_SCALE_IMAGE
-                    , new Size(faceSize, faceSize));
+                    , new Size(faceSize, faceSize), new Size());
 
             for (Rect r : faces)
                 Core.rectangle(mRgba, r.tl(), r.br(), new Scalar(0, 255, 0, 255), 3);
diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java
index 715dd4c..34b233e 100644
--- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java
+++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java
@@ -107,7 +107,7 @@ class ImageManipulationsView extends SampleCvViewBase {
                 CreateAuxiliaryMats();
 
             Imgproc.Sobel(mGrayInnerWindow, mIntermediateMat, CvType.CV_8U, 1, 1);
-            Core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 10);
+            Core.convertScaleAbs(mIntermediateMat, mIntermediateMat, 10, 0);
             Imgproc.cvtColor(mIntermediateMat, mRgbaInnerWindow, Imgproc.COLOR_GRAY2BGRA, 4);
             break;
 
diff --git a/samples/android/tutorial-0-androidcamera/.classpath b/samples/android/tutorial-0-androidcamera/.classpath
index aff8e75..8981741 100644
--- a/samples/android/tutorial-0-androidcamera/.classpath
+++ b/samples/android/tutorial-0-androidcamera/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/samples/android/tutorial-3-native/.classpath b/samples/android/tutorial-3-native/.classpath
index aff8e75..8981741 100644
--- a/samples/android/tutorial-3-native/.classpath
+++ b/samples/android/tutorial-3-native/.classpath
@@ -3,5 +3,6 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
-- 
2.7.4