diff options
Diffstat (limited to 'boilerplate')
-rw-r--r-- | boilerplate/Makefile.sources | 3 | ||||
-rw-r--r-- | boilerplate/Makefile.win32.features | 10 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-sdl-private.h | 56 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate-sdl.c | 69 | ||||
-rw-r--r-- | boilerplate/cairo-boilerplate.c | 15 |
5 files changed, 0 insertions, 153 deletions
diff --git a/boilerplate/Makefile.sources b/boilerplate/Makefile.sources index b3cea817..1b82bbda 100644 --- a/boilerplate/Makefile.sources +++ b/boilerplate/Makefile.sources @@ -43,9 +43,6 @@ cairo_boilerplate_quartz_sources = cairo-boilerplate-quartz.c cairo_boilerplate_script_private = cairo-boilerplate-script-private.h cairo_boilerplate_script_sources = cairo-boilerplate-script.c -cairo_boilerplate_sdl_private = cairo-boilerplate-sdl-private.h -cairo_boilerplate_sdl_sources = cairo-boilerplate-sdl.c - cairo_boilerplate_svg_private = cairo-boilerplate-svg-private.h cairo_boilerplate_svg_sources = cairo-boilerplate-svg.c diff --git a/boilerplate/Makefile.win32.features b/boilerplate/Makefile.win32.features index 74f1ec1e..f5ee452f 100644 --- a/boilerplate/Makefile.win32.features +++ b/boilerplate/Makefile.win32.features @@ -119,16 +119,6 @@ enabled_cairo_boilerplate_private += $(cairo_boilerplate_beos_private) enabled_cairo_boilerplate_sources += $(cairo_boilerplate_beos_sources) endif -unsupported_cairo_boilerplate_headers += $(cairo_boilerplate_sdl_headers) -all_cairo_boilerplate_headers += $(cairo_boilerplate_sdl_headers) -all_cairo_boilerplate_private += $(cairo_boilerplate_sdl_private) -all_cairo_boilerplate_sources += $(cairo_boilerplate_sdl_sources) -ifeq ($(CAIRO_HAS_SDL_SURFACE),1) -enabled_cairo_boilerplate_headers += $(cairo_boilerplate_sdl_headers) -enabled_cairo_boilerplate_private += $(cairo_boilerplate_sdl_private) -enabled_cairo_boilerplate_sources += $(cairo_boilerplate_sdl_sources) -endif - supported_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers) all_cairo_boilerplate_headers += $(cairo_boilerplate_png_headers) all_cairo_boilerplate_private += $(cairo_boilerplate_png_private) diff --git a/boilerplate/cairo-boilerplate-sdl-private.h b/boilerplate/cairo-boilerplate-sdl-private.h deleted file mode 100644 index 9b5bdf79..00000000 --- a/boilerplate/cairo-boilerplate-sdl-private.h +++ /dev/null @@ -1,56 +0,0 @@ -/* Cairo - a vector graphics library with display and print output - * - * Copyright © 2008 Chris Wilson - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - * The Original Code is the cairo graphics library. - * - * The Initial Developer of the Original Code is Chris Wilson. - */ - -#ifndef CAIRO_BOILERPLATE_SDL_PRIVATE_H -#define CAIRO_BOILERPLATE_SDL_PRIVATE_H - -#include <cairo.h> - -CAIRO_BEGIN_DECLS - -extern cairo_surface_t * -_cairo_boilerplate_sdl_create_surface (const char *name, - cairo_content_t content, - int width, - int height, - int max_width, - int max_height, - cairo_boilerplate_mode_t mode, - int id, - void **closure); - -extern void -_cairo_boilerplate_sdl_cleanup (void* closure); - -CAIRO_END_DECLS - -#endif /* CAIRO_BOILERPLATE_SDL_PRIVATE_H */ diff --git a/boilerplate/cairo-boilerplate-sdl.c b/boilerplate/cairo-boilerplate-sdl.c deleted file mode 100644 index 407c2ee4..00000000 --- a/boilerplate/cairo-boilerplate-sdl.c +++ /dev/null @@ -1,69 +0,0 @@ -/* Cairo - a vector graphics library with display and print output - * - * Copyright © 2008 Chris Wilson - * - * This library is free software; you can redistribute it and/or - * modify it either under the terms of the GNU Lesser General Public - * License version 2.1 as published by the Free Software Foundation - * (the "LGPL") or, at your option, under the terms of the Mozilla - * Public License Version 1.1 (the "MPL"). If you do not alter this - * notice, a recipient may use your version of this file under either - * the MPL or the LGPL. - * - * You should have received a copy of the LGPL along with this library - * in the file COPYING-LGPL-2.1; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * You should have received a copy of the MPL along with this library - * in the file COPYING-MPL-1.1 - * - * The contents of this file are subject to the Mozilla Public License - * Version 1.1 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ - * - * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY - * OF ANY KIND, either express or implied. See the LGPL or the MPL for - * the specific language governing rights and limitations. - * - * The Original Code is the cairo graphics library. - * - * The Initial Developer of the Original Code is Chris Wilson. - */ - -#include "cairo-boilerplate.h" -#include "cairo-boilerplate-sdl-private.h" - -#include <cairo-sdl.h> - -void -_cairo_boilerplate_sdl_cleanup (void *closure) -{ - SDL_Quit (); -} - -cairo_surface_t * -_cairo_boilerplate_sdl_create_surface (const char *name, - cairo_content_t content, - int width, - int height, - int max_width, - int max_height, - cairo_boilerplate_mode_t mode, - int id, - void **closure) -{ - SDL_Surface *screen; - cairo_surface_t *surface; - - if (SDL_Init (SDL_INIT_VIDEO) < 0) - return NULL; - - screen = SDL_SetVideoMode (width, height, 24, SDL_SWSURFACE); - if (screen == NULL) - return NULL; - - surface = cairo_sdl_surface_create (screen); - SDL_FreeSurface (screen); - - return surface; -} diff --git a/boilerplate/cairo-boilerplate.c b/boilerplate/cairo-boilerplate.c index dd34110c..b6c2c80b 100644 --- a/boilerplate/cairo-boilerplate.c +++ b/boilerplate/cairo-boilerplate.c @@ -50,9 +50,6 @@ #if CAIRO_HAS_SCRIPT_SURFACE #include "cairo-boilerplate-script-private.h" #endif -#if CAIRO_HAS_SDL_SURFACE -#include "cairo-boilerplate-sdl-private.h" -#endif #if CAIRO_HAS_SVG_SURFACE #include "cairo-boilerplate-svg-private.h" #endif @@ -723,18 +720,6 @@ static cairo_boilerplate_target_t targets[] = _cairo_boilerplate_directfb_cleanup }, #endif - -#if CAIRO_HAS_SDL_SURFACE - { - "sdl", "sdl", NULL, - CAIRO_SURFACE_TYPE_SDL, CAIRO_CONTENT_COLOR, 0, - _cairo_boilerplate_sdl_create_surface, NULL, - NULL, - _cairo_boilerplate_get_image_surface, - cairo_surface_write_to_png, - _cairo_boilerplate_sdl_cleanup - }, -#endif }; cairo_boilerplate_target_t ** |