lauchmelder/SDLU
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fixed namespace issue for GCC

Browse source
This commit is contained in:
Robert 2020-05-18 19:32:48 +02:00
parent 80bb6cfdcb
commit 7e3e9a3049
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
SDLU/graphics/RenderWindow.cpp
View file

@ -216,7 +216,7 @@ namespace sdlu
{ {
size_t size = static_cast<size_t>(width) * static_cast<size_t>(height) * 4; size_t size = static_cast<size_t>(width) * static_cast<size_t>(height) * 4;
void* _pixels = malloc(size); void* _pixels = malloc(size);
memcpy(_pixels, pixels, size); std::memcpy(_pixels, pixels, size);
SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels, SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels,
width, height, 32, 32 * width, width, height, 32, 32 * width,
SDL_PIXELFORMAT_RGBA8888); SDL_PIXELFORMAT_RGBA8888);
@ -228,7 +228,7 @@ namespace sdlu
{ {
size_t size = static_cast<size_t>(width) * static_cast<size_t>(height) * 4; size_t size = static_cast<size_t>(width) * static_cast<size_t>(height) * 4;
void* _pixels = malloc(size); void* _pixels = malloc(size);
memcpy(_pixels, pixels, size); std::memcpy(_pixels, pixels, size);
SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels, SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels,
width, height, 32, 4 * width, width, height, 32, 4 * width,
SDL_PIXELFORMAT_RGBA8888); SDL_PIXELFORMAT_RGBA8888);
@ -267,7 +267,7 @@ namespace sdlu
{ {
size_t _size = static_cast<size_t>(size.x) * static_cast<size_t>(size.y) * 4; size_t _size = static_cast<size_t>(size.x) * static_cast<size_t>(size.y) * 4;
void* _pixels = malloc(_size); void* _pixels = malloc(_size);
memcpy(_pixels, pixels, _size); std::memcpy(_pixels, pixels, _size);
SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels, SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels,
size.x, size.y, 32, 8 * size.x, SDL_PIXELFORMAT_RGBA8888); size.x, size.y, 32, 8 * size.x, SDL_PIXELFORMAT_RGBA8888);
this->SetMouseCursor(surface, clickspot); this->SetMouseCursor(surface, clickspot);
@ -277,7 +277,7 @@ namespace sdlu
{ {
size_t _size = static_cast<size_t>(size.x) * static_cast<size_t>(size.y) * 4; size_t _size = static_cast<size_t>(size.x) * static_cast<size_t>(size.y) * 4;
void* _pixels = malloc(_size); void* _pixels = malloc(_size);
memcpy(_pixels, pixels, _size); std::memcpy(_pixels, pixels, _size);
SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels, SDL_Surface* surface = SDL_CreateRGBSurfaceWithFormatFrom(_pixels,
size.x, size.y, 32, 8 * size.x, SDL_PIXELFORMAT_RGBA32); size.x, size.y, 32, 8 * size.x, SDL_PIXELFORMAT_RGBA32);
this->SetMouseCursor(surface, clickspot); this->SetMouseCursor(surface, clickspot);

2
SDLU/structures/Vector2.hpp
View file

@ -60,7 +60,7 @@ namespace sdlu
friend Vector2<T> operator-(const Vector2<T>& left, const Vector2<T>& right) friend Vector2<T> operator-(const Vector2<T>& left, const Vector2<T>& right)
{ {
return left + (-right) return left + (-right);
} }
friend Vector2<T> operator*(const Vector2<T>& left, const Vector2<T>& right) friend Vector2<T> operator*(const Vector2<T>& left, const Vector2<T>& right)