Merge remote-tracking branch 'origin/master'

doc/tutorials/introduction/table_of_content_introduction/table_of_content_introduction.rst

@@ -29,7 +29,7 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
-  
+
   =========== ======================================================
    |Usage_1|  **Title:** :ref:`Linux_GCC_Usage`
 
@@ -47,7 +47,7 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
-  
+
   =========== ======================================================
    |Usage_2|  **Title:** :ref:`Linux_Eclipse_Usage`
 
@@ -67,7 +67,7 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
-    
+
   =========== ======================================================
   |WinInstal| **Title:** :ref:`Windows_Installation`
 
@@ -85,7 +85,7 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
-  
+
   =========== ======================================================
   |WinVSHowT| **Title:** :ref:`Windows_Visual_Studio_How_To`
 
@@ -93,7 +93,7 @@ Here you can read tutorials about how to set up your computer to work with the O
 
               *Author:* |Author_BernatG|
 
-              You will learn what steps you need to perform in order to use the OpenCV library inside a new Microsoft Visual Studio project. 
+              You will learn what steps you need to perform in order to use the OpenCV library inside a new Microsoft Visual Studio project.
 
   =========== ======================================================
 
@@ -142,7 +142,7 @@ Here you can read tutorials about how to set up your computer to work with the O
   .. cssclass:: toctableopencv
 
   ================ =================================================
-  |AndroidNDKPack| **Title:** :ref:`Android_Dev_Intro`
+  |AndroidLogo|    **Title:** :ref:`Android_Dev_Intro`
 
                    *Compatibility:* > OpenCV 2.4.2
 
@@ -156,7 +156,7 @@ Here you can read tutorials about how to set up your computer to work with the O
   .. cssclass:: toctableopencv
 
   ================ =================================================
-  |AndroidNDKPack| **Title:** :ref:`O4A_SDK`
+  |AndroidLogo|    **Title:** :ref:`O4A_SDK`
 
                    *Compatibility:* > OpenCV 2.4.2
 
@@ -170,7 +170,7 @@ Here you can read tutorials about how to set up your computer to work with the O
   .. cssclass:: toctableopencv
 
   ================ =================================================
-  |AndroidNDKPack| **Title:** :ref:`dev_with_OCV_on_Android`
+  |AndroidLogo|    **Title:** :ref:`dev_with_OCV_on_Android`
 
                    *Compatibility:* > OpenCV 2.4.2
 
@@ -180,9 +180,9 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   ================ =================================================
 
-     .. |AndroidNDKPack| image:: images/android_logo.png
-                           :height: 90pt
-                           :width:  90pt
+     .. |AndroidLogo| image:: images/android_logo.png
+                        :height: 90pt
+                        :width:  90pt
 
 
 * **iOS**
@@ -206,7 +206,7 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
-  
+
   ============= ======================================================
   |Beginners_1| **Title:** :ref:`Display_Image`
 
@@ -224,13 +224,13 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
-  
+
   =============== ======================================================
    |Beginners_2|  **Title:** :ref:`Load_Save_Image`
 
-                  *Compatibility:* > OpenCV 2.0 
+                  *Compatibility:* > OpenCV 2.0
 
-                  *Author:* |Author_AnaH| 
+                  *Author:* |Author_AnaH|
 
                   We will learn how to save an Image in OpenCV...plus a small conversion to grayscale
 
@@ -244,13 +244,13 @@ Here you can read tutorials about how to set up your computer to work with the O
 
   .. tabularcolumns:: m{100pt} m{300pt}
   .. cssclass:: toctableopencv
-  
+
   =============== ======================================================
    |HowToWriteT|  **Title:** :ref:`howToWriteTutorial`
 
                   *Compatibility:* > OpenCV 1.0
 
-                  *Author:* |Author_BernatG| 
+                  *Author:* |Author_BernatG|
 
                   If you already have a good grasp on using OpenCV and have made some projects that would be perfect presenting an OpenCV feature not yet part of these tutorials, here it is what you need to know.
 
@@ -266,7 +266,7 @@ Here you can read tutorials about how to set up your computer to work with the O
 
 .. We use a custom table of content format and as the table of content only imforms Sphinx about the hierarchy of the files, no need to show it.
 .. toctree::
-   :hidden:                
+   :hidden:
 
    ../linux_install/linux_install
    ../linux_gcc_cmake/linux_gcc_cmake
@@ -276,6 +276,7 @@ Here you can read tutorials about how to set up your computer to work with the O
    ../android_binary_package/android_binary_package
    ../android_binary_package/android_binary_package_using_with_NDK
    ../android_binary_package/android_dev_intro
+   ../android_binary_package/O4A_SDK
    ../android_binary_package/dev_with_OCV_on_Android
    ../ios_install/ios_install
    ../display_image/display_image

modules/gpu/doc/video.rst

@@ -324,9 +324,9 @@ Class used for background/foreground segmentation. ::
         std::vector< std::vector<cv::Point> > foreground_regions;
     };
 
-The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [FGD2003]_.
+  The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [FGD2003]_.
 
-The results are available through the class fields:
+  The results are available through the class fields:
 
     .. ocv:member:: cv::gpu::GpuMat background
 
@@ -489,9 +489,9 @@ Gaussian Mixture-based Background/Foreground Segmentation Algorithm. ::
         ...
     };
 
-The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [MOG2004]_.
+  The class discriminates between foreground and background pixels by building and maintaining a model of the background. Any pixel which does not fit this model is then deemed to be foreground. The class implements algorithm described in [MOG2004]_.
 
-Here are important members of the class that control the algorithm, which you can set after constructing the class instance:
+  Here are important members of the class that control the algorithm, which you can set after constructing the class instance:
 
     .. ocv:member:: float backgroundRatio
 

modules/ocl/doc/ocl.rst

-************************************
+***************************************
 ocl. OpenCL-accelerated Computer Vision
-************************************
+***************************************
 
 .. toctree::
     :maxdepth: 1
 
     introduction
-    initalization_and_information
-    data_structures
-    operations_on_matrices
-    per_element_operations
-    image_processing
-    matrix_reductions
-    object_detection
-    feature_detection_and_description
-    image_filtering
-    camera_calibration_and_3d_reconstruction
-    video
+    structures_and_functions
+..    initalization_and_information
+..    data_structures
+..    operations_on_matrices
+..    per_element_operations
+..    image_processing
+..    matrix_reductions
+..    object_detection
+..    feature_detection_and_description
+..    image_filtering
+..    camera_calibration_and_3d_reconstruction
+..    video