From a1c7e0368cb44018f56045505a86133d72272a7e Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 18 Feb 2013 17:01:21 +0400 Subject: [PATCH] fixed problem reported by Thouis (Ray) Jones --- modules/core/src/matrix.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp index f21e6ac4f2..6c265f6c6f 100644 --- a/modules/core/src/matrix.cpp +++ b/modules/core/src/matrix.cpp @@ -3496,7 +3496,7 @@ enum { HASH_SIZE0 = 8 }; static inline void copyElem(const uchar* from, uchar* to, size_t elemSize) { size_t i; - for( i = 0; (int)i <= (int)(elemSize - sizeof(int)); i += sizeof(int) ) + for( i = 0; i + sizeof(int) <= elemSize; i += sizeof(int) ) *(int*)(to + i) = *(const int*)(from + i); for( ; i < elemSize; i++ ) to[i] = from[i]; @@ -3505,7 +3505,7 @@ static inline void copyElem(const uchar* from, uchar* to, size_t elemSize) static inline bool isZeroElem(const uchar* data, size_t elemSize) { size_t i; - for( i = 0; i <= elemSize - sizeof(int); i += sizeof(int) ) + for( i = 0; i + sizeof(int) <= elemSize; i += sizeof(int) ) if( *(int*)(data + i) != 0 ) return false; for( ; i < elemSize; i++ )