Skip to content

imgproc(color_yuv.simd): Fix the build using MinGW#17577

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
philippefoubert:branch_color_yuv_simd
Jun 18, 2020
Merged

imgproc(color_yuv.simd): Fix the build using MinGW#17577
opencv-pushbot merged 1 commit intoopencv:3.4from
philippefoubert:branch_color_yuv_simd

Conversation

@philippefoubert
Copy link
Copy Markdown
Contributor

@philippefoubert philippefoubert commented Jun 18, 2020 •
edited by alalek
Loading

The symbol "scr1" is already defined in the mingw-w64 runtime package in "mingw-w64\x86_64-8.1.0-posix-seh-rt_v6-rev0\mingw64\x86_64-w64-mingw32\include\dlgs.h" (included through "windows.h" for example).
=> renaming of variables to avoid this conflict: scr1 => v_scr1

resolves #17546

@philippefoubert philippefoubert mentioned this pull request Jun 18, 2020
Closed
@alalek
Copy link
Copy Markdown
Member

alalek commented Jun 18, 2020

Thank you!

As a bugfix this patch should go into 3.4 branch first.
We will merge changes from 3.4 into master regularly (weekly/bi-weekly).

So, please:

  • change "base" branch of this PR: master => 3.4 (use "Edit" button near PR title)
  • rebase your commits from master onto 3.4 branch. For example:
    git rebase -i --onto upstream/3.4 upstream/master
    (check list of your commits, save and quit (Esc + "wq" + Enter)
    where upstream is configured by following this GitHub guide and fetched (git fetch upstream).
  • push rebased commits into source branch of your fork (with --force option)

Note: no needs to re-open PR, apply changes "inplace".

@philippefoubert philippefoubert changed the base branch from master to 3.4 June 18, 2020 10:53
@philippefoubert philippefoubert changed the base branch from 3.4 to master June 18, 2020 11:20
@philippefoubert philippefoubert changed the base branch from master to 3.4 June 18, 2020 11:24
@philippefoubert philippefoubert force-pushed the branch_color_yuv_simd branch from f147911 to 6b1c9d5 Compare June 18, 2020 11:58
@opencv-pushbot opencv-pushbot merged commit 52fbfb3 into opencv:3.4 Jun 18, 2020
This was referenced Jun 18, 2020
Closed
Merged
@philippefoubert philippefoubert deleted the branch_color_yuv_simd branch June 22, 2020 19:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alalek alalek alalek approved these changes

Assignees

@alalek alalek

Labels

bug category: build/install platform: win32

Projects

None yet

Milestone

3.4.11

Development

Successfully merging this pull request may close these issues.

[imgproc] Compilation error caused by color_yuv.simd.hpp

3 participants

@philippefoubert @alalek @opencv-pushbot