From: kamjagin <kamjagin@gmail.com>
Date: Wed, 14 Aug 2013 09:25:49 +0000 (+0200)
Subject: adding std to cstdint typedef of uint32_t
X-Git-Tag: submit/tizen_ivi/20141117.190038~2^2~968^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed29d91d42b19fb61cc4ef12e061e131f23bc5d6;p=profile%2Fivi%2Fopencv.git

adding std to cstdint typedef of uint32_t
---

diff --git a/cmake/OpenCVFindLibsGUI.cmake b/cmake/OpenCVFindLibsGUI.cmake
index 270853a..04c77d8 100644
--- a/cmake/OpenCVFindLibsGUI.cmake
+++ b/cmake/OpenCVFindLibsGUI.cmake
@@ -70,7 +70,7 @@ endif(WITH_OPENGL)
 if(APPLE)
   if(WITH_CARBON)
     set(HAVE_CARBON YES)
-  elseif(NOT IOS)
+  elif(NOT IOS)
     set(HAVE_COCOA YES)
   endif()
 endif()
diff --git a/modules/core/include/opencv2/core/cvdef.h b/modules/core/include/opencv2/core/cvdef.h
index 2130157..46f2949 100644
--- a/modules/core/include/opencv2/core/cvdef.h
+++ b/modules/core/include/opencv2/core/cvdef.h
@@ -201,10 +201,11 @@
 #if !defined _MSC_VER && !defined __BORLANDC__
 #  if defined __cplusplus && __cplusplus >= 201103L
 #    include <cstdint>
+     typedef std::uint32_t uint;
 #  else
 #    include <stdint.h>
+     typedef uint32_t uint;
 #  endif
-   typedef uint32_t uint;
 #else
    typedef unsigned uint;
 #endif