Skip to content

Fixed issue happened during merge#15061

Merged
alalek merged 1 commit intoopencv:masterfrom
AsyaPronina:dev/fix_merge_issue
Jul 16, 2019
Merged

Fixed issue happened during merge#15061
alalek merged 1 commit intoopencv:masterfrom
AsyaPronina:dev/fix_merge_issue

Conversation

@AsyaPronina
Copy link
Copy Markdown
Contributor

@AsyaPronina AsyaPronina commented Jul 16, 2019

Fix merge issue

@AsyaPronina AsyaPronina requested review from dkurt and dmatveev July 16, 2019 17:49
@dmatveev
Copy link
Copy Markdown
Contributor

dmatveev commented Jul 16, 2019

Thanks! What was that bool parameter originally?

dmatveev
dmatveev approved these changes Jul 16, 2019
View reviewed changes
Copy link
Copy Markdown
Contributor

@dmatveev dmatveev left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Merge if it is green; cc: @andrey-golubev

@alalek alalek merged commit f6ec0cd into opencv:master Jul 16, 2019
@AsyaPronina
Copy link
Copy Markdown
Contributor Author

AsyaPronina commented Jul 16, 2019

Thanks! What was that bool parameter originally?
bool createOutputMatrices = getCommonParam<3>();
There was an
// TODO: delete bool (createOutputMatrices) from common parameters
in PR with addition of BackendOutputAllocation tests

@andrey-golubev
Copy link
Copy Markdown
Member

andrey-golubev commented Jul 17, 2019

Good job, thanks @AsyaPronina @dmatveev @alalek !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmatveev dmatveev dmatveev approved these changes

@dkurt dkurt Awaiting requested review from dkurt

Assignees

@dmatveev dmatveev

Labels

category: g-api / gapi

Projects

None yet

Milestone

4.1.1

Development

Successfully merging this pull request may close these issues.

4 participants

@AsyaPronina @dmatveev @andrey-golubev @alalek