From b484f377dd3ff5bcbe8269374025edae4196dc8c Mon Sep 17 00:00:00 2001 From: Dmitry Melnichenko Date: Thu, 3 Sep 2015 15:18:42 +0300 Subject: [PATCH 1/2] Fix build of Java-Sbt sample --- samples/java/sbt/project/plugins.sbt | 2 +- samples/java/sbt/src/main/java/DetectFaceDemo.java | 1 + samples/java/sbt/src/main/scala/ScalaDetectFaceDemo.scala | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/samples/java/sbt/project/plugins.sbt b/samples/java/sbt/project/plugins.sbt index c2371be434..737941ded0 100644 --- a/samples/java/sbt/project/plugins.sbt +++ b/samples/java/sbt/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.0") +addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "4.0.0") diff --git a/samples/java/sbt/src/main/java/DetectFaceDemo.java b/samples/java/sbt/src/main/java/DetectFaceDemo.java index af842d38c6..2b795351db 100644 --- a/samples/java/sbt/src/main/java/DetectFaceDemo.java +++ b/samples/java/sbt/src/main/java/DetectFaceDemo.java @@ -5,6 +5,7 @@ import org.opencv.core.Point; import org.opencv.core.Rect; import org.opencv.core.Scalar; import org.opencv.imgcodecs.Imgcodecs; +import org.opencv.imgproc.Imgproc; import org.opencv.objdetect.CascadeClassifier; /* diff --git a/samples/java/sbt/src/main/scala/ScalaDetectFaceDemo.scala b/samples/java/sbt/src/main/scala/ScalaDetectFaceDemo.scala index d1df0e3760..cf8a1a2ee8 100644 --- a/samples/java/sbt/src/main/scala/ScalaDetectFaceDemo.scala +++ b/samples/java/sbt/src/main/scala/ScalaDetectFaceDemo.scala @@ -3,6 +3,7 @@ import org.opencv.core.MatOfRect import org.opencv.core.Point import org.opencv.core.Scalar import org.opencv.imgcodecs.Imgcodecs +import org.opencv.imgproc.Imgproc import org.opencv.objdetect.CascadeClassifier import reflect._ From 319b6a447ff4df802a0f8727a9206cb5645c742e Mon Sep 17 00:00:00 2001 From: Dmitry Melnichenko Date: Thu, 3 Sep 2015 17:16:59 +0300 Subject: [PATCH 2/2] Change SURF to ORB in Java-Sbt sample to remove dependency on external non-free modules --- .../src/main/scala/ScalaCorrespondenceMatchingDemo.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/samples/java/sbt/src/main/scala/ScalaCorrespondenceMatchingDemo.scala b/samples/java/sbt/src/main/scala/ScalaCorrespondenceMatchingDemo.scala index e8259827a3..47eae31570 100644 --- a/samples/java/sbt/src/main/scala/ScalaCorrespondenceMatchingDemo.scala +++ b/samples/java/sbt/src/main/scala/ScalaCorrespondenceMatchingDemo.scala @@ -21,8 +21,8 @@ object ScalaCorrespondenceMatchingDemo { def detectAndExtract(mat: Mat) = { // A special container class for KeyPoint. val keyPoints = new MatOfKeyPoint - // We're using the SURF detector. - val detector = FeatureDetector.create(FeatureDetector.SURF) + // We're using the ORB detector. + val detector = FeatureDetector.create(FeatureDetector.ORB) detector.detect(mat, keyPoints) println(s"There were ${keyPoints.toArray.size} KeyPoints detected") @@ -34,8 +34,8 @@ object ScalaCorrespondenceMatchingDemo { // arguments. val bestKeyPoints: MatOfKeyPoint = new MatOfKeyPoint(sorted: _*) - // We're using the SURF descriptor. - val extractor = DescriptorExtractor.create(DescriptorExtractor.SURF) + // We're using the ORB descriptor. + val extractor = DescriptorExtractor.create(DescriptorExtractor.ORB) val descriptors = new Mat extractor.compute(mat, bestKeyPoints, descriptors)