Mercurial > sdl-ios-xcode

diff src/video/SDL_gamma.c @ 1672:8e754b82cecc SDL-1.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Updated SDL_Surface code for software-only access, fixed some build errors
author Sam Lantinga <slouken@libsdl.org>
date Fri, 09 Jun 2006 07:06:12 +0000
parents 4da1ee79c9af
children 7179cb72dbba
line wrap: on
line diff
--- a/src/video/SDL_gamma.c	Fri Jun 09 06:42:42 2006 +0000
+++ b/src/video/SDL_gamma.c	Fri Jun 09 07:06:12 2006 +0000
@@ -109,7 +109,7 @@
         CalculateGammaRamp(blue, ramp[2]);
         succeeded = SDL_SetGammaRamp(ramp[0], ramp[1], ramp[2]);
     }
-    if ((succeeded < 0) && _this->SetGamma) {
+    if ((succeeded < 0) && _this && _this->SetGamma) {
         SDL_ClearError();
         succeeded = _this->SetGamma(_this, red, green, blue);
     }
@@ -137,7 +137,7 @@
             CalculateGammaFromRamp(blue, ramp[2]);
         }
     }
-    if ((succeeded < 0) && _this->GetGamma) {
+    if ((succeeded < 0) && _this && _this->GetGamma) {
         SDL_ClearError();
         succeeded = _this->GetGamma(_this, red, green, blue);
     }
@@ -150,13 +150,6 @@
 {
     SDL_VideoDevice *_this = SDL_GetVideoDevice();
     int succeeded;
-    SDL_Surface *screen = SDL_PublicSurface;
-
-    /* Verify the screen parameter */
-    if (!screen) {
-        SDL_SetError("No video mode has been set");
-        return -1;
-    }
 
     /* Lazily allocate the gamma tables */
     if (!SDL_CurrentWindow.gamma) {
@@ -179,7 +172,7 @@
 
     /* Try to set the gamma ramp in the driver */
     succeeded = -1;
-    if (_this->SetGammaRamp) {
+    if (_this && _this->SetGammaRamp) {
         succeeded = _this->SetGammaRamp(_this, SDL_CurrentWindow.gamma);
     } else {
         SDL_SetError("Gamma ramp manipulation not supported");
@@ -200,7 +193,7 @@
             SDL_OutOfMemory();
             return -1;
         }
-        if (_this->GetGammaRamp) {
+        if (_this && _this->GetGammaRamp) {
             /* Get the real hardware gamma */
             _this->GetGammaRamp(_this, SDL_CurrentWindow.gamma);
         } else {