From b9702243c7d6390625d69b7e4af5c34154d773bb Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 30 Dec 2009 19:10:41 +0000 Subject: [PATCH] Removed in the interest of actually finishing 1.3. :) They can be done later, either by me or by someone else. --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404353 --- include/SDL_video.h | 30 ----------------------------- src/video/SDL_video.c | 44 ------------------------------------------- 2 files changed, 74 deletions(-) diff --git a/include/SDL_video.h b/include/SDL_video.h index e8196c29a..20d82b642 100644 --- a/include/SDL_video.h +++ b/include/SDL_video.h @@ -1225,36 +1225,6 @@ extern DECLSPEC int SDLCALL SDL_RenderFillRect(const SDL_Rect * rect); */ extern DECLSPEC int SDLCALL SDL_RenderFillRects(const SDL_Rect ** rect, int count); -#if 0 -/** - * \brief Draw a circle on the current rendering target with the drawing color. - * - * \return 0 on success, or -1 if there is no rendering context current. - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawCircle(int x, int y, int radius); - -/** - * \brief Fill a circle on the current rendering target with the drawing color. - * - * \return 0 on success, or -1 if there is no rendering context current. - */ -extern DECLSPEC int SDLCALL SDL_RenderFillCircle(int x, int y, int radius); - -/** - * \brief Draw an ellipse on the current rendering target with the drawing color. - * - * \return 0 on success, or -1 if there is no rendering context current. - */ -extern DECLSPEC int SDLCALL SDL_RenderDrawEllipse(int x, int y, int w, int h); - -/** - * \brief Fill an ellipse on the current rendering target with the drawing color. - * - * \return 0 on success, or -1 if there is no rendering context current. - */ -extern DECLSPEC int SDLCALL SDL_RenderFillEllipse(int x, int y, int w, int h); -#endif // 0 - /** * \brief Copy a portion of the texture to the current rendering target. * diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 1b6ccb4dc..1561fac2f 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -2673,50 +2673,6 @@ SDL_RenderFillRects(const SDL_Rect ** rects, int count) return renderer->RenderFillRects(renderer, rects, count); } -#if 0 -int -SDL_RenderDrawCircle(int x, int y, int radius) -{ - return SDL_RenderDrawEllipse(x, y, 2*radius, 2*radius); -} - -int -SDL_RenderFillCircle(int x, int y, int radius) -{ - return SDL_RenderFillEllipse(x, y, 2*radius, 2*radius); -} - -int SDL_RenderDrawEllipse(int x, int y, int w, int h) -{ - SDL_Renderer *renderer; - - renderer = SDL_GetCurrentRenderer(SDL_TRUE); - if (!renderer) { - return -1; - } - if (!renderer->RenderDrawEllipse) { - SDL_Unsupported(); - return -1; - } - return renderer->RenderDrawEllipse(renderer, x, y, w, h); -} - -int SDL_RenderFillEllipse(int x, int y, int w, int h) -{ - SDL_Renderer *renderer; - - renderer = SDL_GetCurrentRenderer(SDL_TRUE); - if (!renderer) { - return -1; - } - if (!renderer->RenderFillEllipse) { - SDL_Unsupported(); - return -1; - } - return renderer->RenderFillEllipse(renderer, x, y, w, h); -} -#endif // 0 - int SDL_RenderCopy(SDL_TextureID textureID, const SDL_Rect * srcrect, const SDL_Rect * dstrect)