From 6f67c0093dd812f0c996fd6dc752537472955029 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Fri, 23 Jul 2010 22:47:51 -0700 Subject: [PATCH] Code Cleanup - Made the Color::blend code structure match that in vitapi, for easier comparison. --- src/Color.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/Color.cpp b/src/Color.cpp index 1c1fe87f8..a06034312 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -349,24 +349,26 @@ void Color::blend (const Color& other) return; } - - // Upgrade either color, if necessary. - if (!(value & _COLOR_256)) upgrade (); - if (!(c.value & _COLOR_256)) c.upgrade (); - - // 256 <-- 256. - if (c.value & _COLOR_HASFG) + else { - value |= _COLOR_HASFG; // There is now a color. - value &= ~_COLOR_FG; // Remove previous color. - value |= (c.value & _COLOR_FG); // Apply other color. - } + // Upgrade either color, if necessary. + if (!(value & _COLOR_256)) upgrade (); + if (!(c.value & _COLOR_256)) c.upgrade (); - if (c.value & _COLOR_HASBG) - { - value |= _COLOR_HASBG; // There is now a color. - value &= ~_COLOR_BG; // Remove previous color. - value |= (c.value & _COLOR_BG); // Apply other color. + // 256 <-- 256. + if (c.value & _COLOR_HASFG) + { + value |= _COLOR_HASFG; // There is now a color. + value &= ~_COLOR_FG; // Remove previous color. + value |= (c.value & _COLOR_FG); // Apply other color. + } + + if (c.value & _COLOR_HASBG) + { + value |= _COLOR_HASBG; // There is now a color. + value &= ~_COLOR_BG; // Remove previous color. + value |= (c.value & _COLOR_BG); // Apply other color. + } } }