summaryrefslogtreecommitdiffstats
path: root/src/common/image.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-07-30 22:59:18 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-07-30 22:59:18 +0200
commit5e637ca0288ddd631ec33e1d620cd4a73bcdc2be (patch)
treeb26b0e9572f101744aba712133e646fb93ed58d2 /src/common/image.cpp
parentd8a0c8d32e160e7ae86bb5b85ead8e5f71b1fd01 (diff)
downloadcolobot-5e637ca0288ddd631ec33e1d620cd4a73bcdc2be.tar.gz
colobot-5e637ca0288ddd631ec33e1d620cd4a73bcdc2be.tar.bz2
colobot-5e637ca0288ddd631ec33e1d620cd4a73bcdc2be.zip
Switched to new style casts
- rewrote old C-style casts to new ..._cast<> - corrected some dangerous casts - added -Wold-style-cast to compile flags
Diffstat (limited to 'src/common/image.cpp')
-rw-r--r--src/common/image.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/common/image.cpp b/src/common/image.cpp
index 78834b4..3d64377 100644
--- a/src/common/image.cpp
+++ b/src/common/image.cpp
@@ -102,7 +102,7 @@ bool PNGSaveSurface(const char *filename, SDL_Surface *surf)
info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL)
{
- png_destroy_write_struct(&png_ptr, (png_infopp)NULL);
+ png_destroy_write_struct(&png_ptr, static_cast<png_infopp>(NULL));
PNG_ERROR = "png_create_info_struct() error!";
return false;
}
@@ -123,9 +123,9 @@ bool PNGSaveSurface(const char *filename, SDL_Surface *surf)
png_write_info(png_ptr, info_ptr);
png_set_packing(png_ptr);
- row_pointers = (png_bytep*) malloc(sizeof(png_bytep)*surf->h);
+ row_pointers = static_cast<png_bytep*>( malloc(sizeof(png_bytep)*surf->h) );
for (i = 0; i < surf->h; i++)
- row_pointers[i] = (png_bytep)(Uint8 *)surf->pixels + i*surf->pitch;
+ row_pointers[i] = static_cast<png_bytep>( static_cast<Uint8 *>(surf->pixels) ) + i*surf->pitch;
png_write_image(png_ptr, row_pointers);
png_write_end(png_ptr, info_ptr);