diff --git a/samples/cpp/tutorial_code/HighGUI/AddingImagesTrackbar.cpp b/samples/cpp/tutorial_code/HighGUI/AddingImagesTrackbar.cpp index 11843fb08..9e04dd912 100644 --- 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 b7a27d2ca..32ce10f4b 100644 --- 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"< 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 238f921e9..e7ac4d40f 100644 --- 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 index c76288edb..000000000 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 index a1cc6d178..000000000 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 index 4e345f23d..000000000 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 index 2f98d8359..000000000 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 index df4a907e5..000000000 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 index 4c42898ec..000000000 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 index 8ca11f9fb..000000000 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 index bd339a00a..000000000 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 index cdb58f659..000000000 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 index 7f90abdf0..000000000 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 index 59ef68aab..000000000 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 index 8cd8155c1..000000000 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 index ac76e08ba..000000000 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