Merge pull request opencv#1366 from asmorkalov:ocv_autobuffer_fix

oestape · Aug 29, 2013 · fc37df0 · fc37df0
2 parents 86f4cd2 + 5af2cc6
commit fc37df0
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/modules/core/include/opencv2/core/utility.hpp b/modules/core/include/opencv2/core/utility.hpp
@@ -116,8 +116,8 @@ template<typename _Tp, size_t fixed_size = 1024/sizeof(_Tp)+8> class AutoBuffer
     _Tp* ptr;
     //! size of the real buffer
     size_t sz;
-    //! pre-allocated buffer
-    _Tp buf[fixed_size];
+    //! pre-allocated buffer. At least 1 element to confirm C++ standard reqirements
+    _Tp buf[(fixed_size > 0) ? fixed_size : 1];
 };
 
 //! Sets/resets the break-on-error mode.