Skip to content

Fix G-API OneVPL compilation#22393

Merged
alalek merged 2 commits intoopencv:4.xfrom
TolyaTalamanov:at/fix-gapi-vpl-windows-build
Aug 20, 2022
Merged

Fix G-API OneVPL compilation#22393
alalek merged 2 commits intoopencv:4.xfrom
TolyaTalamanov:at/fix-gapi-vpl-windows-build

Conversation

@TolyaTalamanov
Copy link
Copy Markdown
Contributor

@TolyaTalamanov TolyaTalamanov commented Aug 17, 2022

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
  • The PR is proposed to the proper branch
  • There is a reference to the original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

SergeyIvanov87
SergeyIvanov87 approved these changes Aug 19, 2022
View reviewed changes
Copy link
Copy Markdown
Contributor

@SergeyIvanov87 SergeyIvanov87 left a comment

Choose a reason for hiding this comment

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

LGTM

alalek
alalek reviewed Aug 20, 2022
View reviewed changes
modules/gapi/test/streaming/gapi_streaming_tests.cpp Outdated
std::vector<CfgParam> src_params;
src_params.push_back(CfgParam::create_implementation(MFX_IMPL_TYPE_HARDWARE));
#ifdef __WIN32
#ifdef __WIN32__
Copy link
Copy Markdown
Member

@alalek alalek Aug 20, 2022

Choose a reason for hiding this comment

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

should be _WIN32

Copy link
Copy Markdown
Contributor Author

@TolyaTalamanov TolyaTalamanov Aug 20, 2022

Choose a reason for hiding this comment

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

Done

@TolyaTalamanov
Fix macro
4e6b458 
__WIN32__ -> _WIN32
@alalek alalek merged commit 925ff62 into opencv:4.x Aug 20, 2022
@alalek alalek mentioned this pull request Aug 21, 2022
Merged
a-sajjad72 pushed a commit to a-sajjad72/opencv that referenced this pull request Mar 30, 2023
@TolyaTalamanov
Merge pull request opencv#22393 from TolyaTalamanov:at/fix-gapi-vpl-w…
c0cf66b 
…indows-build

* Fix G-API OneVPL compilation

* Fix macro

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

Reviewers

@alalek alalek alalek left review comments

@SergeyIvanov87 SergeyIvanov87 SergeyIvanov87 approved these changes

@dmatveev dmatveev Awaiting requested review from dmatveev

Assignees

@SergeyIvanov87 SergeyIvanov87

Labels

category: build/install category: g-api / gapi

Projects

None yet

Milestone

4.7.0

Development

Successfully merging this pull request may close these issues.

3 participants

@TolyaTalamanov @alalek @SergeyIvanov87