From 1d71d02a40dc1f4c50572bf0681bbc2907a3c361 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 17 Feb 2014 22:16:29 +0300 Subject: move sdlpixel file into utils directory. --- src/render/sdl2graphics.cpp | 2 +- src/render/sdl2softwaregraphics.cpp | 4 ++-- src/render/sdlgraphics.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/render') diff --git a/src/render/sdl2graphics.cpp b/src/render/sdl2graphics.cpp index 46d8360b6..2cd7c965e 100644 --- a/src/render/sdl2graphics.cpp +++ b/src/render/sdl2graphics.cpp @@ -79,7 +79,7 @@ #include "utils/sdlcheckutils.h" -#include "gui/base/sdl/sdlpixel.hpp" +#include "utils/sdlpixel.h" #include "debug.h" diff --git a/src/render/sdl2softwaregraphics.cpp b/src/render/sdl2softwaregraphics.cpp index e78a87c7e..8efd73d68 100644 --- a/src/render/sdl2softwaregraphics.cpp +++ b/src/render/sdl2softwaregraphics.cpp @@ -36,7 +36,7 @@ #include "utils/sdlcheckutils.h" -#include "gui/base/sdl/sdlpixel.hpp" +#include "utils/sdlpixel.h" #include "debug.h" @@ -967,7 +967,7 @@ void SDL2SoftwareGraphics::fillRectangle(const gcn::Rectangle &rectangle) for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 2; - *reinterpret_cast(p) = gcn::SDLAlpha16( + *reinterpret_cast(p) = SDLAlpha16( static_cast(pixel), *reinterpret_cast(p), static_cast(mColor.a), mSurface->format); diff --git a/src/render/sdlgraphics.cpp b/src/render/sdlgraphics.cpp index 2226be0da..7a15713be 100644 --- a/src/render/sdlgraphics.cpp +++ b/src/render/sdlgraphics.cpp @@ -31,7 +31,7 @@ #include "utils/sdlcheckutils.h" -#include "gui/base/sdl/sdlpixel.hpp" +#include "utils/sdlpixel.h" #include "debug.h" @@ -963,7 +963,7 @@ void SDLGraphics::fillRectangle(const gcn::Rectangle& rectangle) for (x = x1; x < x2; x++) { uint8_t *const p = p0 + x * 2; - *reinterpret_cast(p) = gcn::SDLAlpha16( + *reinterpret_cast(p) = SDLAlpha16( static_cast(pixel), *reinterpret_cast(p), static_cast(mColor.a), mWindow->format); -- cgit v1.2.3-70-g09d2