diff options
| author | Lioncash <mathew1800@gmail.com> | 2018-05-27 20:55:36 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2018-05-27 21:00:54 -0400 |
| commit | ac474ff1dad4ed4766279bf1c19a68c44846d94f (patch) | |
| tree | 53060073261a9043f8e6e3a229e22d1fa31470ae /Source/Core/Common | |
| parent | 686e29f2d3f1f6cbd58dd9104820747e2c0d629e (diff) | |
ColorUtil: Namespace code under the Common namespace
Given this is within Common, it should be in the Common namespace
itself.
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/ColorUtil.cpp | 7 | ||||
| -rw-r--r-- | Source/Core/Common/ColorUtil.h | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/Source/Core/Common/ColorUtil.cpp b/Source/Core/Common/ColorUtil.cpp index bce7276aa1..60d9b5b084 100644 --- a/Source/Core/Common/ColorUtil.cpp +++ b/Source/Core/Common/ColorUtil.cpp @@ -5,7 +5,7 @@ #include "Common/ColorUtil.h" #include "Common/Swap.h" -namespace ColorUtil +namespace Common { static const int s_lut5to8[] = {0x00, 0x08, 0x10, 0x18, 0x20, 0x29, 0x31, 0x39, 0x41, 0x4A, 0x52, 0x5A, 0x62, 0x6A, 0x73, 0x7B, 0x83, 0x8B, 0x94, 0x9C, 0xA4, 0xAC, @@ -70,11 +70,10 @@ void decodeCI8image(u32* dst, const u8* src, const u16* pal, int width, int heig for (int ix = 0; ix < 8; ix++) { // huh, this seems wrong. CI8, not 5A3, no? - tdst[ix] = ColorUtil::Decode5A3(Common::swap16(pal[src[ix]])); + tdst[ix] = Decode5A3(Common::swap16(pal[src[ix]])); } } } } } - -} // namespace +} // namespace Common diff --git a/Source/Core/Common/ColorUtil.h b/Source/Core/Common/ColorUtil.h index 1c90245a7b..14486a97d7 100644 --- a/Source/Core/Common/ColorUtil.h +++ b/Source/Core/Common/ColorUtil.h @@ -6,9 +6,8 @@ #include "Common/CommonTypes.h" -namespace ColorUtil +namespace Common { void decode5A3image(u32* dst, const u16* src, int width, int height); void decodeCI8image(u32* dst, const u8* src, const u16* pal, int width, int height); - -} // namespace +} // namespace Common |