actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

simplify, const fixes

Browse Source
This commit is contained in:
Glenn Maynard
2004-08-31 01:28:51 +00:00
parent 994b2e3935
commit b152c30512
2 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageSurfaceUtils.cpp
+15 -15
View File
@@ -132,7 +132,7 @@ void RageSurfaceUtils::GetBitsPerChannel( const RageSurfaceFormat *fmt, uint32_t
bits[3] = 8 - fmt->Aloss; bits[3] = 8 - fmt->Aloss;
} }
void RageSurfaceUtils::CopySurface( RageSurface *src, RageSurface *dest ) void RageSurfaceUtils::CopySurface( const RageSurface *src, RageSurface *dest )
{ {
/* Copy the palette, if we have one. */ /* Copy the palette, if we have one. */
if( src->format->BitsPerPixel == 8 && dest->format->BitsPerPixel == 8 ) if( src->format->BitsPerPixel == 8 && dest->format->BitsPerPixel == 8 )
@@ -455,10 +455,10 @@ void RageSurfaceUtils::BlitTransform( const RageSurface *src, RageSurface *dst,
* No general blitting rects. * No general blitting rects.
*/ */
static void blit_same_type( RageSurface *src_surf, const RageSurface *dst_surf, int width, int height ) static void blit_same_type( const RageSurface *src_surf, const RageSurface *dst_surf, int width, int height )
{ {
const char *src = (const char *) src_surf->pixels; const uint8_t *src = src_surf->pixels;
char *dst = (char *) dst_surf->pixels; uint8_t *dst = dst_surf->pixels;
/* If possible, memcpy the whole thing. */ /* If possible, memcpy the whole thing. */
if( src_surf->w == width && dst_surf->w == width && src_surf->pitch == dst_surf->pitch ) if( src_surf->w == width && dst_surf->w == width && src_surf->pitch == dst_surf->pitch )
@@ -478,10 +478,10 @@ static void blit_same_type( RageSurface *src_surf, const RageSurface *dst_surf,
/* Rescaling blit with no ckey. This is used to update movies in /* Rescaling blit with no ckey. This is used to update movies in
* D3D, so optimization is very important. */ * D3D, so optimization is very important. */
static void blit_rgba_to_rgba( RageSurface *src_surf, const RageSurface *dst_surf, int width, int height ) static void blit_rgba_to_rgba( const RageSurface *src_surf, const RageSurface *dst_surf, int width, int height )
{ {
const char *src = (const char *) src_surf->pixels; const uint8_t *src = src_surf->pixels;
const char *dst = (const char *) dst_surf->pixels; uint8_t *dst = dst_surf->pixels;
/* Bytes to skip at the end of a line. */ /* Bytes to skip at the end of a line. */
const int srcskip = src_surf->pitch - width*src_surf->format->BytesPerPixel; const int srcskip = src_surf->pitch - width*src_surf->format->BytesPerPixel;
@@ -520,7 +520,7 @@ static void blit_rgba_to_rgba( RageSurface *src_surf, const RageSurface *dst_sur
int x = 0; int x = 0;
while( x++ < width ) while( x++ < width )
{ {
unsigned int pixel = RageSurfaceUtils::decodepixel((uint8_t *) src, src_surf->format->BytesPerPixel); unsigned int pixel = RageSurfaceUtils::decodepixel( src, src_surf->format->BytesPerPixel );
/* Convert pixel to the destination RGBA. */ /* Convert pixel to the destination RGBA. */
unsigned int opixel = 0; unsigned int opixel = 0;
@@ -533,7 +533,7 @@ static void blit_rgba_to_rgba( RageSurface *src_surf, const RageSurface *dst_sur
opixel |= ormask; opixel |= ormask;
/* Store it. */ /* Store it. */
RageSurfaceUtils::encodepixel((uint8_t *) dst, dst_surf->format->BytesPerPixel, opixel); RageSurfaceUtils::encodepixel( dst, dst_surf->format->BytesPerPixel, opixel );
src += src_surf->format->BytesPerPixel; src += src_surf->format->BytesPerPixel;
dst += dst_surf->format->BytesPerPixel; dst += dst_surf->format->BytesPerPixel;
@@ -544,10 +544,10 @@ static void blit_rgba_to_rgba( RageSurface *src_surf, const RageSurface *dst_sur
} }
} }
static void blit_generic( RageSurface *src_surf, const RageSurface *dst_surf, int width, int height ) static void blit_generic( const RageSurface *src_surf, const RageSurface *dst_surf, int width, int height )
{ {
const char *src = (const char *) src_surf->pixels; const uint8_t *src = src_surf->pixels;
const char *dst = (const char *) dst_surf->pixels; uint8_t *dst = dst_surf->pixels;
/* Bytes to skip at the end of a line. */ /* Bytes to skip at the end of a line. */
const int srcskip = src_surf->pitch - width*src_surf->format->BytesPerPixel; const int srcskip = src_surf->pitch - width*src_surf->format->BytesPerPixel;
@@ -558,7 +558,7 @@ static void blit_generic( RageSurface *src_surf, const RageSurface *dst_surf, in
int x = 0; int x = 0;
while( x++ < width ) while( x++ < width )
{ {
unsigned int pixel = RageSurfaceUtils::decodepixel((uint8_t *) src, src_surf->format->BytesPerPixel); unsigned int pixel = RageSurfaceUtils::decodepixel( src, src_surf->format->BytesPerPixel );
uint8_t colors[4]; uint8_t colors[4];
/* Convert pixel to the destination RGBA. */ /* Convert pixel to the destination RGBA. */
@@ -569,7 +569,7 @@ static void blit_generic( RageSurface *src_surf, const RageSurface *dst_surf, in
pixel = RageSurfaceUtils::SetRGBAV(dst_surf->format, colors); pixel = RageSurfaceUtils::SetRGBAV(dst_surf->format, colors);
/* Store it. */ /* Store it. */
RageSurfaceUtils::encodepixel((uint8_t *) dst, dst_surf->format->BytesPerPixel, pixel); RageSurfaceUtils::encodepixel( dst, dst_surf->format->BytesPerPixel, pixel );
src += src_surf->format->BytesPerPixel; src += src_surf->format->BytesPerPixel;
dst += dst_surf->format->BytesPerPixel; dst += dst_surf->format->BytesPerPixel;
@@ -582,7 +582,7 @@ static void blit_generic( RageSurface *src_surf, const RageSurface *dst_surf, in
} }
/* Blit src onto dst. */ /* Blit src onto dst. */
void RageSurfaceUtils::Blit( RageSurface *src, RageSurface *dst, int width, int height ) void RageSurfaceUtils::Blit( const RageSurface *src, RageSurface *dst, int width, int height )
{ {
if(width == -1) if(width == -1)
width = src->w; width = src->w;
stepmania/src/RageSurfaceUtils.h
+2 -2
View File
@@ -26,7 +26,7 @@ namespace RageSurfaceUtils
/* Get the number of bits representing each color channel in fmt. */ /* Get the number of bits representing each color channel in fmt. */
void GetBitsPerChannel( const RageSurfaceFormat *fmt, uint32_t bits[4] ); void GetBitsPerChannel( const RageSurfaceFormat *fmt, uint32_t bits[4] );
void CopySurface( RageSurface *src, RageSurface *dest ); void CopySurface( const RageSurface *src, RageSurface *dest );
bool ConvertSurface( RageSurface *src, RageSurface *&dst, bool ConvertSurface( RageSurface *src, RageSurface *&dst,
int width, int height, int bpp, uint32_t R, uint32_t G, uint32_t B, uint32_t A ); int width, int height, int bpp, uint32_t R, uint32_t G, uint32_t B, uint32_t A );
void ConvertSurface( RageSurface *&image, void ConvertSurface( RageSurface *&image,
@@ -47,7 +47,7 @@ namespace RageSurfaceUtils
void BlitTransform( const RageSurface *src, RageSurface *dst, void BlitTransform( const RageSurface *src, RageSurface *dst,
const float fCoords[8] /* TL, BR, BL, TR */ ); const float fCoords[8] /* TL, BR, BL, TR */ );
void Blit( RageSurface *src, RageSurface *dst, int width, int height ); void Blit( const RageSurface *src, RageSurface *dst, int width, int height );
bool SaveSurface( RageSurface *img, CString file ); bool SaveSurface( RageSurface *img, CString file );
RageSurface *LoadSurface( CString file ); RageSurface *LoadSurface( CString file );