gosu 0.7.32 → 0.7.33

data/Gosu/Version.hpp

@@ -3,8 +3,8 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 32
-#define GOSU_VERSION "0.7.32"
+#define GOSU_POINT_VERSION 33
+#define GOSU_VERSION "0.7.33"
 
 #define GOSU_COPYRIGHT_NOTICE \
   "May contain `ogg', `vorbis' libraries (c) 2002-2008 Xiph.org Foundation" \

data/GosuImpl/Graphics/BitmapGDIplus.cpp

@@ -165,6 +165,8 @@ Gosu::Bitmap Gosu::loadImageFile(Reader reader)
 
 void Gosu::saveImageFile(const Bitmap& bitmap, const std::wstring& filename)
 {
+    requireGDIplus();
+
     Bitmap input = bitmap;
     if (boost::iends_with(filename, "bmp"))
         unapplyColorKey(input, Color::FUCHSIA);
@@ -179,6 +181,8 @@ void Gosu::saveImageFile(const Bitmap& bitmap, const std::wstring& filename)
 
 void Gosu::saveImageFile(const Bitmap& bitmap, Writer writer, const std::wstring& formatHint)
 {
+    requireGDIplus();
+
     Bitmap input = bitmap;
     if (boost::iends_with(formatHint, "bmp"))
         unapplyColorKey(input, Color::FUCHSIA);

data/GosuImpl/RubyGosu.swg

@@ -83,7 +83,9 @@
 %typemap(in) Gosu::AlphaMode {
     const char* cstr = Gosu::cstrFromSymbol($input);
     
-    if (!strcmp(cstr, "default"))
+    if (!cstr)
+        SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+    else if (!strcmp(cstr, "default"))
         $1 = Gosu::amDefault;
     else if (!strcmp(cstr, "additive"))
         $1 = Gosu::amAdditive;
@@ -95,7 +97,9 @@
 %typemap(in) Gosu::TextAlign {
     const char* cstr = Gosu::cstrFromSymbol($input);
 
-    if (!strcmp(cstr, "left"))
+    if (!cstr)
+        SWIG_exception_fail(SWIG_ValueError, "text align must be a symbol");
+    else if (!strcmp(cstr, "left"))
         $1 = Gosu::taLeft;
     else if (!strcmp(cstr, "center"))
         $1 = Gosu::taCenter;
@@ -109,15 +113,19 @@
 
 // Allow integral constants to be passed in place of Color values.
 %typemap(in) Gosu::Color {    
-    void* ptr;
-    int res = SWIG_ConvertPtr($input, &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-        // TODO: error checking
+    if (TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM)
         $1 = Gosu::Color(NUM2UINT($input));
-    else if (!ptr)
-        SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-        $1 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+        void* ptr;
+        int res = SWIG_ConvertPtr($input, &ptr, SWIGTYPE_p_Gosu__Color, 0);
+        if (!SWIG_IsOK(res))
+            SWIG_exception_fail(SWIG_ValueError, "invalid value");
+        else if (!ptr)
+            SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+        else
+            $1 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
 }
 
 // Allow integral constants to be passed in place of Color values.
@@ -291,7 +299,9 @@ namespace Gosu
     }
     
     const char* cstrFromSymbol(VALUE symbol) {
-      return rb_id2name(SYM2ID(symbol));
+        if (TYPE(symbol) != T_SYMBOL)
+            return 0; // to be caught by the caller
+        return rb_id2name(SYM2ID(symbol));
     }
 }
 %}

data/GosuImpl/RubyGosu_wrap.cxx

@@ -2359,7 +2359,9 @@ namespace Gosu
     }
     
     const char* cstrFromSymbol(VALUE symbol) {
-      return rb_id2name(SYM2ID(symbol));
+        if (TYPE(symbol) != T_SYMBOL)
+            return 0; // to be caught by the caller
+        return rb_id2name(SYM2ID(symbol));
     }
 }
 
@@ -5152,26 +5154,34 @@ _wrap_interpolate(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[0]) == T_FIXNUM || TYPE(argv[0]) == T_BIGNUM)
     arg1 = Gosu::Color(NUM2UINT(argv[0]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg1 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg1 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[1]) == T_FIXNUM || TYPE(argv[1]) == T_BIGNUM)
     arg2 = Gosu::Color(NUM2UINT(argv[1]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg2 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg2 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   if (argc > 2) {
     ecode3 = SWIG_AsVal_double(argv[2], &val3);
@@ -5205,26 +5215,34 @@ _wrap_multiply(int argc, VALUE *argv, VALUE self) {
     rb_raise(rb_eArgError, "wrong # of arguments(%d for 2)",argc); SWIG_fail;
   }
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[0]) == T_FIXNUM || TYPE(argv[0]) == T_BIGNUM)
     arg1 = Gosu::Color(NUM2UINT(argv[0]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg1 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg1 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[1]) == T_FIXNUM || TYPE(argv[1]) == T_BIGNUM)
     arg2 = Gosu::Color(NUM2UINT(argv[1]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg2 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[1], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg2 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   {
     try {
@@ -5550,22 +5568,28 @@ _wrap_Font_draw(int argc, VALUE *argv, VALUE self) {
   }
   if (argc > 6) {
     {
-      void* ptr;
-      int res = SWIG_ConvertPtr(argv[6], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-      if (!SWIG_IsOK(res))
-      // TODO: error checking
+      if (TYPE(argv[6]) == T_FIXNUM || TYPE(argv[6]) == T_BIGNUM)
       arg8 = Gosu::Color(NUM2UINT(argv[6]));
-      else if (!ptr)
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
       else
-      arg8 = *reinterpret_cast<Gosu::Color*>(ptr);
+      {
+        void* ptr;
+        int res = SWIG_ConvertPtr(argv[6], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+        if (!SWIG_IsOK(res))
+        SWIG_exception_fail(SWIG_ValueError, "invalid value");
+        else if (!ptr)
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+        else
+        arg8 = *reinterpret_cast<Gosu::Color*>(ptr);
+      }
     }
   }
   if (argc > 7) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[7]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg9 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg9 = Gosu::amAdditive;
@@ -5673,22 +5697,28 @@ _wrap_Font_draw_rel(int argc, VALUE *argv, VALUE self) {
   }
   if (argc > 8) {
     {
-      void* ptr;
-      int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-      if (!SWIG_IsOK(res))
-      // TODO: error checking
+      if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
       arg10 = Gosu::Color(NUM2UINT(argv[8]));
-      else if (!ptr)
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
       else
-      arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+      {
+        void* ptr;
+        int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+        if (!SWIG_IsOK(res))
+        SWIG_exception_fail(SWIG_ValueError, "invalid value");
+        else if (!ptr)
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+        else
+        arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+      }
     }
   }
   if (argc > 9) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[9]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg11 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg11 = Gosu::amAdditive;
@@ -5788,22 +5818,28 @@ _wrap_Font_draw_rot(int argc, VALUE *argv, VALUE self) {
   }
   if (argc > 7) {
     {
-      void* ptr;
-      int res = SWIG_ConvertPtr(argv[7], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-      if (!SWIG_IsOK(res))
-      // TODO: error checking
+      if (TYPE(argv[7]) == T_FIXNUM || TYPE(argv[7]) == T_BIGNUM)
       arg9 = Gosu::Color(NUM2UINT(argv[7]));
-      else if (!ptr)
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
       else
-      arg9 = *reinterpret_cast<Gosu::Color*>(ptr);
+      {
+        void* ptr;
+        int res = SWIG_ConvertPtr(argv[7], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+        if (!SWIG_IsOK(res))
+        SWIG_exception_fail(SWIG_ValueError, "invalid value");
+        else if (!ptr)
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+        else
+        arg9 = *reinterpret_cast<Gosu::Color*>(ptr);
+      }
     }
   }
   if (argc > 8) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[8]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg10 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg10 = Gosu::amAdditive;
@@ -6335,22 +6371,28 @@ _wrap_Image_draw(int argc, VALUE *argv, VALUE self) {
   }
   if (argc > 5) {
     {
-      void* ptr;
-      int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-      if (!SWIG_IsOK(res))
-      // TODO: error checking
+      if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
       arg7 = Gosu::Color(NUM2UINT(argv[5]));
-      else if (!ptr)
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
       else
-      arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+      {
+        void* ptr;
+        int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+        if (!SWIG_IsOK(res))
+        SWIG_exception_fail(SWIG_ValueError, "invalid value");
+        else if (!ptr)
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+        else
+        arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+      }
     }
   }
   if (argc > 6) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[6]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg8 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg8 = Gosu::amAdditive;
@@ -6433,54 +6475,72 @@ _wrap_Image_draw_mod(int argc, VALUE *argv, VALUE self) {
   } 
   arg6 = static_cast< double >(val6);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
     arg7 = Gosu::Color(NUM2UINT(argv[5]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[6], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[6]) == T_FIXNUM || TYPE(argv[6]) == T_BIGNUM)
     arg8 = Gosu::Color(NUM2UINT(argv[6]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg8 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[6], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg8 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[7], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[7]) == T_FIXNUM || TYPE(argv[7]) == T_BIGNUM)
     arg9 = Gosu::Color(NUM2UINT(argv[7]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg9 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[7], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg9 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
     arg10 = Gosu::Color(NUM2UINT(argv[8]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   if (argc > 9) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[9]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg11 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg11 = Gosu::amAdditive;
@@ -6593,22 +6653,28 @@ _wrap_Image_draw_rot(int argc, VALUE *argv, VALUE self) {
   }
   if (argc > 8) {
     {
-      void* ptr;
-      int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-      if (!SWIG_IsOK(res))
-      // TODO: error checking
+      if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
       arg10 = Gosu::Color(NUM2UINT(argv[8]));
-      else if (!ptr)
-      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
       else
-      arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+      {
+        void* ptr;
+        int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+        if (!SWIG_IsOK(res))
+        SWIG_exception_fail(SWIG_ValueError, "invalid value");
+        else if (!ptr)
+        SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+        else
+        arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+      }
     }
   }
   if (argc > 9) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[9]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg11 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg11 = Gosu::amAdditive;
@@ -6940,15 +7006,19 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   } 
   arg3 = static_cast< double >(val3);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM)
     arg4 = Gosu::Color(NUM2UINT(argv[2]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg4 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg4 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode5 = SWIG_AsVal_double(argv[3], &val5);
   if (!SWIG_IsOK(ecode5)) {
@@ -6961,15 +7031,19 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   } 
   arg6 = static_cast< double >(val6);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
     arg7 = Gosu::Color(NUM2UINT(argv[5]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode8 = SWIG_AsVal_double(argv[6], &val8);
   if (!SWIG_IsOK(ecode8)) {
@@ -6982,15 +7056,19 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   } 
   arg9 = static_cast< double >(val9);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
     arg10 = Gosu::Color(NUM2UINT(argv[8]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode11 = SWIG_AsVal_double(argv[9], &val11);
   if (!SWIG_IsOK(ecode11)) {
@@ -7003,15 +7081,19 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
   } 
   arg12 = static_cast< double >(val12);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[11], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[11]) == T_FIXNUM || TYPE(argv[11]) == T_BIGNUM)
     arg13 = Gosu::Color(NUM2UINT(argv[11]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg13 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[11], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg13 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode14 = SWIG_AsVal_double(argv[12], &val14);
   if (!SWIG_IsOK(ecode14)) {
@@ -7022,7 +7104,9 @@ _wrap_Image_draw_as_quad(int argc, VALUE *argv, VALUE self) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[13]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg15 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg15 = Gosu::amAdditive;
@@ -7191,7 +7275,9 @@ _wrap_Image_from_text7(int argc, VALUE *argv, VALUE self) {
   {
     const char* cstr = Gosu::cstrFromSymbol(argv[6]);
     
-    if (!strcmp(cstr, "left"))
+    if (!cstr)
+    SWIG_exception_fail(SWIG_ValueError, "text align must be a symbol");
+    else if (!strcmp(cstr, "left"))
     arg7 = Gosu::taLeft;
     else if (!strcmp(cstr, "center"))
     arg7 = Gosu::taCenter;
@@ -9246,15 +9332,19 @@ _wrap_Window_draw_line(int argc, VALUE *argv, VALUE self) {
   } 
   arg3 = static_cast< double >(val3);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM)
     arg4 = Gosu::Color(NUM2UINT(argv[2]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg4 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg4 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode5 = SWIG_AsVal_double(argv[3], &val5);
   if (!SWIG_IsOK(ecode5)) {
@@ -9267,15 +9357,19 @@ _wrap_Window_draw_line(int argc, VALUE *argv, VALUE self) {
   } 
   arg6 = static_cast< double >(val6);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
     arg7 = Gosu::Color(NUM2UINT(argv[5]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   if (argc > 6) {
     ecode8 = SWIG_AsVal_double(argv[6], &val8);
@@ -9288,7 +9382,9 @@ _wrap_Window_draw_line(int argc, VALUE *argv, VALUE self) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[7]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg9 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg9 = Gosu::amAdditive;
@@ -9361,15 +9457,19 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
   } 
   arg3 = static_cast< double >(val3);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM)
     arg4 = Gosu::Color(NUM2UINT(argv[2]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg4 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg4 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode5 = SWIG_AsVal_double(argv[3], &val5);
   if (!SWIG_IsOK(ecode5)) {
@@ -9382,15 +9482,19 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
   } 
   arg6 = static_cast< double >(val6);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
     arg7 = Gosu::Color(NUM2UINT(argv[5]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode8 = SWIG_AsVal_double(argv[6], &val8);
   if (!SWIG_IsOK(ecode8)) {
@@ -9403,15 +9507,19 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
   } 
   arg9 = static_cast< double >(val9);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
     arg10 = Gosu::Color(NUM2UINT(argv[8]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   if (argc > 9) {
     ecode11 = SWIG_AsVal_double(argv[9], &val11);
@@ -9424,7 +9532,9 @@ _wrap_Window_draw_triangle(int argc, VALUE *argv, VALUE self) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[10]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg12 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg12 = Gosu::amAdditive;
@@ -9504,15 +9614,19 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
   } 
   arg3 = static_cast< double >(val3);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[2]) == T_FIXNUM || TYPE(argv[2]) == T_BIGNUM)
     arg4 = Gosu::Color(NUM2UINT(argv[2]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg4 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[2], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg4 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode5 = SWIG_AsVal_double(argv[3], &val5);
   if (!SWIG_IsOK(ecode5)) {
@@ -9525,15 +9639,19 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
   } 
   arg6 = static_cast< double >(val6);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[5]) == T_FIXNUM || TYPE(argv[5]) == T_BIGNUM)
     arg7 = Gosu::Color(NUM2UINT(argv[5]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[5], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg7 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode8 = SWIG_AsVal_double(argv[6], &val8);
   if (!SWIG_IsOK(ecode8)) {
@@ -9546,15 +9664,19 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
   } 
   arg9 = static_cast< double >(val9);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[8]) == T_FIXNUM || TYPE(argv[8]) == T_BIGNUM)
     arg10 = Gosu::Color(NUM2UINT(argv[8]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[8], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg10 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   ecode11 = SWIG_AsVal_double(argv[9], &val11);
   if (!SWIG_IsOK(ecode11)) {
@@ -9567,15 +9689,19 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
   } 
   arg12 = static_cast< double >(val12);
   {
-    void* ptr;
-    int res = SWIG_ConvertPtr(argv[11], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-    if (!SWIG_IsOK(res))
-    // TODO: error checking
+    if (TYPE(argv[11]) == T_FIXNUM || TYPE(argv[11]) == T_BIGNUM)
     arg13 = Gosu::Color(NUM2UINT(argv[11]));
-    else if (!ptr)
-    SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
     else
-    arg13 = *reinterpret_cast<Gosu::Color*>(ptr);
+    {
+      void* ptr;
+      int res = SWIG_ConvertPtr(argv[11], &ptr, SWIGTYPE_p_Gosu__Color, 0);
+      if (!SWIG_IsOK(res))
+      SWIG_exception_fail(SWIG_ValueError, "invalid value");
+      else if (!ptr)
+      SWIG_exception_fail(SWIG_ValueError, "invalid null reference of type Gosu::Color");
+      else
+      arg13 = *reinterpret_cast<Gosu::Color*>(ptr);
+    }
   }
   if (argc > 12) {
     ecode14 = SWIG_AsVal_double(argv[12], &val14);
@@ -9588,7 +9714,9 @@ _wrap_Window_draw_quad(int argc, VALUE *argv, VALUE self) {
     {
       const char* cstr = Gosu::cstrFromSymbol(argv[13]);
       
-      if (!strcmp(cstr, "default"))
+      if (!cstr)
+      SWIG_exception_fail(SWIG_ValueError, "alpha mode must be a symbol");
+      else if (!strcmp(cstr, "default"))
       arg15 = Gosu::amDefault;
       else if (!strcmp(cstr, "additive"))
       arg15 = Gosu::amAdditive;
@@ -11120,8 +11248,8 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_RubyInitializeTrackings();
   rb_define_const(mGosu, "MAJOR_VERSION", SWIG_From_int(static_cast< int >(0)));
   rb_define_const(mGosu, "MINOR_VERSION", SWIG_From_int(static_cast< int >(7)));
-  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(32)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.32"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(33)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.33"));
   rb_define_const(mGosu, "GOSU_COPYRIGHT_NOTICE", SWIG_FromCharPtr("May contain `ogg\', `vorbis\' libraries (c) 2002-2008 Xiph.org Foundation\n\nRedistribution and use in source and binary forms, with or withoutmodification, are permitted provided that the following conditionsare met:\n\n- Redistributions of source code must retain the above copyrightnotice, this list of conditions and the following disclaimer.\n\n- Redistributions in binary form must reproduce the above copyrightnotice, this list of conditions and the following disclaimer in thedocumentation and/or other materials provided with the distribution.\n\n- Neither the name of the Xiph.org Foundation nor the names of itscontributors may be used to endorse or promote products derived fromthis software without specific prior written permission.\n\nTHIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS``AS IS\'\' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOTLIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FORA PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATIONOR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOTLIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANYTHEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USEOF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);

data/lib/gosu/swig_patches.rb

@@ -11,7 +11,8 @@ class Gosu::Window
     define_method "protected_#{callback}" do |*args|
       begin
         # Turn into a boolean result for needs_cursor? etc while we are at it.
-        !!send(callback, *args) unless @_exception
+        # If there has been an exception, don't do anything as to not make matters worse.
+        defined?(@_exception) ? false : !!send(callback, *args)
       rescue Exception => e
         # Exit the message loop naturally, then re-throw
         @_exception = e
@@ -25,7 +26,7 @@ class Gosu::Window
     show_internal
     # Try to format the message nicely, without any useless patching that we are
     # doing here.
-    if @_exception then
+    if defined? @_exception then
       if @_exception.backtrace.is_a? Array and not @_exception.backtrace.frozen? then
         @_exception.backtrace.reject! { |line| line.include? 'lib/gosu/swig_patches.rb' }
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 67
+  hash: 65
   prerelease: 
   segments: 
   - 0
   - 7
-  - 32
-  version: 0.7.32
+  - 33
+  version: 0.7.33
 platform: ruby
 authors: 
 - Julian Raschke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-05 00:00:00 Z
+date: 2011-06-13 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and Ruby-OpenGL.\n"