Merge pull request #1427 from SpecLad:merge-2.4

diff --combined .gitignore
index 1f3a89a,5c1b707..de0707a
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -7,4 -7,6 +7,5 @@@ tegra
  .sw[a-z]
  .*.swp
  tags
 -build/
  Thumbs.db
+ *.autosave

diff --combined modules/imgproc/include/opencv2/imgproc.hpp
index 00bdaa1,e380af8..5ff1b74
--- 1/modules/imgproc/include/opencv2/imgproc.hpp
--- 2/modules/imgproc/include/opencv2/imgproc.hpp
+++ b/modules/imgproc/include/opencv2/imgproc.hpp
@@@ -904,7 -904,7 +904,7 @@@ class LineSegmentDetector : public Algo
  {
  public:
  /**
 - * Detect lines in the input image with the specified ROI.
 + * Detect lines in the input image.
   *
   * @param _image    A grayscale(CV_8UC1) input image.
   *                  If only a roi needs to be selected, use
@@@ -913,6 -913,8 +913,6 @@@
   * @param _lines    Return: A vector of Vec4i elements specifying the beginning and ending point of a line.
   *                          Where Vec4i is (x1, y1, x2, y2), point 1 is the start, point 2 - end.
   *                          Returned lines are strictly oriented depending on the gradient.
 - * @param _roi      Return: ROI of the image, where lines are to be found. If specified, the returning
 - *                          lines coordinates are image wise.
   * @param width     Return: Vector of widths of the regions, where the lines are found. E.g. Width of line.
   * @param prec      Return: Vector of precisions with which the lines are found.
   * @param nfa       Return: Vector containing number of false alarms in the line region, with precision of 10%.
@@@ -933,19 -935,18 +933,19 @@@
   *                  Should have the size of the image, where the lines were found
   * @param lines     The lines that need to be drawn
   */
 -    virtual void drawSegments(InputOutputArray image, InputArray lines) = 0;
 +    virtual void drawSegments(InputOutputArray _image, InputArray lines) = 0;
  
  /**
   * Draw both vectors on the image canvas. Uses blue for lines 1 and red for lines 2.
   *
 - * @param image     The image, where lines will be drawn.
 - *                  Should have the size of the image, where the lines were found
 + * @param size      The size of the image, where lines were found.
   * @param lines1    The first lines that need to be drawn. Color - Blue.
   * @param lines2    The second lines that need to be drawn. Color - Red.
 + * @param image     Optional image, where lines will be drawn.
 + *                  Should have the size of the image, where the lines were found
   * @return          The number of mismatching pixels between lines1 and lines2.
   */
 -    virtual int compareSegments(const Size& size, InputArray lines1, InputArray lines2, Mat* image = 0) = 0;
 +    virtual int compareSegments(const Size& size, InputArray lines1, InputArray lines2, InputOutputArray _image = noArray()) = 0;
  
      virtual ~LineSegmentDetector() {};
  };
@@@ -1060,6 -1061,11 +1060,11 @@@ CV_EXPORTS_W void bilateralFilter( Inpu
                                     double sigmaColor, double sigmaSpace,
                                     int borderType = BORDER_DEFAULT );
  
+ //! smooths the image using adaptive bilateral filter
+ CV_EXPORTS_W void adaptiveBilateralFilter( InputArray src, OutputArray dst, Size ksize,
+                                            double sigmaSpace, Point anchor=Point(-1, -1),
+                                            int borderType=BORDER_DEFAULT );
+ 
  //! smooths the image using the box filter. Each pixel is processed in O(1) time
  CV_EXPORTS_W void boxFilter( InputArray src, OutputArray dst, int ddepth,
                               Size ksize, Point anchor = Point(-1,-1),