removed cpp/tutorial_code/images/

diff --git a/samples/cpp/tutorial_code/HighGUI/AddingImagesTrackbar.cpp b/samples/cpp/tutorial_code/HighGUI/AddingImagesTrackbar.cpp
index 11843fb..9e04dd9 100644 (file)
--- a/samples/cpp/tutorial_code/HighGUI/AddingImagesTrackbar.cpp
+++ b/samples/cpp/tutorial_code/HighGUI/AddingImagesTrackbar.cpp
@@ -44,8 +44,8 @@ static void on_trackbar( int, void* )
 int main( void )
 {
    /// Read image ( same size, same type )
-   src1 = imread("../images/LinuxLogo.jpg");
-   src2 = imread("../images/WindowsLogo.jpg");
+   src1 = imread("../data/LinuxLogo.jpg");
+   src2 = imread("../data/WindowsLogo.jpg");
 
    if( src1.empty() ) { printf("Error loading src1 \n"); return -1; }
    if( src2.empty() ) { printf("Error loading src2 \n"); return -1; }

diff --git a/samples/cpp/tutorial_code/ImgProc/AddingImages.cpp b/samples/cpp/tutorial_code/ImgProc/AddingImages.cpp
index b7a27d2..32ce10f 100644 (file)
--- a/samples/cpp/tutorial_code/ImgProc/AddingImages.cpp
+++ b/samples/cpp/tutorial_code/ImgProc/AddingImages.cpp
@@ -32,8 +32,8 @@ int main( void )
      { alpha = input; }
 
    /// Read image ( same size, same type )
-   src1 = imread("../images/LinuxLogo.jpg");
-   src2 = imread("../images/WindowsLogo.jpg");
+   src1 = imread("../data/LinuxLogo.jpg");
+   src2 = imread("../data/WindowsLogo.jpg");
 
    if( src1.empty() ) { std::cout<< "Error loading src1"<<std::endl; return -1; }
    if( src2.empty() ) { std::cout<< "Error loading src2"<<std::endl; return -1; }

diff --git a/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp b/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp
index 31c0a85..c52c0e0 100644 (file)
--- a/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp
+++ b/samples/cpp/tutorial_code/ImgProc/Pyramids.cpp
@@ -32,7 +32,7 @@ int main( void )
   printf( " * [ESC] -> Close program \n \n" );
 
   /// Test image - Make sure it s divisible by 2^{n}
-  src = imread( "../images/chicky_512.png" );
+  src = imread( "../data/chicky_512.png" );
   if( src.empty() )
     { printf(" No data! -- Exiting the program \n");
       return -1; }

diff --git a/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp b/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp
index 238f921..e7ac4d4 100644 (file)
--- a/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp
+++ b/samples/cpp/tutorial_code/ImgProc/Smoothing.cpp
@@ -35,7 +35,7 @@ int main( void )
   namedWindow( window_name, WINDOW_AUTOSIZE );
 
   /// Load the source image
-  src = imread( "../images/lena.png", 1 );
+  src = imread( "../data/lena.jpg", 1 );
 
   if( display_caption( "Original Image" ) != 0 ) { return 0; }
 

diff --git a/samples/cpp/tutorial_code/images/HappyFish.jpg b/samples/cpp/tutorial_code/images/HappyFish.jpg
deleted file mode 100755 (executable)
index c76288e..0000000
Binary files a/samples/cpp/tutorial_code/images/HappyFish.jpg and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/Megamind.png b/samples/cpp/tutorial_code/images/Megamind.png
deleted file mode 100644 (file)
index a1cc6d1..0000000
Binary files a/samples/cpp/tutorial_code/images/Megamind.png and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/Megamind_alt.png b/samples/cpp/tutorial_code/images/Megamind_alt.png
deleted file mode 100644 (file)
index 4e345f2..0000000
Binary files a/samples/cpp/tutorial_code/images/Megamind_alt.png and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/baboon.jpg b/samples/cpp/tutorial_code/images/baboon.jpg
deleted file mode 100644 (file)
index 2f98d83..0000000
Binary files a/samples/cpp/tutorial_code/images/baboon.jpg and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/cat.jpg b/samples/cpp/tutorial_code/images/cat.jpg
deleted file mode 100755 (executable)
index df4a907..0000000
Binary files a/samples/cpp/tutorial_code/images/cat.jpg and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/hand_sample1.jpg b/samples/cpp/tutorial_code/images/hand_sample1.jpg
deleted file mode 100644 (file)
index 4c42898..0000000
Binary files a/samples/cpp/tutorial_code/images/hand_sample1.jpg and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/hand_sample2.jpg b/samples/cpp/tutorial_code/images/hand_sample2.jpg
deleted file mode 100644 (file)
index 8ca11f9..0000000
Binary files a/samples/cpp/tutorial_code/images/hand_sample2.jpg and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/hand_sample3.jpg b/samples/cpp/tutorial_code/images/hand_sample3.jpg
deleted file mode 100644 (file)
index bd339a0..0000000
Binary files a/samples/cpp/tutorial_code/images/hand_sample3.jpg and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/imageTextN.png b/samples/cpp/tutorial_code/images/imageTextN.png
deleted file mode 100644 (file)
index cdb58f6..0000000
Binary files a/samples/cpp/tutorial_code/images/imageTextN.png and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/imageTextR.png b/samples/cpp/tutorial_code/images/imageTextR.png
deleted file mode 100644 (file)
index 7f90abd..0000000
Binary files a/samples/cpp/tutorial_code/images/imageTextR.png and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/lena.png b/samples/cpp/tutorial_code/images/lena.png
deleted file mode 100644 (file)
index 59ef68a..0000000
Binary files a/samples/cpp/tutorial_code/images/lena.png and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/opencv-logo.png b/samples/cpp/tutorial_code/images/opencv-logo.png
deleted file mode 100644 (file)
index 8cd8155..0000000
Binary files a/samples/cpp/tutorial_code/images/opencv-logo.png and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/yellowball.jpg b/samples/cpp/tutorial_code/images/yellowball.jpg
deleted file mode 100644 (file)
index ac76e08..0000000
Binary files a/samples/cpp/tutorial_code/images/yellowball.jpg and /dev/null differ

diff --git a/samples/cpp/tutorial_code/images/LinuxLogo.jpg b/samples/data/LinuxLogo.jpg
similarity index 100%
rename from samples/cpp/tutorial_code/images/LinuxLogo.jpg
rename to samples/data/LinuxLogo.jpg

diff --git a/samples/cpp/tutorial_code/images/WindowsLogo.jpg b/samples/data/WindowsLogo.jpg
similarity index 100%
rename from samples/cpp/tutorial_code/images/WindowsLogo.jpg
rename to samples/data/WindowsLogo.jpg

diff --git a/samples/cpp/tutorial_code/images/chicky_512.png b/samples/data/chicky_512.png
similarity index 100%
rename from samples/cpp/tutorial_code/images/chicky_512.png
rename to samples/data/chicky_512.png