update cpp samples and tutorials

2016-02-15 15:37:29 +02:00
parent 1aeff45631
commit 11ca1c95f8
110 changed files with 394 additions and 423 deletions
--- a/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp
+++ b/samples/cpp/tutorial_code/ImgProc/Morphology_1.cpp
@@ -4,11 +4,9 @@
 * @author OpenCV team
 */

-#include "opencv2/imgproc/imgproc.hpp"
+#include "opencv2/imgproc.hpp"
 #include "opencv2/imgcodecs.hpp"
-#include "opencv2/highgui/highgui.hpp"
-#include <stdlib.h>
-#include <stdio.h>
+#include "opencv2/highgui.hpp"

 using namespace cv;

@@ -32,7 +30,7 @@ void Dilation( int, void* );
 int main( int, char** argv )
 {
  /// Load an image
-  src = imread( argv[1] );
+  src = imread( argv[1], IMREAD_COLOR );

  if( src.empty() )
    { return -1; }