Commit eb823df8 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '5dbd491e'

* commit '5dbd491e':
  TextureDSP: fix erroneous condition which produced blocky output for DXT
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 87544ce8 5dbd491e
...@@ -363,7 +363,7 @@ static int refine_colors(const uint8_t *block, ptrdiff_t stride, ...@@ -363,7 +363,7 @@ static int refine_colors(const uint8_t *block, ptrdiff_t stride,
const int prods[4] = { 0x090000, 0x000900, 0x040102, 0x010402 }; const int prods[4] = { 0x090000, 0x000900, 0x040102, 0x010402 };
/* Check if all pixels have the same index */ /* Check if all pixels have the same index */
if (mask ^ (mask << 2) < 4) { if ((mask ^ (mask << 2)) < 4) {
/* If so, linear system would be singular; solve using optimal /* If so, linear system would be singular; solve using optimal
* single-color match on average color. */ * single-color match on average color. */
int r = 8, g = 8, b = 8; int r = 8, g = 8, b = 8;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment