Merged with HEAD and removed C interface to rotatedRectangleIntersection

modules/imgproc/doc/filtering.rst

@@ -789,7 +789,7 @@ The function supports the in-place mode. Dilation can be applied several ( ``ite
 
    * An example using the morphological dilate operation can be found at opencv_source_code/samples/cpp/morphology2.cpp
 
-    
+
 
 
 erode
@@ -1000,17 +1000,17 @@ Returns Gabor filter coefficients.
 .. ocv:pyfunction:: cv2.getGaborKernel(ksize, sigma, theta, lambd, gamma[, psi[, ktype]]) -> retval
 
     :param ksize: Size of the filter returned.
-    
+
     :param sigma: Standard deviation of the gaussian envelope.
-    
+
     :param theta: Orientation of the normal to the parallel stripes of a Gabor function.
-    
+
     :param lambd: Wavelength of the sinusoidal factor.
-    
+
     :param gamma: Spatial aspect ratio.
-    
+
     :param psi: Phase offset.
-    
+
     :param ktype: Type of filter coefficients. It can be  ``CV_32F``  or  ``CV_64F`` .
 
 For more details about gabor filter equations and parameters, see: `Gabor Filter <http://en.wikipedia.org/wiki/Gabor_filter>`_.
@@ -1132,7 +1132,7 @@ Performs advanced morphological transformations.
     :param dst: Destination image of the same size and type as  ``src`` .
 
     :param kernel: Structuring element. It can be created using :ocv:func:`getStructuringElement`.
-    
+
     :param anchor: Anchor position with the kernel. Negative values mean that the anchor is at the kernel center.
 
     :param op: Type of a morphological operation that can be one of the following:
@@ -1378,7 +1378,7 @@ Applies a separable linear filter to an image.
 
     :param kernelY: Coefficients for filtering each column.
 
-    :param anchor: Anchor position within the kernel. The default value  :math:`(-1, 1)`  means that the anchor is at the kernel center.
+    :param anchor: Anchor position within the kernel. The default value  :math:`(-1,-1)`  means that the anchor is at the kernel center.
 
     :param delta: Value added to the filtered results before storing them.
 
@@ -1570,4 +1570,3 @@ is equivalent to
 .. seealso::
 
     :ocv:func:`cartToPolar`
-

modules/imgproc/doc/geometric_transformations.rst

@@ -682,5 +682,3 @@ The function is similar to
 where ``undistort()`` is an approximate iterative algorithm that estimates the normalized original point coordinates out of the normalized distorted point coordinates ("normalized" means that the coordinates do not depend on the camera matrix).
 
 The function can be used for both a stereo camera head or a monocular camera (when R is empty).
-
-

modules/imgproc/doc/histograms.rst

@@ -173,6 +173,8 @@ Compares two histograms.
 
             * **CV_COMP_CHISQR**     Chi-Square
 
+            * **CV_COMP_CHISQR_ALT**     Alternative Chi-Square
+
             * **CV_COMP_INTERSECT**     Intersection
 
             * **CV_COMP_BHATTACHARYYA**     Bhattacharyya distance
@@ -202,6 +204,14 @@ The functions ``compareHist`` compare two dense or two sparse histograms using t
 
         d(H_1,H_2) =  \sum _I  \frac{\left(H_1(I)-H_2(I)\right)^2}{H_1(I)}
 
+* Alternative Chi-Square (``method=CV_COMP_CHISQR_ALT``)
+
+    .. math::
+
+        d(H_1,H_2) =  2 * \sum _I  \frac{\left(H_1(I)-H_2(I)\right)^2}{H_1(I)+H_2(I)}
+
+    This alternative formula is regularly used for texture comparison. See e.g. [Puzicha1997]_.
+
 * Intersection (``method=CV_COMP_INTERSECT``)
 
     .. math::
@@ -493,3 +503,4 @@ The function clears histogram bins that are below the specified threshold.
 
 
 .. [RubnerSept98] Y. Rubner. C. Tomasi, L.J. Guibas. *The Earth Mover’s Distance as a Metric for Image Retrieval*. Technical Report STAN-CS-TN-98-86, Department of Computer Science, Stanford University, September 1998.
+.. [Puzicha1997] Puzicha, J., Hofmann, T., and Buhmann, J. *Non-parametric similarity measures for unsupervised texture segmentation and image retrieval.* In Proc. IEEE Conf. Computer Vision and Pattern Recognition, San Juan, Puerto Rico, pp. 267-272, 1997.

modules/imgproc/doc/structural_analysis_and_shape_descriptors.rst

@@ -553,9 +553,9 @@ Finds the four vertices of a rotated rect. Useful to draw the rotated rectangle.
 .. ocv:cfunction:: void cvBoxPoints( CvBox2D box, CvPoint2D32f pt[4] )
 
     :param box: The input rotated rectangle. It may be the output of .. ocv:function:: minAreaRect.
-    
+
     :param points: The output array of four vertices of rectangles.
-    
+
 The function finds the four vertices of a rotated rectangle. This function is useful to draw the rectangle. In C++, instead of using this function, you can directly use box.points() method. Please visit the `tutorial on bounding rectangle <http://docs.opencv.org/doc/tutorials/imgproc/shapedescriptors/bounding_rects_circles/bounding_rects_circles.html#bounding-rects-circles>`_ for more information.
 
 
@@ -686,7 +686,6 @@ Finds out if there is any intersection between two rotated rectangles. If there
 
 .. ocv:function:: int rotatedRectangleIntersection( const RotatedRect& rect1, const RotatedRect& rect2, OutputArray intersectingRegion  )
 .. ocv:pyfunction:: cv2.rotatedRectangleIntersection( rect1, rect2 ) -> retval, intersectingRegion 
-.. ocv:cfunction:: int cvRotatedRectangleIntersection( const CvBox2D* rect1, const CvBox2D* rect2, CvPoint2D32f intersectingRegion[8], int* pointCount )
 
     :param rect1: First rectangle