From 90a1c6b1f08e6a71e3b28c9cf41f454f605dc345 Mon Sep 17 00:00:00 2001 From: StevenPuttemans Date: Wed, 24 Sep 2014 09:33:22 +0200 Subject: [PATCH] fixing some wrong CPP prefixes - still old interface --- doc/tutorials/introduction/display_image/display_image.rst | 4 ++-- .../introduction/linux_gcc_cmake/linux_gcc_cmake.rst | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/tutorials/introduction/display_image/display_image.rst b/doc/tutorials/introduction/display_image/display_image.rst index 6b30b7c29..d3b78efa1 100644 --- a/doc/tutorials/introduction/display_image/display_image.rst +++ b/doc/tutorials/introduction/display_image/display_image.rst @@ -83,8 +83,8 @@ After checking that the image data was loaded correctly, we want to display our .. container:: enumeratevisibleitemswithsquare - + *CV_WINDOW_AUTOSIZE* is the only supported one if you do not use the Qt backend. In this case the window size will take up the size of the image it shows. No resize permitted! - + *CV_WINDOW_NORMAL* on Qt you may use this to allow window resize. The image will resize itself according to the current window size. By using the | operator you also need to specify if you would like the image to keep its aspect ratio (*CV_WINDOW_KEEPRATIO*) or not (*CV_WINDOW_FREERATIO*). + + *WINDOW_AUTOSIZE* is the only supported one if you do not use the Qt backend. In this case the window size will take up the size of the image it shows. No resize permitted! + + *WINDOW_NORMAL* on Qt you may use this to allow window resize. The image will resize itself according to the current window size. By using the | operator you also need to specify if you would like the image to keep its aspect ratio (*WINDOW_KEEPRATIO*) or not (*WINDOW_FREERATIO*). .. literalinclude:: ../../../../samples/cpp/tutorial_code/introduction/display_image/display_image.cpp :language: cpp diff --git a/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst b/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst index 9aa1f6289..c5cc0d288 100644 --- a/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst +++ b/doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst @@ -46,7 +46,7 @@ Let's use a simple program such as DisplayImage.cpp shown below. printf("No image data \n"); return -1; } - namedWindow("Display Image", CV_WINDOW_AUTOSIZE ); + namedWindow("Display Image", WINDOW_AUTOSIZE ); imshow("Display Image", image); waitKey(0);