Merge pull request #16616 from alalek:dnn_fix_input_shape
* dnn: fix processing of input shapes - importer: avoid using of .setInput() => .setInputShape() - setInput: shape limitation check (partial) * dnn(test): test .setInput() in readNet()
This commit is contained in:
committed by
GitHub
parent
966c2191cb
commit
01048e5603
@@ -171,6 +171,10 @@ void check_failed_auto(const Size_<int> v, const CheckContext& ctx)
|
||||
{
|
||||
check_failed_auto_< Size_<int> >(v, ctx);
|
||||
}
|
||||
void check_failed_auto(const std::string& v, const CheckContext& ctx)
|
||||
{
|
||||
check_failed_auto_< std::string >(v, ctx);
|
||||
}
|
||||
|
||||
|
||||
}} // namespace
|
||||
|
||||
@@ -569,6 +569,7 @@ int _InputArray::sizend(int* arrsz, int i) const
|
||||
}
|
||||
else
|
||||
{
|
||||
CV_CheckLE(dims(i), 2, "Not supported"); // TODO Support EXPR with 3+ dims
|
||||
Size sz2d = size(i);
|
||||
d = 2;
|
||||
if(arrsz)
|
||||
|
||||
Reference in New Issue
Block a user