mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-08-06 14:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #8576 from terfendail:ovx_fixwrappers

Browse Source
This commit is contained in:
Alexander Alekhin 2017-04-14 11:04:58 +00:00
commit 2d05db6f22
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
3rdparty/openvx/include/ivx.hpp vendored
View File

@ -2508,10 +2508,10 @@ public:
{ {
if (!areTypesCompatible(TypeToEnum<T>::value, dataType())) if (!areTypesCompatible(TypeToEnum<T>::value, dataType()))
throw WrapperError(std::string(__func__) + "(): destination type is wrong"); throw WrapperError(std::string(__func__) + "(): destination type is wrong");
if (data.size() != size()) if (data.size()*sizeof(T) != size())
{ {
if (data.size() == 0) if (data.size() == 0)
data.resize(size()); data.resize(size()/sizeof(T));
else else
throw WrapperError(std::string(__func__) + "(): destination size is wrong"); throw WrapperError(std::string(__func__) + "(): destination size is wrong");
} }
@ -2522,7 +2522,7 @@ public:
{ {
if (!areTypesCompatible(TypeToEnum<T>::value, dataType())) if (!areTypesCompatible(TypeToEnum<T>::value, dataType()))
throw WrapperError(std::string(__func__) + "(): source type is wrong"); throw WrapperError(std::string(__func__) + "(): source type is wrong");
if (data.size() != size()) throw WrapperError(std::string(__func__) + "(): source size is wrong"); if (data.size()*sizeof(T) != size()) throw WrapperError(std::string(__func__) + "(): source size is wrong");
copyFrom(&data[0]); copyFrom(&data[0]);
} }
@ -2670,10 +2670,10 @@ public:
{ {
if (!areTypesCompatible(TypeToEnum<T>::value, dataType())) if (!areTypesCompatible(TypeToEnum<T>::value, dataType()))
throw WrapperError(std::string(__func__) + "(): destination type is wrong"); throw WrapperError(std::string(__func__) + "(): destination type is wrong");
if (data.size() != size()) if (data.size()*sizeof(T) != size())
{ {
if (data.size() == 0) if (data.size() == 0)
data.resize(size()); data.resize(size()/sizeof(T));
else else
throw WrapperError(std::string(__func__) + "(): destination size is wrong"); throw WrapperError(std::string(__func__) + "(): destination size is wrong");
} }
@ -2684,7 +2684,7 @@ public:
{ {
if (!areTypesCompatible(TypeToEnum<T>::value, dataType())) if (!areTypesCompatible(TypeToEnum<T>::value, dataType()))
throw WrapperError(std::string(__func__) + "(): source type is wrong"); throw WrapperError(std::string(__func__) + "(): source type is wrong");
if (data.size() != size()) throw WrapperError(std::string(__func__) + "(): source size is wrong"); if (data.size()*sizeof(T) != size()) throw WrapperError(std::string(__func__) + "(): source size is wrong");
copyFrom(&data[0]); copyFrom(&data[0]);
} }