Mercurial > hg > orthanc-stone
diff Framework/Viewport/SdlWindow.h @ 1198:4cc997207d8a broker
fix compatibility between SDL and DCMTK
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 28 Nov 2019 17:13:33 +0100 |
parents | efc5b62b9539 |
children | 6009c59d8676 |
line wrap: on
line diff
--- a/Framework/Viewport/SdlWindow.h Wed Nov 27 14:34:34 2019 +0100 +++ b/Framework/Viewport/SdlWindow.h Thu Nov 28 17:13:33 2019 +0100 @@ -23,18 +23,22 @@ #if ORTHANC_ENABLE_SDL == 1 -#include <SDL_render.h> -#include <SDL_video.h> #include <boost/noncopyable.hpp> +// Forward declaration of SDL type to avoid clashes with DCMTK headers +// on "typedef Sint8", in "StoneInitialization.cpp" +struct SDL_Window; +struct SDL_Renderer; +struct SDL_Surface; + namespace OrthancStone { class SdlWindow : public boost::noncopyable { private: - SDL_Window *window_; - SDL_Renderer *renderer_; - bool maximized_; + struct SDL_Window *window_; + struct SDL_Renderer *renderer_; + bool maximized_; public: SdlWindow(const char* title, @@ -54,7 +58,7 @@ unsigned int GetHeight() const; - void Render(SDL_Surface* surface); + void Render(struct SDL_Surface* surface); void ToggleMaximize();