update

[l4.git] / l4 / pkg / libsdl-image / contrib / IMG.c

diff --git a/l4/pkg/libsdl-image/contrib/IMG.c b/l4/pkg/libsdl-image/contrib/IMG.c
index e7a96cfd4e7404a485e4fa121d14247a18be4b5b..bde1eb8c1ed53e33ef7c95aac74f87bbb7cb1fe0 100644 (file)
--- a/l4/pkg/libsdl-image/contrib/IMG.c
+++ b/l4/pkg/libsdl-image/contrib/IMG.c
@@ -61,46 +61,40 @@ const SDL_version *IMG_Linked_Version(void)
 }
 
 extern int IMG_InitJPG();
-extern int IMG_QuitJPG();
+extern void IMG_QuitJPG();
 extern int IMG_InitPNG();
-extern int IMG_QuitPNG();
+extern void IMG_QuitPNG();
 extern int IMG_InitTIF();
-extern int IMG_QuitTIF();
+extern void IMG_QuitTIF();
 
 static int initialized = 0;
 
 int IMG_Init(int flags)
 {
-#if defined(__APPLE__) && !defined(SDL_IMAGE_USE_COMMON_BACKEND)
-       initialized = IMG_INIT_JPG | IMG_INIT_PNG | IMG_INIT_TIF;
-       return initialized;
-#else
        int result = 0;
 
-       if ((flags & IMG_INIT_JPG) && !(initialized & IMG_INIT_JPG)) {
-               if (IMG_InitJPG() == 0) {
+       if (flags & IMG_INIT_JPG) {
+               if ((initialized & IMG_INIT_JPG) || IMG_InitJPG() == 0) {
                        result |= IMG_INIT_JPG;
                }
        }
-       if ((flags & IMG_INIT_PNG) && !(initialized & IMG_INIT_PNG)) {
-               if (IMG_InitPNG() == 0) {
+       if (flags & IMG_INIT_PNG) {
+               if ((initialized & IMG_INIT_PNG) || IMG_InitPNG() == 0) {
                        result |= IMG_INIT_PNG;
                }
        }
-       if ((flags & IMG_INIT_TIF) && !(initialized & IMG_INIT_TIF)) {
-               if (IMG_InitTIF() == 0) {
+       if (flags & IMG_INIT_TIF) {
+               if ((initialized & IMG_INIT_TIF) || IMG_InitTIF() == 0) {
                        result |= IMG_INIT_TIF;
                }
        }
        initialized |= result;
 
-       return (result);
-#endif
+       return (initialized);
 }
 
 void IMG_Quit()
 {
-#if !defined(__APPLE__) || defined(SDL_IMAGE_USE_COMMON_BACKEND)
        if (initialized & IMG_INIT_JPG) {
                IMG_QuitJPG();
        }
@@ -110,7 +104,6 @@ void IMG_Quit()
        if (initialized & IMG_INIT_TIF) {
                IMG_QuitTIF();
        }
-#endif
        initialized = 0;
 }
 
@@ -163,7 +156,7 @@ SDL_Surface *IMG_LoadTyped_RW(SDL_RWops *src, int freesrc, char *type)
        }
 
        /* See whether or not this data source can handle seeking */
-       if ( SDL_RWseek(src, 0, SEEK_CUR) < 0 ) {
+       if ( SDL_RWseek(src, 0, RW_SEEK_CUR) < 0 ) {
                IMG_SetError("Can't seek in this data source");
                if(freesrc)
                        SDL_RWclose(src);