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

adding std to cstdint typedef of uint32_t

Browse Source
This commit is contained in:
kamjagin 2013-08-14 11:25:49 +02:00
parent b595d73d6d
commit ed29d91d42
2 changed files with 3 additions and 2 deletions
cmake
OpenCVFindLibsGUI.cmake
modules/core/include/opencv2/core
cvdef.h

2
cmake/OpenCVFindLibsGUI.cmake

@ -70,7 +70,7 @@ endif(WITH_OPENGL)
if(APPLE) if(APPLE)
if(WITH_CARBON) if(WITH_CARBON)
set(HAVE_CARBON YES) set(HAVE_CARBON YES)
elseif(NOT IOS) elif(NOT IOS)
set(HAVE_COCOA YES) set(HAVE_COCOA YES)
endif() endif()
endif() endif()

3
modules/core/include/opencv2/core/cvdef.h

@ -201,10 +201,11 @@
#if !defined _MSC_VER && !defined __BORLANDC__ #if !defined _MSC_VER && !defined __BORLANDC__
# if defined __cplusplus && __cplusplus >= 201103L # if defined __cplusplus && __cplusplus >= 201103L
# include <cstdint> # include <cstdint>
typedef std::uint32_t uint;
# else # else
# include <stdint.h> # include <stdint.h>
typedef uint32_t uint;
# endif # endif
typedef uint32_t uint;
#else #else
typedef unsigned uint; typedef unsigned uint;
#endif #endif