upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-26 17:22:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove useless reference counting by using reference arguments.

Browse Source 
9kB size reduction on an optimized binary.
This commit is contained in:
Guillaume Melquiond 2005-01-08 23:06:27 +00:00
parent 0a27f719d0
commit f74c035fc6
2 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/sdl_utils.cpp
View File

@ -70,7 +70,7 @@ namespace {
}
surface make_neutral_surface(surface surf)
surface make_neutral_surface(surface const &surf)
{
if(surf == NULL) {
std::cerr << "null neutral surface...\n";
@ -86,7 +86,7 @@ surface make_neutral_surface(surface surf)
}
surface create_optimized_surface(surface surf)
surface create_optimized_surface(surface const &surf)
{
if(surf == NULL)
return NULL;
@ -103,7 +103,7 @@ surface create_optimized_surface(surface surf)
return result;
}
surface scale_surface(surface surf, int w, int h)
surface scale_surface(surface const &surf, int w, int h)
{
if(surf == NULL)
return NULL;
@ -147,7 +147,7 @@ surface scale_surface(surface surf, int w, int h)
return create_optimized_surface(dst);
}
surface scale_surface_blended(surface surf, int w, int h)
surface scale_surface_blended(surface const &surf, int w, int h)
{
if(surf== NULL)
return NULL;
@ -223,7 +223,7 @@ surface scale_surface_blended(surface surf, int w, int h)
return create_optimized_surface(dst);
}
surface adjust_surface_colour(surface surf, int r, int g, int b)
surface adjust_surface_colour(surface const &surf, int r, int g, int b)
{
if(r == 0 && g == 0 && b == 0 || surf == NULL)
return create_optimized_surface(surf);
@ -257,7 +257,7 @@ surface adjust_surface_colour(surface surf, int r, int g, int b)
return create_optimized_surface(nsurf);
}
surface greyscale_image(surface surf)
surface greyscale_image(surface const &surf)
{
if(surf == NULL)
return NULL;
@ -297,7 +297,7 @@ surface greyscale_image(surface surf)
return create_optimized_surface(nsurf);
}
surface brighten_image(surface surf, double amount)
surface brighten_image(surface const &surf, double amount)
{
if(surf == NULL) {
return NULL;
@ -332,7 +332,7 @@ surface brighten_image(surface surf, double amount)
return create_optimized_surface(nsurf);
}
surface adjust_surface_alpha(surface surf, double amount)
surface adjust_surface_alpha(surface const &surf, double amount)
{
if(surf== NULL) {
return NULL;
@ -365,7 +365,7 @@ surface adjust_surface_alpha(surface surf, double amount)
return create_optimized_surface(nsurf);
}
surface adjust_surface_alpha_add(surface surf, int amount)
surface adjust_surface_alpha_add(surface const &surf, int amount)
{
if(surf== NULL) {
return NULL;
@ -399,7 +399,7 @@ surface adjust_surface_alpha_add(surface surf, int amount)
}
// Applies a mask on a surface
surface mask_surface(surface surf, surface mask)
surface mask_surface(surface const &surf, surface const &mask)
{
if(surf == NULL) {
return NULL;
@ -443,7 +443,7 @@ surface mask_surface(surface surf, surface mask)
}
// Cross-fades a surface
surface blur_surface(surface surf, int depth)
surface blur_surface(surface const &surf, int depth)
{
if(surf == NULL) {
return NULL;
@ -527,7 +527,7 @@ surface blur_surface(surface surf, int depth)
}
// Cuts a rectangle from a surface.
surface cut_surface(surface surf, const SDL_Rect& r)
surface cut_surface(surface const &surf, SDL_Rect const &r)
{
surface res = create_compatible_surface(surf, r.w, r.h);
@ -557,7 +557,7 @@ surface cut_surface(surface surf, const SDL_Rect& r)
return res;
}
surface blend_surface(surface surf, double amount, Uint32 colour)
surface blend_surface(surface const &surf, double amount, Uint32 colour)
{
if(surf== NULL) {
return NULL;
@ -601,7 +601,7 @@ surface blend_surface(surface surf, double amount, Uint32 colour)
return create_optimized_surface(nsurf);
}
surface flip_surface(surface surf)
surface flip_surface(surface const &surf)
{
if(surf == NULL) {
return NULL;
@ -630,7 +630,7 @@ surface flip_surface(surface surf)
return create_optimized_surface(nsurf);
}
surface flop_surface(surface surf)
surface flop_surface(surface const &surf)
{
if(surf == NULL) {
return NULL;
@ -660,7 +660,7 @@ surface flop_surface(surface surf)
}
surface create_compatible_surface(surface surf, int width, int height)
surface create_compatible_surface(surface const &surf, int width, int height)
{
if(surf == NULL)
return NULL;
@ -675,7 +675,7 @@ surface create_compatible_surface(surface surf, int width, int height)
surf->format->Rmask,surf->format->Gmask,surf->format->Bmask,surf->format->Amask);
}
void fill_rect_alpha(SDL_Rect& rect, Uint32 colour, Uint8 alpha, surface target)
void fill_rect_alpha(SDL_Rect &rect, Uint32 colour, Uint8 alpha, surface const &target)
{
if(alpha == SDL_ALPHA_OPAQUE) {
SDL_FillRect(target,&rect,colour);
@ -695,7 +695,7 @@ void fill_rect_alpha(SDL_Rect& rect, Uint32 colour, Uint8 alpha, surface target)
SDL_BlitSurface(tmp,NULL,target,&rect);
}
surface get_surface_portion(surface src, SDL_Rect& area)
surface get_surface_portion(surface const &src, SDL_Rect &area)
{
if(area.x >= src->w || area.y >= src->h) {
std::cerr << "illegal surface portion...\n";
@ -741,7 +741,7 @@ private:
}
SDL_Rect get_non_transperant_portion(surface surf)
SDL_Rect get_non_transperant_portion(surface const &surf)
{
SDL_Rect res = {0,0,0,0};
const surface nsurf(make_neutral_surface(surf));

42
src/sdl_utils.hpp
View File

@ -95,27 +95,27 @@ private:
bool operator<(const surface& a, const surface& b);
surface make_neutral_surface(surface surf);
surface create_optimized_surface(surface surface);
surface scale_surface(surface surface, int w, int h);
surface scale_surface_blended(surface surface, int w, int h);
surface adjust_surface_colour(surface surface, int r, int g, int b);
surface greyscale_image(surface surface);
surface brighten_image(surface surface, double amount);
surface get_surface_portion(surface src, SDL_Rect& rect);
surface adjust_surface_alpha(surface surface, double amount);
surface adjust_surface_alpha_add(surface surface, int amount);
surface mask_surface(surface surf, surface mask);
surface blur_surface(surface surf, int depth=1);
surface cut_surface(surface surface, const SDL_Rect& r);
surface blend_surface(surface surface, double amount, Uint32 colour);
surface flip_surface(surface surface);
surface flop_surface(surface surface);
surface create_compatible_surface(surface surf, int width=-1, int height=-1);
surface make_neutral_surface(surface const &surf);
surface create_optimized_surface(surface const &surf);
surface scale_surface(surface const &surf, int w, int h);
surface scale_surface_blended(surface const &surf, int w, int h);
surface adjust_surface_colour(surface const &surf, int r, int g, int b);
surface greyscale_image(surface const &surf);
surface brighten_image(surface const &surf, double amount);
surface get_surface_portion(surface const &surf, SDL_Rect &rect);
surface adjust_surface_alpha(surface const &surf, double amount);
surface adjust_surface_alpha_add(surface const &surf, int amount);
surface mask_surface(surface const &surf, surface const &mask);
surface blur_surface(surface const &surf, int depth = 1);
surface cut_surface(surface const &surf, SDL_Rect const &r);
surface blend_surface(surface const &surf, double amount, Uint32 colour);
surface flip_surface(surface const &surf);
surface flop_surface(surface const &surf);
surface create_compatible_surface(surface const &surf, int width = -1, int height = -1);
void fill_rect_alpha(SDL_Rect& rect, Uint32 colour, Uint8 alpha, surface target);
void fill_rect_alpha(SDL_Rect &rect, Uint32 colour, Uint8 alpha, surface const &target);
SDL_Rect get_non_transperant_portion(surface surf);
SDL_Rect get_non_transperant_portion(surface const &surf);
bool operator==(const SDL_Rect& a, const SDL_Rect& b);
bool operator!=(const SDL_Rect& a, const SDL_Rect& b);
@ -155,7 +155,7 @@ struct pixel_data
struct surface_lock
{
surface_lock(surface surface) : surface_(surface), locked_(false)
surface_lock(surface const &surf) : surface_(surf), locked_(false)
{
if(SDL_MUSTLOCK(surface_)) {
const int res = SDL_LockSurface(surface_);
@ -199,7 +199,7 @@ private:
struct clip_rect_setter
{
clip_rect_setter(surface surf, const SDL_Rect& r) : surface_(surf)
clip_rect_setter(surface const &surf, const SDL_Rect& r) : surface_(surf)
{
SDL_GetClipRect(surface_,&rect);
SDL_SetClipRect(surface_,&r);