From d60ad99da196c08083cc8107d46fa62fc258c2d2 Mon Sep 17 00:00:00 2001 From: Bart van Strien Date: Sat, 23 Apr 2011 19:16:17 +0200 Subject: [PATCH] Prevent old DevIL errors from causing love errors --- src/modules/image/devil/ImageData.cpp | 65 +++++++++++++-------------- 1 file changed, 32 insertions(+), 33 deletions(-) diff --git a/src/modules/image/devil/ImageData.cpp b/src/modules/image/devil/ImageData.cpp index b5bb8183f..ba054732e 100644 --- a/src/modules/image/devil/ImageData.cpp +++ b/src/modules/image/devil/ImageData.cpp @@ -90,24 +90,24 @@ namespace devil bool success = (ilTexImage(width, height, 1, bpp, IL_RGBA, IL_UNSIGNED_BYTE, 0) == IL_TRUE); int err = ilGetError(); - if (err != IL_NO_ERROR){ - switch (err) { - case IL_ILLEGAL_OPERATION: - throw love::Exception("Error: Illegal operation"); - break; - case IL_INVALID_PARAM: - throw love::Exception("Error: invalid parameters"); - break; - case IL_OUT_OF_MEMORY: - throw love::Exception("Error: out of memory"); - break; - default: - throw love::Exception("Error: unknown error"); - break; - } - } if(!success) { + if (err != IL_NO_ERROR){ + switch (err) { + case IL_ILLEGAL_OPERATION: + throw love::Exception("Error: Illegal operation"); + break; + case IL_INVALID_PARAM: + throw love::Exception("Error: invalid parameters"); + break; + case IL_OUT_OF_MEMORY: + throw love::Exception("Error: out of memory"); + break; + default: + throw love::Exception("Error: unknown error"); + break; + } + } throw love::Exception("Could not decode image data."); } @@ -124,25 +124,24 @@ namespace devil ilBindImage(image); // Try to load the data. bool success = (ilTexImage(width, height, 1, bpp, IL_RGBA, IL_UNSIGNED_BYTE, data) == IL_TRUE); - int err = ilGetError(); - if (err != IL_NO_ERROR){ - switch (err) { - case IL_ILLEGAL_OPERATION: - throw love::Exception("Error: Illegal operation"); - break; - case IL_INVALID_PARAM: - throw love::Exception("Error: invalid parameters"); - break; - case IL_OUT_OF_MEMORY: - throw love::Exception("Error: out of memory"); - break; - default: - throw love::Exception("Error: unknown error"); - break; - } - } if(!success) { + if (err != IL_NO_ERROR){ + switch (err) { + case IL_ILLEGAL_OPERATION: + throw love::Exception("Error: Illegal operation"); + break; + case IL_INVALID_PARAM: + throw love::Exception("Error: invalid parameters"); + break; + case IL_OUT_OF_MEMORY: + throw love::Exception("Error: out of memory"); + break; + default: + throw love::Exception("Error: unknown error"); + break; + } + } throw love::Exception("Could not decode image data."); } }