Skip to content

O
opencv
Commit dd37c10d authored by Alexander Alekhin's avatar Alexander Alekhin
Browse files
Options

Merge pull request #13922 from smirnov-alexey:gapi_fix_nv12_asserts

parents dd262b70 939ea4ba
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 4 deletions
modules/gapi/include/opencv2/gapi/imgproc.hpp
View file @ dd37c10d
...@@ -120,8 +120,7 @@ namespace imgproc { ...@@ -120,8 +120,7 @@ namespace imgproc {
GAPI_Assert(in_uv.chan == 2); GAPI_Assert(in_uv.chan == 2);
GAPI_Assert(in_y.depth == CV_8U); GAPI_Assert(in_y.depth == CV_8U);
GAPI_Assert(in_uv.depth == CV_8U); GAPI_Assert(in_uv.depth == CV_8U);
GAPI_Assert(in_uv.size.width % 2 == 0); // UV size should be aligned with Y
GAPI_Assert(in_uv.size.height % 2 == 0);
GAPI_Assert(in_y.size.width == 2 * in_uv.size.width); GAPI_Assert(in_y.size.width == 2 * in_uv.size.width);
GAPI_Assert(in_y.size.height == 2 * in_uv.size.height); GAPI_Assert(in_y.size.height == 2 * in_uv.size.height);
return in_y.withType(CV_8U, 3); // type will be CV_8UC3; return in_y.withType(CV_8U, 3); // type will be CV_8UC3;
...@@ -134,8 +133,7 @@ namespace imgproc { ...@@ -134,8 +133,7 @@ namespace imgproc {
GAPI_Assert(in_uv.chan == 2); GAPI_Assert(in_uv.chan == 2);
GAPI_Assert(in_y.depth == CV_8U); GAPI_Assert(in_y.depth == CV_8U);
GAPI_Assert(in_uv.depth == CV_8U); GAPI_Assert(in_uv.depth == CV_8U);
GAPI_Assert(in_uv.size.width % 2 == 0); // UV size should be aligned with Y
GAPI_Assert(in_uv.size.height % 2 == 0);
GAPI_Assert(in_y.size.width == 2 * in_uv.size.width); GAPI_Assert(in_y.size.width == 2 * in_uv.size.width);
GAPI_Assert(in_y.size.height == 2 * in_uv.size.height); GAPI_Assert(in_y.size.height == 2 * in_uv.size.height);
return in_y.withType(CV_8U, 3); // type will be CV_8UC3; return in_y.withType(CV_8U, 3); // type will be CV_8UC3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment