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

Consistently use 4-digit library version

Browse Source
This commit is contained in:
Andrey Kamaev
2013-01-18 14:57:55 +04:00
parent 101e9bd456
commit e3474878b6
16 changed files with 56 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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