Merge branch 'master' of https://github.com/nevion/opencv into cc

diff --combined modules/imgproc/include/opencv2/imgproc/imgproc.hpp
index c0c51f5,3c68245..6be7ef6
--- 1/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
--- 2/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
+++ b/modules/imgproc/include/opencv2/imgproc/imgproc.hpp
@@@ -1048,18 -1048,7 +1048,18 @@@ enu
      COLOR_RGBA2mRGBA = 125,
      COLOR_mRGBA2RGBA = 126,
  
 -    COLOR_COLORCVT_MAX  = 127
 +    // Edge-Aware Demosaicing
 +    COLOR_BayerBG2BGR_EA = 127,
 +    COLOR_BayerGB2BGR_EA = 128,
 +    COLOR_BayerRG2BGR_EA = 129,
 +    COLOR_BayerGR2BGR_EA = 130,
 +
 +    COLOR_BayerBG2RGB_EA = COLOR_BayerRG2BGR_EA,
 +    COLOR_BayerGB2RGB_EA = COLOR_BayerGR2BGR_EA,
 +    COLOR_BayerRG2RGB_EA = COLOR_BayerBG2BGR_EA,
 +    COLOR_BayerGR2RGB_EA = COLOR_BayerGB2BGR_EA,
 +
 +    COLOR_COLORCVT_MAX  = 131
  };
  
  
@@@ -1102,6 -1091,15 +1102,15 @@@ enum { TM_SQDIFF=0, TM_SQDIFF_NORMED=1
  CV_EXPORTS_W void matchTemplate( InputArray image, InputArray templ,
                                   OutputArray result, int method );
  
+ enum { CC_STAT_LEFT=0, CC_STAT_TOP=1, CC_STAT_WIDTH=2, CC_STAT_HEIGHT=3, CC_STAT_AREA=4, CC_STAT_MAX = 5};
+ 
+ //! computes the connected components labeled image of boolean image I with 4 or 8 way connectivity - returns N, the total
+ //number of labels [0, N-1] where 0 represents the background label. L's value type determines the label type, an important
+ //consideration based on the total number of labels or alternatively the total number of pixels.
+ CV_EXPORTS_W int connectedComponents(InputArray image, OutputArray labels, int connectivity = 8, int ltype=CV_32S);
+ CV_EXPORTS_W int connectedComponentsWithStats(InputArray image, OutputArray labels, OutputArray stats, OutputArray centroids, int connectivity = 8, int ltype=CV_32S);
+ 
+ 
  //! mode of the contour retrieval algorithm
  enum
  {
@@@ -1263,9 -1261,6 +1272,9 @@@ protected
      Point2f bottomRight;
  };
  
 +// main function for all demosaicing procceses
 +CV_EXPORTS_W void demosaicing(InputArray _src, OutputArray _dst, int code, int dcn = 0);
 +
  }
  
  #endif /* __cplusplus */