Skip to content

Fix swapped channels in BGR* conversion utility function#16265

Merged
opencv-pushbot merged 1 commit intoopencv:3.4from
JanuszL:fix_bgr
Jan 5, 2020
Merged

Fix swapped channels in BGR* conversion utility function#16265
opencv-pushbot merged 1 commit intoopencv:3.4from
JanuszL:fix_bgr

Conversation

@JanuszL
Copy link
Copy Markdown
Contributor

@JanuszL JanuszL commented Dec 30, 2019

resolves #16215

This pull request changes

  • some of icvCvt_BGR* functions have R with B channels
    swapped what leads to the wrong conversion
  • renames misleading rgb variable name to bgr
  • swap back the conversion coefficients, cB should be the first
  • internal reference - nvbugs/2797421

Signed-off-by: Janusz Lisiecki jlisiecki@nvidia.com

@alalek
Copy link
Copy Markdown
Member

alalek commented Jan 4, 2020

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".

- some of `icvCvt_BGR*` functions have R with B channels
  swapped what leads to the wrong conversion
- renames misleading `rgb` variable name to `bgr`
- swap back the conversion coefficients, `cB` should be the first

Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
@JanuszL JanuszL changed the base branch from master to 3.4 January 4, 2020 23:07
@JanuszL
Copy link
Copy Markdown
Contributor Author

JanuszL commented Jan 4, 2020

@alalek - done

Copy link
Copy Markdown
Member

@alalek alalek left a comment

Choose a reason for hiding this comment

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

Well done 👍

opencv-pushbot pushed a commit that referenced this pull request Jan 5, 2020
@opencv-pushbot opencv-pushbot merged commit 178c481 into opencv:3.4 Jan 5, 2020
@JanuszL JanuszL deleted the fix_bgr branch January 5, 2020 22:51
@alalek alalek mentioned this pull request Jan 12, 2020
JanuszL added a commit to JanuszL/DALI that referenced this pull request Apr 10, 2020
….1.0, FFmpeg to 4.2.2

- bumps up OpenCV to the latest version 4.3.0
- conda build is not updated as prebuild OpenCV (4.2.0 at most) binaries
  don't have bug opencv/opencv#16265 fixed
- updates docs regarding libturbo-jpeg and OpenCV version
- bumps libturbo-jpeg to 2.0.4 (2.0.3 for conda due to availability)
- bumps libtiff to 4.1.0
- bumps FFmpeg to 4.2.2

Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
JanuszL added a commit to NVIDIA/DALI that referenced this pull request Apr 14, 2020
….1.0, FFmpeg to 4.2.2 (#1783)

- bumps up OpenCV to the latest version 4.3.0
- conda build is not updated as prebuild OpenCV (4.2.0 at most) binaries don't have bug opencv/opencv#16265 fixed
- updates docs regarding libturbo-jpeg and OpenCV version
- bumps libturbo-jpeg to 2.0.4 (2.0.3 for conda due to availability)
- bumps libtiff to 4.1.0
- bumps FFmpeg to 4.2.2

Signed-off-by: Janusz Lisiecki <jlisiecki@nvidia.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants