From 55d1f0b7d602bfde8bd1c3dc8419ef95c3ae606b Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Mon, 25 May 2015 18:05:20 +0300 Subject: [PATCH] Transition guide: removed one of the version check methods --- .../transition_guide/transition_guide.markdown | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/doc/tutorials/introduction/transition_guide/transition_guide.markdown b/doc/tutorials/introduction/transition_guide/transition_guide.markdown index 6cf13172f..b0bc44344 100644 --- a/doc/tutorials/introduction/transition_guide/transition_guide.markdown +++ b/doc/tutorials/introduction/transition_guide/transition_guide.markdown @@ -264,28 +264,16 @@ In some cases it is possible to support both versions of OpenCV. ### Source code -To check library major version one of the following methods can be used: -- if __CV_VERSION_EPOCH__ is defined - you are using 2.4 branch, otherwise - 3.x -- __CV_MAJOR_VERSION__ is defined as `2` or `3` for corresponding version - -One of `opencv2/core/version.hpp` or `opencv2/core/core.hpp` files should be included to use these definitions. - -Examples: -@code{.cpp} -#ifdef CV_VERSION_EPOCH -// do opencv 2 code -#else -// do opencv 3 code -#endif -@endcode -or +To check library major version in your application source code, the following method should be used: @code{.cpp} +#include "opencv2/core/version.hpp" #if CV_MAJOR_VERSION == 2 // do opencv 2 code #elif CV_MAJOR_VERSION == 3 // do opencv 3 code #endif @endcode + @note Do not use __CV_VERSION_MAJOR__, it has different meaning for 2.4 and 3.x branches! ### Build system