From 7d395c042a6e124ec2fee2f982b28128b85cea04 Mon Sep 17 00:00:00 2001 From: Bob Pendleton Date: Tue, 10 Jul 2007 14:44:20 +0000 Subject: [PATCH] Added stubs for x11 gamma functions and enabled them in SDL_x11video.c --HG-- extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402463 --- src/video/x11/SDL_x11gamma.c | 37 ++++++++++++++++++++++++++++++++++++ src/video/x11/SDL_x11gamma.h | 30 +++++++++++++++++++++++++++++ src/video/x11/SDL_x11video.c | 4 ++-- 3 files changed, 69 insertions(+), 2 deletions(-) create mode 100644 src/video/x11/SDL_x11gamma.c create mode 100644 src/video/x11/SDL_x11gamma.h diff --git a/src/video/x11/SDL_x11gamma.c b/src/video/x11/SDL_x11gamma.c new file mode 100644 index 000000000..b1825422a --- /dev/null +++ b/src/video/x11/SDL_x11gamma.c @@ -0,0 +1,37 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" +#include "../SDL_sysvideo.h" +#include "SDL_x11video.h" + + +int +X11_SetDisplayGammaRamp(_THIS, Uint16 * ramp) +{ + return (-1); +} + +int +X11_GetDisplayGammaRamp(_THIS, Uint16 * ramp) +{ + return -1; +} diff --git a/src/video/x11/SDL_x11gamma.h b/src/video/x11/SDL_x11gamma.h new file mode 100644 index 000000000..5630fa37f --- /dev/null +++ b/src/video/x11/SDL_x11gamma.h @@ -0,0 +1,30 @@ +/* + SDL - Simple DirectMedia Layer + Copyright (C) 1997-2006 Sam Lantinga + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + + Sam Lantinga + slouken@libsdl.org +*/ +#include "SDL_config.h" + +#ifndef _SDL_x11gamma_h +#define _SDL_x11gamma_h + +extern int X11_SetDisplayGammaRamp(_THIS, Uint16 * ramp); +extern int X11_GetDisplayGammaRamp(_THIS, Uint16 * ramp); + +#endif diff --git a/src/video/x11/SDL_x11video.c b/src/video/x11/SDL_x11video.c index 9d85cc079..8d7e13f80 100644 --- a/src/video/x11/SDL_x11video.c +++ b/src/video/x11/SDL_x11video.c @@ -168,8 +168,8 @@ X11_CreateDevice(int devindex) device->VideoQuit = X11_VideoQuit; device->GetDisplayModes = X11_GetDisplayModes; device->SetDisplayMode = X11_SetDisplayMode; -// device->SetDisplayGammaRamp = X11_SetDisplayGammaRamp; -// device->GetDisplayGammaRamp = X11_GetDisplayGammaRamp; + device->SetDisplayGammaRamp = X11_SetDisplayGammaRamp; + device->GetDisplayGammaRamp = X11_GetDisplayGammaRamp; device->PumpEvents = X11_PumpEvents; device->CreateWindow = X11_CreateWindow;