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

Switched OpenCV to a 3-component version number.

Browse Source 
Epoch is gone; now the version component names in C++ and CMake
are consistent (except REVISION corresponds to PATCH).
This commit is contained in:
Roman Donchenko
2013-11-15 19:41:53 +04:00
parent b8c46f4cce
commit 615d6c22d1
11 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/cudacodec/src/ffmpeg_video_source.cpp
View File

@@ -63,7 +63,7 @@ namespace
{
#if defined WIN32 || defined _WIN32
const char* module_name = "opencv_ffmpeg"
CVAUX_STR(CV_VERSION_EPOCH) CVAUX_STR(CV_VERSION_MAJOR) CVAUX_STR(CV_VERSION_MINOR)
CVAUX_STR(CV_VERSION_MAJOR) CVAUX_STR(CV_VERSION_MINOR) CVAUX_STR(CV_VERSION_REVISION)
#if (defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __x86_64__)
"_64"
#endif

2
modules/cudacodec/src/video_writer.cpp
View File

@@ -733,7 +733,7 @@ namespace
{
#if defined(WIN32) || defined(_WIN32)
const char* module_name = "opencv_ffmpeg"
CVAUX_STR(CV_VERSION_EPOCH) CVAUX_STR(CV_VERSION_MAJOR) CVAUX_STR(CV_VERSION_MINOR)
CVAUX_STR(CV_VERSION_MAJOR) CVAUX_STR(CV_VERSION_MINOR) CVAUX_STR(CV_VERSION_REVISION)
#if (defined _MSC_VER && defined _M_X64) || (defined __GNUC__ && defined __x86_64__)
"_64"
#endif