Merge https://github.com/Itseez/opencv

diff --cc modules/imgproc/include/opencv2/imgproc.hpp
index 6cc09c2,c2a488a..fe95422
--- 1/modules/imgproc/include/opencv2/imgproc.hpp
--- 2/modules/imgproc/include/opencv2/imgproc.hpp
+++ b/modules/imgproc/include/opencv2/imgproc.hpp
@@@ -1418,11 -1479,16 +1483,19 @@@ CV_EXPORTS_W void fitLine( InputArray p
  //! checks if the point is inside the contour. Optionally computes the signed distance from the point to the contour boundary
  CV_EXPORTS_W double pointPolygonTest( InputArray contour, Point2f pt, bool measureDist );
  
 +//! computes whether two rotated rectangles intersect and returns the vertices of the intersecting region
 +CV_EXPORTS_W int rotatedRectangleIntersection( const RotatedRect& rect1, const RotatedRect& rect2, OutputArray intersectingRegion  );
 +
  CV_EXPORTS Ptr<CLAHE> createCLAHE(double clipLimit = 40.0, Size tileGridSize = Size(8, 8));
  
+ //! Ballard, D.H. (1981). Generalizing the Hough transform to detect arbitrary shapes. Pattern Recognition 13 (2): 111-122.
+ //! Detects position only without traslation and rotation
+ CV_EXPORTS Ptr<GeneralizedHoughBallard> createGeneralizedHoughBallard();
+ 
+ //! Guil, N., González-Linares, J.M. and Zapata, E.L. (1999). Bidimensional shape detection using an invariant approach. Pattern Recognition 32 (6): 1025-1038.
+ //! Detects position, traslation and rotation
+ CV_EXPORTS Ptr<GeneralizedHoughGuil> createGeneralizedHoughGuil();
+ 
  } // cv
  
  #endif