changing layout, adding ant and eclipse sections, more pictures

doc/tutorials/definitions/tocDefinitions.rst

@@ -8,4 +8,4 @@
 .. |Author_FernandoI| unicode:: Fernando U+0020 Iglesias U+0020 Garc U+00ED a
 .. |Author_EduardF| unicode:: Eduard U+0020 Feicho
 .. |Author_AlexB| unicode:: Alexandre U+0020 Benoit
-
+.. |Author_EricCh| unicode:: Eric U+0020 Christiansen

doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.rst

@@ -111,9 +111,9 @@ Here you can read tutorials about how to set up your computer to work with the O
 
                    *Compatibility:* > OpenCV 2.4.4
 
-                   *Author:* |Author_VsevolodG|
+                   *Author:* |Author_EricCh|
 
-                   Explains how to build and run a simple desktop Java application using Eclipse and the Simple Build Tool (SBT).
+                   Explains how to build and run a simple desktop Java application using Eclipse, Ant or the Simple Build Tool (SBT).
 
   ================ =================================================
 
@@ -258,7 +258,7 @@ Here you can read tutorials about how to set up your computer to work with the O
    ../linux_eclipse/linux_eclipse
    ../windows_install/windows_install
    ../windows_visual_studio_Opencv/windows_visual_studio_Opencv
-   ../android_binary_package/java_dev_intro
+   ../desktop_java/java_dev_intro
    ../android_binary_package/android_dev_intro
    ../android_binary_package/O4A_SDK
    ../android_binary_package/dev_with_OCV_on_Android

samples/java/ant/build.xml

+<project name="SimpleSample" basedir="." default="rebuild-run">
+
+    <property name="src.dir"     value="src"/>
+
+    <property name="lib.dir"     value="${ocvJarDir}"/>
+    <path id="classpath">
+        <fileset dir="${lib.dir}" includes="**/*.jar"/>
+    </path>
+
+    <property name="build.dir"   value="build"/>
+    <property name="classes.dir" value="${build.dir}/classes"/>
+    <property name="jar.dir"     value="${build.dir}/jar"/>
+
+    <property name="main-class"  value="${ant.project.name}"/>
+
+
+    <target name="clean">
+        <delete dir="${build.dir}"/>
+    </target>
+
+    <target name="compile">
+        <mkdir dir="${classes.dir}"/>
+        <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="classpath"/>
+    </target>
+
+    <target name="jar" depends="compile">
+        <mkdir dir="${jar.dir}"/>
+        <jar destfile="${jar.dir}/${ant.project.name}.jar" basedir="${classes.dir}">
+            <manifest>
+                <attribute name="Main-Class" value="${main-class}"/>
+            </manifest>
+        </jar>
+    </target>
+
+    <target name="run" depends="jar">
+        <java fork="true" classname="${main-class}">
+            <sysproperty key="java.library.path" path="${ocvLibDir}"/>
+            <classpath>
+                <path refid="classpath"/>
+                <path location="${jar.dir}/${ant.project.name}.jar"/>
+            </classpath>
+        </java>
+    </target>
+
+    <target name="rebuild" depends="clean,jar"/>
+
+    <target name="rebuild-run" depends="clean,run"/>
+
+</project>
\ No newline at end of file

samples/java/ant/src/SimpleSample.java

+import org.opencv.core.Mat;
+import org.opencv.core.CvType;
+import org.opencv.core.Scalar;
+
+class SimpleSample {
+
+  static{ System.loadLibrary("opencv_java244"); }
+
+  public static void main(String[] args) {
+    Mat m = new Mat(5, 10, CvType.CV_8UC1, new Scalar(0));
+    System.out.println("OpenCV Mat: " + m);
+    Mat mr1 = m.row(1);
+    mr1.setTo(new Scalar(1));
+    Mat mc5 = m.col(5);
+    mc5.setTo(new Scalar(5));
+    System.out.println("OpenCV Mat data:\n" + m.dump());
+  }
+
+}

samples/java/eclipse/HelloCV/.classpath

+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/opencv-2.4.4"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>

samples/java/eclipse/HelloCV/.project

+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>HelloCV</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>

samples/java/eclipse/HelloCV/.settings/org.eclipse.jdt.core.prefs

+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.7

samples/java/eclipse/HelloCV/src/Main.java

+import org.opencv.core.CvType;
+import org.opencv.core.Mat;
+
+public class Main {
+
+    public static void main(String[] args) {
+        System.loadLibrary("opencv_java244");
+        Mat m  = Mat.eye(3, 3, CvType.CV_8UC1);
+        System.out.println("m = " + m.dump());
+    }
+
+}

samples/java/README → samples/java/sbt/README

@@ -4,5 +4,3 @@ To run the examples:
 1) Install OpenCV and copy the OpenCV jar to lib/. This jar must match the native libraries installed in your system. If this isn't the case, you may get a java.lang.UnsatisfiedLinkError at runtime.
 
 3) Go to the root directory and type "sbt/sbt run". This should generate images in your current directory.
-
-MIT License
\ No newline at end of file

samples/java/project/build.scala → samples/java/sbt/project/build.scala

@@ -11,8 +11,8 @@ object OpenCVJavaDemoBuild extends Build {
     )
   )
 
-  def buildSettings = 
-    Project.defaultSettings ++ 
+  def buildSettings =
+    Project.defaultSettings ++
     scalaSettings
 
   lazy val root = {

samples/java/project/plugins.sbt → samples/java/sbt/project/plugins.sbt

 addSbtPlugin("com.typesafe.sbteclipse" % "sbteclipse-plugin" % "2.1.0")
-

samples/java/sbt/src/main/java/DetectFaceDemo.java

+import org.opencv.core.Core;
+import org.opencv.core.Mat;
+import org.opencv.core.MatOfRect;
+import org.opencv.core.Point;
+import org.opencv.core.Rect;
+import org.opencv.core.Scalar;
+import org.opencv.highgui.Highgui;
+import org.opencv.objdetect.CascadeClassifier;
+
+/*
+ * Detects faces in an image, draws boxes around them, and writes the results
+ * to "faceDetection.png".
+ */
+public class DetectFaceDemo {
+    public void run() {
+        System.out.println("\nRunning DetectFaceDemo");
+
+        // Create a face detector from the cascade file in the resources
+        // directory.
+        CascadeClassifier faceDetector = new CascadeClassifier(getClass()
+                .getResource("/lbpcascade_frontalface.xml").getPath());
+        Mat image = Highgui.imread(getClass().getResource(
+                "/AverageMaleFace.jpg").getPath());
+
+        // Detect faces in the image.
+        // MatOfRect is a special container class for Rect.
+        MatOfRect faceDetections = new MatOfRect();
+        faceDetector.detectMultiScale(image, faceDetections);
+
+        System.out.println(String.format("Detected %s faces",
+                faceDetections.toArray().length));
+
+        // Draw a bounding box around each face.
+        for (Rect rect : faceDetections.toArray()) {
+            Core.rectangle(image, new Point(rect.x, rect.y), new Point(rect.x
+                    + rect.width, rect.y + rect.height), new Scalar(0, 255, 0));
+        }
+
+        // Save the visualized detection.
+        String filename = "faceDetection.png";
+        System.out.println(String.format("Writing %s", filename));
+        Highgui.imwrite(filename, image);
+    }
+}
\ No newline at end of file

samples/java/src/main/scala/Main.scala → samples/java/sbt/src/main/scala/Main.scala

@@ -4,9 +4,9 @@
  * demonstrating the generic nature of the interface.
  * The other demos are in Java.
  * Currently, all demos are run, sequentially.
- * 
+ *
  * You're invited to submit your own examples, in any JVM language of
- * your choosing so long as you can get them to build. 
+ * your choosing so long as you can get them to build.
  */
 object Main extends App {
   // We must load the native library before using any OpenCV functions.

samples/java/src/main/scala/ScalaCorrespondenceMatchingDemo.scala → samples/java/sbt/src/main/scala/ScalaCorrespondenceMatchingDemo.scala

@@ -16,7 +16,7 @@ import reflect._
 object ScalaCorrespondenceMatchingDemo {
   def run() {
     println(s"\nRunning ${classTag[this.type].toString.replace("$", "")}")
-    
+
     // Detects keypoints and extracts descriptors in a given image of type Mat.
     def detectAndExtract(mat: Mat) = {
       // A special container class for KeyPoint.
@@ -27,7 +27,7 @@ object ScalaCorrespondenceMatchingDemo {
 
       println(s"There were ${keyPoints.toArray.size} KeyPoints detected")
 
-      // Let's just use the best KeyPoints.   
+      // Let's just use the best KeyPoints.
       val sorted = keyPoints.toArray.sortBy(_.response).reverse.take(50)
       // There isn't a constructor that takes Array[KeyPoint], so we unpack
       // the array and use the constructor that can take any number of
@@ -44,7 +44,7 @@ object ScalaCorrespondenceMatchingDemo {
       (bestKeyPoints, descriptors)
     }
 
-    // Load the images from the |resources| directory. 
+    // Load the images from the |resources| directory.
     val leftImage = Highgui.imread(getClass.getResource("/img1.bmp").getPath)
     val rightImage = Highgui.imread(getClass.getResource("/img2.bmp").getPath)
 

samples/java/src/main/java/DetectFaceDemo.java

-import org.opencv.core.Core;
-import org.opencv.core.Mat;
-import org.opencv.core.MatOfRect;
-import org.opencv.core.Point;
-import org.opencv.core.Rect;
-import org.opencv.core.Scalar;
-import org.opencv.highgui.Highgui;
-import org.opencv.objdetect.CascadeClassifier;
-
-/*
- * Detects faces in an image, draws boxes around them, and writes the results
- * to "faceDetection.png".
- */
-public class DetectFaceDemo {
-	public void run() {
-		System.out.println("\nRunning DetectFaceDemo");
-
-		// Create a face detector from the cascade file in the resources
-		// directory.
-		CascadeClassifier faceDetector = new CascadeClassifier(getClass()
-				.getResource("/lbpcascade_frontalface.xml").getPath());
-		Mat image = Highgui.imread(getClass().getResource(
-				"/AverageMaleFace.jpg").getPath());
-
-		// Detect faces in the image.
-		// MatOfRect is a special container class for Rect.
-		MatOfRect faceDetections = new MatOfRect();
-		faceDetector.detectMultiScale(image, faceDetections);
-
-		System.out.println(String.format("Detected %s faces",
-				faceDetections.toArray().length));
-
-		// Draw a bounding box around each face.
-		for (Rect rect : faceDetections.toArray()) {
-			Core.rectangle(image, new Point(rect.x, rect.y), new Point(rect.x
-					+ rect.width, rect.y + rect.height), new Scalar(0, 255, 0));
-		}
-
-		// Save the visualized detection.
-		String filename = "faceDetection.png";
-		System.out.println(String.format("Writing %s", filename));
-		Highgui.imwrite(filename, image);
-	}
-}
\ No newline at end of file