generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/2.4' into merge-2.4

Browse Source 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
This commit is contained in:
Roman Donchenko
2014-02-24 14:35:34 +04:00
parent 0a90d6dde6 2b0c3eb170
commit 48432502b6
32 changed files with 201 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
View File

@@ -25,29 +25,34 @@ Let's use a simple program such as DisplayImage.cpp shown below.
.. code-block:: cpp
#include <stdio.h>
#include <opencv2/opencv.hpp>
#include <stdio.h>
#include <opencv2/opencv.hpp>
using namespace cv;
using namespace cv;
int main( int argc, char** argv )
{
Mat image;
image = imread( argv[1], 1 );
int main(int argc, char** argv )
{
if ( argc != 2 )
{
printf("usage: DisplayImage.out <Image_Path>\n");
return -1;
}
if( argc != 2 || !image.data )
{
printf( "No image data \n" );
return -1;
}
Mat image;
image = imread( argv[1], 1 );
namedWindow( "Display Image", WINDOW_AUTOSIZE );
imshow( "Display Image", image );
if ( !image.data )
{
printf("No image data \n");
return -1;
}
namedWindow("Display Image", WINDOW_AUTOSIZE );
imshow("Display Image", image);
waitKey(0);
waitKey(0);
return 0;
}
return 0;
}
Create a CMake file
---------------------