Merge pull request #1285 from SpecLad:enum-compare

473ca084 · Roman Donchenko · OpenCV Buildbot · 2349f7ea · 2304a561 · 473ca084
Commit 473ca084 authored Aug 19, 2013 by Roman Donchenko Committed by OpenCV Buildbot Aug 19, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

type_traits.hpp modules/cudev/include/opencv2/cudev/util/type_traits.hpp +1 -1

No files found.
--- 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<