Merge remote-tracking branch 'origin/2.4'

Conflicts:
	doc/tutorials/features2d/feature_detection/feature_detection.rst
	modules/bioinspired/doc/retina/index.rst
	modules/core/include/opencv2/core/core.hpp
	modules/core/include/opencv2/core/mat.hpp
	modules/core/include/opencv2/core/operations.hpp
	modules/core/src/stat.cpp
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/imgproc/src/filter.cpp
	modules/legacy/src/dpstereo.cpp
	modules/nonfree/src/surf.ocl.cpp
	modules/ocl/doc/image_processing.rst
	modules/ocl/doc/object_detection.rst
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/initialization.cpp
	modules/ocl/src/matrix_operations.cpp
	modules/ocl/src/pyrdown.cpp
	modules/ocl/src/pyrup.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_objdetect.cpp
	modules/ocl/test/utility.hpp

doc/tutorials/bioinspired/retina_model/retina_model.rst~

@@ -44,7 +44,7 @@ In the following image, applying the ideas proposed in [benoit2010]_, as your re
    :align: center
 
 
-*Note :* image sample can be downloaded from the `OpenEXR website <http://www.openexr.com>`_. Regarding this demonstration, before retina processing, input image has been linearly rescaled within 0-255 keeping its channels float format. 5% of its histogram ends has been cut (mostly removes wrong HDR pixels). Check out the sample *opencv/samples/cpp/OpenEXRimages_HighDynamicRange_Retina_toneMapping.cpp* for similar processing. The following demonstration will only consider classical 8bit/channel images.
+*Note :* image sample can be downloaded from the `OpenEXR website <http://www.openexr.com>`_. Regarding this demonstration, before retina processing, input image has been linearly rescaled within 0-255 keeping its channels float format. 5% of its histogram ends has been cut (mostly removes wrong HDR pixels). Check out the sample *opencv/samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp* for similar processing. The following demonstration will only consider classical 8bit/channel images.
 
 The retina model output channels
 ================================

doc/tutorials/core/mat_the_basic_image_container/mat_the_basic_image_container.rst

@@ -21,7 +21,7 @@ OpenCV has been around since 2001. In those days the library was built around a
 
 Luckily C++ came around and introduced the concept of classes making easier for the user through automatic memory management (more or less). The good news is that C++ is fully compatible with C so no compatibility issues can arise from making the change. Therefore, OpenCV 2.0 introduced a new C++ interface which offered a new way of doing things which means you do not need to fiddle with memory management, making your code concise (less to write, to achieve more). The main downside of the C++ interface is that many embedded development systems at the moment support only C. Therefore, unless you are targeting embedded platforms, there's no point to using the *old* methods (unless you're a masochist programmer and you're asking for trouble).
 
-The first thing you need to know about *Mat* is that you no longer need to manually allocate its memory and release it as soon as you do not need it. While doing this is still a possibility, most of the OpenCV functions will allocate its output data manually. As a nice bonus if you pass on an already existing *Mat* object, which has already  allocated the required space for the matrix, this will be reused. In other words we use at all times only as much memory as we need to perform the task.
+The first thing you need to know about *Mat* is that you no longer need to manually allocate its memory and release it as soon as you do not need it. While doing this is still a possibility, most of the OpenCV functions will allocate its output data automatically. As a nice bonus if you pass on an already existing *Mat* object, which has already  allocated the required space for the matrix, this will be reused. In other words we use at all times only as much memory as we need to perform the task.
 
 *Mat* is basically a class with two data parts: the matrix header (containing information such as the size of the matrix, the method used for storing, at which address is the matrix stored, and so on) and a pointer to the matrix containing the pixel values (taking any dimensionality depending on the method chosen for storing) . The matrix header size is constant, however the size of the matrix itself may vary from image to image and usually is larger by orders of magnitude.
 

doc/tutorials/definitions/tocDefinitions.rst

@@ -11,3 +11,4 @@
 .. |Author_EricCh| unicode:: Eric U+0020 Christiansen
 .. |Author_AndreyP| unicode:: Andrey U+0020 Pavlenko
 .. |Author_AlexS| unicode:: Alexander U+0020 Smorkalov
+.. |Author_BarisD| unicode:: Bar U+0131 U+015F U+0020 Evrim U+0020 Demir U+00F6 z

doc/tutorials/features2d/feature_detection/feature_detection.rst

@@ -30,6 +30,7 @@ This tutorial code's is shown lines below. You can also download it from `here <
    #include <iostream>
    #include "opencv2/core.hpp"
    #include "opencv2/features2d.hpp"
+   #include "opencv2/nonfree/features2d.hpp"
    #include "opencv2/highgui.hpp"
    #include "opencv2/nonfree.hpp"
 

doc/tutorials/introduction/desktop_java/java_dev_intro.rst

@@ -7,10 +7,9 @@ Introduction to Java Development
 
 As of OpenCV 2.4.4, OpenCV supports desktop Java development using nearly the same interface as for
 Android development. This guide will help you to create your first Java (or Scala) application using OpenCV.
-We will use either `Eclipse <http://eclipse.org/>`_, `Apache Ant <http://ant.apache.org/>`_ or the
-`Simple Build Tool (SBT) <http://www.scala-sbt.org/>`_ to build the application.
+We will use either `Apache Ant <http://ant.apache.org/>`_ or `Simple Build Tool (SBT) <http://www.scala-sbt.org/>`_ to build the application.
 
-For further reading after this guide, look at the :ref:`Android_Dev_Intro` tutorials.
+If you want to use Eclipse head to :ref:`Java_Eclipse`. For further reading after this guide, look at the :ref:`Android_Dev_Intro` tutorials.
 
 What we'll do in this guide
 ===========================
@@ -19,7 +18,7 @@ In this guide, we will:
 
 * Get OpenCV with desktop Java support
 
-* Create an ``Ant``, ``Eclipse`` or ``SBT`` project
+* Create an ``Ant`` or ``SBT`` project
 
 * Write a simple OpenCV application in Java or Scala
 
@@ -233,97 +232,6 @@ Java sample with Ant
         :alt: run app with Ant
         :align: center
 
-Java project in Eclipse
-=======================
-
-Now let's look at the possiblity of using OpenCV in Java when developing in Eclipse IDE.
-
-* Create a new Eclipse workspace
-* Create a new Java project via :guilabel:`File --> New --> Java Project`
-
-  .. image:: images/eclipse_new_java_prj.png
-     :alt: Eclipse: new Java project
-     :align: center
-
-  Call it say "HelloCV".
-
-* Open :guilabel:`Java Build Path` tab on :guilabel:`Project Properties` dialog
-  and configure additional library (OpenCV) reference (jar and native library location):
-
-  .. image:: images/eclipse_user_lib.png
-     :alt: Eclipse: external JAR
-     :align: center
-
-  |
-
-  .. image:: images/eclipse_user_lib2.png
-     :alt: Eclipse: external JAR
-     :align: center
-
-  |
-
-  .. image:: images/eclipse_user_lib3.png
-     :alt: Eclipse: external JAR
-     :align: center
-
-  |
-
-  .. image:: images/eclipse_user_lib4.png
-     :alt: Eclipse: external JAR
-     :align: center
-
-  |
-
-  .. image:: images/eclipse_user_lib5.png
-     :alt: Eclipse: external JAR
-     :align: center
-
-  |
-
-  .. image:: images/eclipse_user_lib6.png
-     :alt: Eclipse: external JAR
-     :align: center
-
-  |
-
-  .. image:: images/eclipse_user_lib7.png
-     :alt: Eclipse: external JAR
-     :align: center
-
-  |
-
-  .. image:: images/eclipse_user_lib8.png
-     :alt: Eclipse: external JAR
-     :align: center
-
-
-* Add a new Java class (say ``Main``) containing the application entry:
-
-  .. image:: images/eclipse_main_class.png
-     :alt: Eclipse: Main class
-     :align: center
-
-* Put some simple OpenCV calls there, e.g.:
-
-  .. code-block:: java
-
-    import org.opencv.core.Core;
-    import org.opencv.core.CvType;
-    import org.opencv.core.Mat;
-
-    public class Main {
-        public static void main(String[] args) {
-            System.loadLibrary(Core.NATIVE_LIBRARY_NAME);
-            Mat m  = Mat.eye(3, 3, CvType.CV_8UC1);
-            System.out.println("m = " + m.dump());
-        }
-    }
-
-* Press :guilabel:`Run` button and find the identity matrix content in the Eclipse ``Console`` window.
-
-  .. image:: images/eclipse_run.png
-     :alt: Eclipse: run
-     :align: center
 
 SBT project for Java and Scala
 ==============================

doc/tutorials/introduction/java_eclipse/java_eclipse.rst

@@ -0,0 +1,110 @@
+
+.. _Java_Eclipse:
+
+
+Using OpenCV Java with Eclipse
+*********************************************
+
+Since version 2.4.4 `OpenCV supports Java <http://opencv.org/opencv-java-api.html>`_. In this tutorial I will explain how to setup development environment for using OpenCV Java with Eclipse in **Windows**, so you can enjoy the benefits of garbage collected, very refactorable (rename variable, extract method and whatnot) modern language that enables you to write code with less effort and make less mistakes. Here we go.
+
+
+Configuring Eclipse
+===================
+
+First, obtain a fresh release of OpenCV `from download page <http://opencv.org/downloads.html>`_ and extract it under a simple location like ``C:\OpenCV-2.4.6\``. I am using version 2.4.6, but the steps are more or less the same for other versions.
+
+Now, we will define OpenCV as a user library in Eclipse, so we can reuse the configuration for any project. Launch Eclipse and select :guilabel:`Window --> Preferences` from the menu.
+
+.. image:: images/1-window-preferences.png
+     :alt: Eclipse preferences
+     :align: center
+
+Navigate under :guilabel:`Java --> Build Path --> User Libraries` and click :guilabel:`New...`.
+
+.. image:: images/2-user-library-new.png
+     :alt: Creating a new library
+     :align: center
+
+Enter a name, e.g. ``OpenCV-2.4.6``, for your new library.
+
+.. image:: images/3-library-name.png
+     :alt: Naming the new library
+     :align: center
+
+Now select your new user library and click :guilabel:`Add External JARs...`.
+
+.. image:: images/4-add-external-jars.png
+     :alt: Adding external jar
+     :align: center
+
+Browse through ``C:\OpenCV-2.4.6\build\java\`` and select ``opencv-246.jar``. After adding the jar, extend the :guilabel:`opencv-246.jar` and select :guilabel:`Native library location` and press :guilabel:`Edit...`.
+
+.. image:: images/5-native-library.png
+     :alt: Selecting native library location 1
+     :align: center
+
+Select :guilabel:`External Folder...` and browse to select the folder ``C:\OpenCV-2.4.6\build\java\x64``. If you have a 32-bit system you need to select the ``x86`` folder instead of ``x64``.
+
+.. image:: images/6-external-folder.png
+     :alt: Selecting native library location 2
+     :align: center
+
+Your user library configuration should look like this:
+
+.. image:: images/7-user-library-final.png
+     :alt: Selecting native library location 2
+     :align: center
+
+
+Testing the configuration on a new Java project
+=====================================================
+
+Now start creating a new Java project.
+
+.. image:: images/7_5-new-java-project.png
+     :alt: Creating new Java project
+     :align: center
+
+On the :guilabel:`Java Settings` step, under :guilabel:`Libraries` tab, select :guilabel:`Add Library...` and select :guilabel:`OpenCV-2.4.6`, then click :guilabel:`Finish`.
+
+.. image:: images/8-add-library.png
+     :alt: Adding user defined library 1
+     :align: center
+
+.. image:: images/9-select-user-lib.png
+     :alt: Adding user defined library 2
+     :align: center
+
+
+Libraries should look like this:
+
+.. image:: images/10-new-project-created.png
+     :alt: Adding user defined library
+     :align: center
+
+
+Now you have created and configured a new Java project it is time to test it. Create a new java file. Here is a starter code for your convenience:
+
+.. code-block:: java
+
+   import org.opencv.core.Core;
+   import org.opencv.core.CvType;
+   import org.opencv.core.Mat;
+
+   public class Hello
+   {
+      public static void main( String[] args )
+      {
+         System.loadLibrary( Core.NATIVE_LIBRARY_NAME );
+         Mat mat = Mat.eye( 3, 3, CvType.CV_8UC1 );
+         System.out.println( "mat = " + mat.dump() );
+      }
+   }
+
+When you run the code you should see 3x3 identity matrix as output.
+
+.. image:: images/11-the-code.png
+     :alt: Adding user defined library
+     :align: center
+
+That is it, whenever you start a new project just add the OpenCV user library that you have defined to your project and you are good to go. Enjoy your powerful, less painful development environment :)

doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.rst

@@ -138,6 +138,24 @@ world of the OpenCV.
                         :height: 90pt
                         :width:  90pt
 
+  .. tabularcolumns:: m{100pt} m{300pt}
+  .. cssclass:: toctableopencv
+
+  ================ =================================================
+  |EclipseLogo|    **Title:** :ref:`Java_Eclipse`
+
+                   *Compatibility:* > OpenCV 2.4.4
+
+                   *Author:* |Author_BarisD|
+
+                   A tutorial on how to use OpenCV Java with Eclipse.
+
+  ================ =================================================
+
+     .. |EclipseLogo| image:: images/eclipse-logo.png
+                        :height: 90pt
+                        :width:  90pt
+
 * **Android**
 
   .. tabularcolumns:: m{100pt} m{300pt}
@@ -295,6 +313,7 @@ world of the OpenCV.
    ../windows_visual_studio_Opencv/windows_visual_studio_Opencv
    ../windows_visual_studio_image_watch/windows_visual_studio_image_watch
    ../desktop_java/java_dev_intro
+   ../java_eclipse/java_eclipse
    ../android_binary_package/android_dev_intro
    ../android_binary_package/O4A_SDK
    ../android_binary_package/dev_with_OCV_on_Android