diff options
| author | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-02-21 18:55:00 +0000 |
|---|---|---|
| committer | j4ck.fr0st <j4ck.fr0st@gmail.com> | 2010-02-21 18:55:00 +0000 |
| commit | fdd635d273ff6ba6553bab34478ce2a93fdeb830 (patch) | |
| tree | 1520b74b9d66713ff9e63df8cc1ba09ea77c76e9 /Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp | |
| parent | f7f11211a1270d34f36a2507a00f25fbbfd7f203 (diff) | |
Warning cleanup, mainly shadowed variables, const/non-const and ctor initialization order
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5098 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp b/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp index 4e7f00f1da..7fec0b583d 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp +++ b/Source/Plugins/Plugin_VideoSoftware/Src/TextureEncoder.cpp @@ -101,7 +101,7 @@ inline void boxfilterRGBA_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b) b = (b16 << 6) / 142;
}
-inline void boxfilterRGBA_to_x8(u8 *src, u8 &x, int shift)
+inline void boxfilterRGBA_to_x8(u8 *src, u8 &x8, int shift)
{
u16 x16 = 0;
@@ -117,7 +117,7 @@ inline void boxfilterRGBA_to_x8(u8 *src, u8 &x, int shift) src += (640 - 3) * 3;
}
- x = (x16 << 6) / 142;
+ x8 = (x16 << 6) / 142;
}
inline void boxfilterRGBA_to_xx8(u8 *src, u8 &x1, u8 &x2, int shift1, int shift2)
@@ -164,7 +164,7 @@ inline void boxfilterRGB_to_RGB8(u8 *src, u8 &r, u8 &g, u8 &b) b = b16 / 9;
}
-inline void boxfilterRGB_to_x8(u8 *src, u8 &x, int comp)
+inline void boxfilterRGB_to_x8(u8 *src, u8 &x8, int comp)
{
u16 x16 = 0;
@@ -179,7 +179,7 @@ inline void boxfilterRGB_to_x8(u8 *src, u8 &x, int comp) src += (640 - 3) * 3;
}
- x = x16 / 9;
+ x8 = x16 / 9;
}
inline void boxfilterRGB_to_xx8(u8 *src, u8 &x1, u8 &x2, int comp1, int comp2)
|