diff --git a/GRRLIB/GRRLIB/GRRLIB_bmfx.c b/GRRLIB/GRRLIB/GRRLIB_bmfx.c index e9b9260..b497e69 100644 --- a/GRRLIB/GRRLIB/GRRLIB_bmfx.c +++ b/GRRLIB/GRRLIB/GRRLIB_bmfx.c @@ -105,7 +105,7 @@ void GRRLIB_BMFX_Sepia (const GRRLIB_texImg *texsrc, GRRLIB_texImg *texdest) { sb = R(color)*0.272 + G(color)*0.534 + B(color)*0.131; if (sr>255) sr=255; if (sg>255) sg=255; if (sb>255) sb=255; GRRLIB_SetPixelTotexImg(x, y, texdest, - GRRLIB_GetColor(sr,sg,sb,A(color))); + RGBA(sr,sg,sb,A(color))); } } GRRLIB_SetHandle(texdest, 0, 0); diff --git a/GRRLIB/GRRLIB/grrlib/GRRLIB__inline.h b/GRRLIB/GRRLIB/grrlib/GRRLIB__inline.h index 436b20c..529d293 100644 --- a/GRRLIB/GRRLIB/grrlib/GRRLIB__inline.h +++ b/GRRLIB/GRRLIB/grrlib/GRRLIB__inline.h @@ -99,8 +99,6 @@ INLINE u32 GRRLIB_GetPixelFromtexImg (const int x, const int y, INLINE void GRRLIB_SetPixelTotexImg (const int x, const int y, GRRLIB_texImg *tex, const u32 color) ; -INLINE u32 GRRLIB_GetColor (const u8 r, const u8 g, const u8 b, const u8 a) ; - INLINE void GRRLIB_GetPixelFromFB (int x, int y, u8 *R1, u8 *G1, u8 *B1, u8 *R2, u8 *G2, u8 *B2) ; diff --git a/GRRLIB/GRRLIB/grrlib/GRRLIB_pixel.h b/GRRLIB/GRRLIB/grrlib/GRRLIB_pixel.h index b202936..96dd826 100644 --- a/GRRLIB/GRRLIB/grrlib/GRRLIB_pixel.h +++ b/GRRLIB/GRRLIB/grrlib/GRRLIB_pixel.h @@ -65,19 +65,6 @@ void GRRLIB_SetPixelTotexImg (const int x, const int y, *((u16*)(bp+offs+32)) = (u16) (color >>8); } -/** - * Converts RGBA values to u32 color. - * @param r Amount of red (0 - 255). - * @param g Amount of green (0 - 255). - * @param b Amount of blue (0 - 255). - * @param a Amount of alpha (0 - 255). - * @return Returns the color in u32 format. - */ -INLINE -u32 GRRLIB_GetColor (const u8 r, const u8 g, const u8 b, const u8 a) { - return (r << 24) | (g << 16) | (b << 8) | a; -} - /** * Reads a pixel directly from the FrontBuffer. * Since the FB is stored in YCbCr,