Merge pull request #1285 from SpecLad:enum-compare

2013-08-19 12:00:18 +04:00
parent 2349f7ea89 2304a561ca
commit 473ca0849d
1 changed files with 1 additions and 1 deletions
--- a/modules/cudev/include/opencv2/cudev/util/type_traits.hpp
+++ b/modules/cudev/include/opencv2/cudev/util/type_traits.hpp
@@ -152,7 +152,7 @@ template <typename T> struct TypeTraits
 template <typename A, typename B> struct LargerType
 {
    typedef typename SelectIf<
-        VecTraits<A>::cn != VecTraits<B>::cn,
+        unsigned(VecTraits<A>::cn) != unsigned(VecTraits<B>::cn),
        void,
        typename MakeVec<
            typename type_traits_detail::LargerDepth<