projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b81dcbd
)
#pragma warning4127 fixation modified 2
author
jaco
<f.puja@yahoo.it>
Thu, 14 Aug 2014 17:27:53 +0000
(19:27 +0200)
committer
jaco
<f.puja@yahoo.it>
Thu, 14 Aug 2014 17:27:53 +0000
(19:27 +0200)
modules/core/include/opencv2/core/cvstd.inl.hpp
patch
|
blob
|
history
diff --git
a/modules/core/include/opencv2/core/cvstd.inl.hpp
b/modules/core/include/opencv2/core/cvstd.inl.hpp
index
f43798e
..
faa7fdb
100644
(file)
--- a/
modules/core/include/opencv2/core/cvstd.inl.hpp
+++ b/
modules/core/include/opencv2/core/cvstd.inl.hpp
@@
-219,11
+219,14
@@
template<typename _Tp, int n> static inline
std::ostream& operator << (std::ostream& out, const Vec<_Tp, n>& vec)
{
out << "[";
-
+#ifdef _MSC_VER
#pragma warning( push )
#pragma warning( disable: 4127 )
+#endif
if(Vec<_Tp, n>::depth < CV_32F)
+#ifdef _MSC_VER
#pragma warning( pop )
+#endif
{
for (int i = 0; i < n - 1; ++i) {
out << (int)vec[i] << ", ";