Merge pull request #13183 from tomoaki0705:fixCaroteneColorConvert2Gray

bea312bd · Alexander Alekhin · GitHub · 3705648c · 3bbc4e44 · bea312bd
Unverified Commit bea312bd authored Nov 16, 2018 by Alexander Alekhin Committed by GitHub Nov 16, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

colorconvert.cpp 3rdparty/carotene/src/colorconvert.cpp +4 -4

No files found.
--- a/3rdparty/carotene/src/colorconvert.cpp
+++ b/3rdparty/carotene/src/colorconvert.cpp
@@ -49,12 +49,12 @@ namespace {

 enum
 {
-    SHIFT = 14,
+    SHIFT = 15,
    SHIFT_DELTA = 1 << (SHIFT - 1),

-    R2Y_BT601   = 4899,
-    G2Y_BT601   = 9617,
-    B2Y_BT601   = 1868,
+    R2Y_BT601   = 9798,
+    G2Y_BT601   = 19235,
+    B2Y_BT601   = 3735,

    R2Y_BT709   = 3483,
    G2Y_BT709   = 11718,