gosu 0.7.24 → 0.7.25

data/GosuImpl/RubyGosu_wrap.cxx

@@ -1,6 +1,6 @@
 /* ----------------------------------------------------------------------------
  * This file was automatically generated by SWIG (http://www.swig.org).
- * Version 1.3.39
+ * Version 2.0.1
  * 
  * This file is not intended to be easily readable and contains a number of 
  * coding conventions designed to improve portability and efficiency. Do not make
@@ -310,7 +310,7 @@ template <typename T> T SwigValueInit() {
 /* 
    Flags/methods for returning states.
    
-   The SWIG conversion methods, as ConvertPtr, return and integer 
+   The SWIG conversion methods, as ConvertPtr, return an integer 
    that tells if the conversion was successful or not. And if not,
    an error code can be returned (see swigerrors.swg for the codes).
    
@@ -861,6 +861,15 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #include <ruby.h>
 #include <map>
 
+/* Ruby 1.9.1 has a "memoisation optimisation" when compiling with GCC which
+ * breaks using rb_intern as an lvalue, as SWIG does.  We work around this
+ * issue for now by disabling this.
+ * https://sourceforge.net/tracker/?func=detail&aid=2859614&group_id=1645&atid=101645
+ */
+#ifdef rb_intern
+# undef rb_intern
+#endif
+
 /* Remove global macros defined in Ruby's win32.h */
 #ifdef write
 # undef write
@@ -871,6 +880,12 @@ SWIG_UnpackDataName(const char *c, void *ptr, size_t sz, const char *name) {
 #ifdef bind
 # undef bind
 #endif
+#ifdef close
+# undef close
+#endif
+#ifdef connect
+# undef connect
+#endif
 
 
 /* Ruby 1.7 defines NUM2LL(), LL2NUM() and ULL2NUM() macros */
@@ -1013,7 +1028,7 @@ static VALUE _mSWIG = Qnil;
 
 /* Define custom exceptions for errors that do not map to existing Ruby
    exceptions.  Note this only works for C++ since a global cannot be
-   initialized by a funtion in C.  For C, fallback to rb_eRuntimeError.*/
+   initialized by a function in C.  For C, fallback to rb_eRuntimeError.*/
 
 SWIGINTERN VALUE 
 getNullReferenceError(void) {
@@ -1158,9 +1173,6 @@ void Ruby_Format_OverloadedError(
 }
 
 /* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
  * rubytracking.swg
  *
  * This file contains support for tracking mappings from 
@@ -1312,9 +1324,6 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 
 
 /* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
  * rubyrun.swg
  *
  * This file contains the runtime support for Ruby modules
@@ -1358,7 +1367,7 @@ SWIG_Ruby_AppendOutput(VALUE target, VALUE o) {
 /* Error manipulation */
 
 #define SWIG_ErrorType(code)                            SWIG_Ruby_ErrorType(code)               
-#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), msg)
+#define SWIG_Error(code, msg)            		rb_raise(SWIG_Ruby_ErrorType(code), "%s", msg)
 #define SWIG_fail                        		goto fail				 
 
 
@@ -1413,7 +1422,7 @@ static ID swig_call_id  = 0;
       ++swig_virtual_calls;
 #  define SWIG_RELEASE_STACK --swig_virtual_calls;
 #  define Ruby_DirectorTypeMismatchException(x) \
-          rb_raise( rb_eTypeError, x ); return c_result;
+          rb_raise( rb_eTypeError, "%s", x ); return c_result;
 
       static unsigned int swig_virtual_calls = 0;
 
@@ -1767,9 +1776,6 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
   #define SWIG_exception(code, msg) do { SWIG_Error(code, msg);; } while(0) 
 
 /* -----------------------------------------------------------------------------
- * See the LICENSE file for information on copyright, usage and redistribution
- * of SWIG, and the README file for authors - http://www.swig.org/release.html.
- *
  * director.swg
  *
  * This file contains support for director classes that proxy
@@ -1792,6 +1798,8 @@ int SWIG_Ruby_arity( VALUE proc, int minimal )
 #include <iostream>
 #include <map>
 
+# define SWIG_DIRECTOR_CAST(ARG) dynamic_cast<Swig::Director *>(ARG)
+
 namespace Swig {
   /* memory handler */
   struct GCItem 
@@ -1944,7 +1952,7 @@ namespace Swig {
       try {
 	throw;
       } catch (DirectorException& e) {
-	std::cerr << "Swig Director exception caught:" << std::endl
+	std::cerr << "SWIG Director exception caught:" << std::endl
 		  << e.getMessage() << std::endl;
       } catch (std::exception& e) {
 	std::cerr << "std::exception caught: "<< e.what() << std::endl;
@@ -1980,12 +1988,12 @@ namespace Swig {
   class DirectorTypeMismatchException : public Swig::DirectorException {
   public:
     DirectorTypeMismatchException(VALUE error, const char *msg="")
-      : Swig::DirectorException(error, "Swig director type mismatch", msg) 
+      : Swig::DirectorException(error, "SWIG director type mismatch", msg) 
     {
     }
 
     DirectorTypeMismatchException(const char *msg="")
-      : Swig::DirectorException(rb_eTypeError, "Swig director type mismatch", msg) 
+      : Swig::DirectorException(rb_eTypeError, "SWIG director type mismatch", msg) 
     {
     }
 
@@ -2006,7 +2014,7 @@ namespace Swig {
     }
 
     DirectorMethodException(const char* msg = "") 
-      : Swig::DirectorException(rb_eRuntimeError, "Swig director method error.", msg) {
+      : Swig::DirectorException(rb_eRuntimeError, "SWIG director method error.", msg) {
     }
     
     static void raise(VALUE error)
@@ -2020,7 +2028,7 @@ namespace Swig {
   {
   public:
     DirectorPureVirtualException(const char* msg = "") 
-      : DirectorException(rb_eRuntimeError, "Swig director pure virtual method called", msg)
+      : DirectorException(rb_eRuntimeError, "SWIG director pure virtual method called", msg)
     { 
     }
 
@@ -2096,8 +2104,8 @@ namespace Swig {
 
   /* ownership management */
   private:
-    typedef std::map<void*, GCItem_var> ownership_map;
-    mutable ownership_map owner;
+    typedef std::map<void*, GCItem_var> swig_ownership_map;
+    mutable swig_ownership_map swig_owner;
 #ifdef __PTHREAD__
     static pthread_mutex_t swig_mutex_own;
 #endif
@@ -2108,7 +2116,7 @@ namespace Swig {
     {
       if (vptr) {
 	SWIG_GUARD(swig_mutex_own);
-	owner[vptr] = new GCArray_T<Type>(vptr);
+	swig_owner[vptr] = new GCArray_T<Type>(vptr);
       }
     }
     
@@ -2117,7 +2125,7 @@ namespace Swig {
     {
       if (vptr) {	
 	SWIG_GUARD(swig_mutex_own);
-	owner[vptr] = new GCItem_T<Type>(vptr);
+	swig_owner[vptr] = new GCItem_T<Type>(vptr);
       }
     }
 
@@ -2125,7 +2133,7 @@ namespace Swig {
     {
       if (vptr && own) {
 	SWIG_GUARD(swig_mutex_own);
-	owner[vptr] = new GCItem_Object(own);
+	swig_owner[vptr] = new GCItem_Object(own);
       }
     }
     
@@ -2134,10 +2142,10 @@ namespace Swig {
       ruby_owntype own = 0;
       if (vptr) {
 	SWIG_GUARD(swig_mutex_own);
-	ownership_map::iterator iter = owner.find(vptr);
-	if (iter != owner.end()) {
+	swig_ownership_map::iterator iter = swig_owner.find(vptr);
+	if (iter != swig_owner.end()) {
 	  own = iter->second->get_own();
-	  owner.erase(iter);
+	  swig_owner.erase(iter);
 	}
       }
       return own;
@@ -2183,7 +2191,7 @@ static VALUE mGosu;
 #define SWIG_RUBY_THREAD_END_BLOCK
 
 
-#define SWIGVERSION 0x010339 
+#define SWIGVERSION 0x020001 
 #define SWIG_VERSION SWIGVERSION
 
 
@@ -2236,7 +2244,9 @@ namespace Gosu {
     void register_entity(const std::wstring& name, Gosu::Image* image) { registerEntity(name, image->getData().toBitmap()); }
 }
 
+#include <ctime>
 #include <sstream>
+#include <boost/algorithm/string.hpp>
 
 // New Ruby 1.9 syntax (for compilation with Ruby 1.8)
 #ifndef RSTRING_LEN
@@ -2291,14 +2301,8 @@ namespace Gosu
             throw std::logic_error("Blob length mismatch!");
         Bitmap result;
         result.resize(width, height);
-        const unsigned* rgbaIter = reinterpret_cast<const unsigned*>(RSTRING_PTR(blob));
-        for (unsigned y = 0; y < height; ++y)
-            for (unsigned x = 0; x < width; ++x)
-            {
-                unsigned rgba = *rgbaIter;
-                result.setPixel(x, y, Gosu::Color(rgba).abgr()); // swap R and B
-                ++rgbaIter;
-            }
+        std::memcpy(result.data(),
+            reinterpret_cast<const boost::uint32_t*>(RSTRING_PTR(blob)), width * height * 4);
         return result;
     }
 }
@@ -2375,13 +2379,13 @@ SWIG_ruby_failed(void)
 } 
 
 
-/*@SWIG:/usr/local/share/swig/1.3.39/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2DBL(VALUE *args)
 {
   VALUE obj = args[0];
   VALUE type = TYPE(obj);
   double *res = (double *)(args[1]);
-  *res = (type == T_FLOAT ? NUM2DBL(obj) : (type == T_FIXNUM ? (double) FIX2INT(obj) : rb_big2dbl(obj)));
+  *res = NUM2DBL(obj);
   return obj;
 }
 /*@SWIG@*/
@@ -2417,7 +2421,7 @@ SWIG_From_unsigned_SS_int  (unsigned int value)
 #include <string>
 
 
-/*@SWIG:/usr/local/share/swig/1.3.39/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2ULONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2491,7 +2495,7 @@ SWIG_From_std_string  (const std::string& s)
 }
 
 
-/*@SWIG:/usr/local/share/swig/1.3.39/ruby/rubyprimtypes.swg,23,%ruby_aux_method@*/
+/*@SWIG:/usr/local/share/swig/2.0.1/ruby/rubyprimtypes.swg,19,%ruby_aux_method@*/
 SWIGINTERN VALUE SWIG_AUX_NUM2LONG(VALUE *args)
 {
   VALUE obj = args[0];
@@ -2608,6 +2612,7 @@ SWIGINTERN std::vector< Gosu::Image * > Gosu_Image_loadTiles(Gosu::Window &windo
         return vec;        
     }
 SWIGINTERN std::string Gosu_Image_toBlob(Gosu::Image const *self){
+        // TODO: Optimize with direct copy into a Ruby string
         Gosu::Bitmap bmp = self->getData().toBitmap();
         return std::string(reinterpret_cast<const char*>(bmp.data()),
                            reinterpret_cast<const char*>(bmp.data()) + bmp.width() * bmp.height() * 4);
@@ -2618,6 +2623,15 @@ SWIGINTERN unsigned int Gosu_Image_columns(Gosu::Image const *self){
 SWIGINTERN unsigned int Gosu_Image_rows(Gosu::Image const *self){
         return self->height();
     }
+SWIGINTERN void Gosu_Image_save(Gosu::Image const *self,std::wstring const &filename){
+        Gosu::Bitmap bmp = self->getData().toBitmap();
+        Gosu::Buffer buf;
+        if (boost::iends_with(filename, L".bmp"))
+            Gosu::saveToBMP(bmp, buf.backWriter());
+        else
+            Gosu::saveToPNG(bmp, buf.backWriter());
+        Gosu::saveFile(buf, filename);
+    }
 
 SWIGINTERNINLINE VALUE
 SWIG_From_bool  (bool value)
@@ -2724,6 +2738,11 @@ SWIGINTERN void Gosu_Window_scale__SWIG_1(Gosu::Window *self,double factorX,doub
         rb_yield(Qnil);
         self->graphics().popTransform();
     }
+SWIGINTERN void Gosu_Window_scale__SWIG_2(Gosu::Window *self,double factorX,double factorY,double aroundX,double aroundY){
+        self->graphics().pushTransform(Gosu::scale(factorX, factorY, aroundX, aroundY));
+        rb_yield(Qnil);
+        self->graphics().popTransform();
+    }
 SWIGINTERN void Gosu_Window_translate(Gosu::Window *self,double x,double y){
         self->graphics().pushTransform(Gosu::translate(x, y));
         rb_yield(Qnil);
@@ -2846,9 +2865,10 @@ void SwigDirector_Window::buttonDown(Gosu::Button arg0) {
   VALUE result;
   
   {
-    obj0 = LONG2NUM((&arg0)->id());
-    if (obj0 == -1)
+    if (arg0 == Gosu::noButton)
     obj0 = Qnil;
+    else
+    obj0 = LONG2NUM((&arg0)->id());
   }
   result = rb_funcall(swig_get_self(), rb_intern("button_down"), 1,obj0);
 }
@@ -2859,9 +2879,10 @@ void SwigDirector_Window::buttonUp(Gosu::Button arg0) {
   VALUE result;
   
   {
-    obj0 = LONG2NUM((&arg0)->id());
-    if (obj0 == -1)
+    if (arg0 == Gosu::noButton)
     obj0 = Qnil;
+    else
+    obj0 = LONG2NUM((&arg0)->id());
   }
   result = rb_funcall(swig_get_self(), rb_intern("button_up"), 1,obj0);
 }
@@ -3878,6 +3899,36 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Color_from_rgba(int argc, VALUE *argv, VALUE self) {
+  boost::uint32_t arg1 ;
+  unsigned long val1 ;
+  int ecode1 = 0 ;
+  Gosu::Color result;
+  VALUE vresult = Qnil;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  ecode1 = SWIG_AsVal_unsigned_SS_long(argv[0], &val1);
+  if (!SWIG_IsOK(ecode1)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "boost::uint32_t","Gosu::Color::fromRGBA", 1, argv[0] ));
+  } 
+  arg1 = static_cast< boost::uint32_t >(val1);
+  {
+    try {
+      result = Gosu::Color::fromRGBA(arg1);
+    } catch(const std::runtime_error& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  vresult = SWIG_NewPointerObj((new Gosu::Color(static_cast< const Gosu::Color& >(result))), SWIGTYPE_p_Gosu__Color, SWIG_POINTER_OWN |  0 );
+  return vresult;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE
 _wrap_Color_from_hsv(int argc, VALUE *argv, VALUE self) {
   double arg1 ;
@@ -3979,7 +4030,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_alpha(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_red(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -3991,12 +4042,12 @@ _wrap_Color_alpha(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","alpha", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","red", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
     try {
-      result = ((Gosu::Color const *)arg1)->alpha();
+      result = ((Gosu::Color const *)arg1)->red();
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -4009,7 +4060,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_red(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_green(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4021,12 +4072,12 @@ _wrap_Color_red(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","red", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","green", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
     try {
-      result = ((Gosu::Color const *)arg1)->red();
+      result = ((Gosu::Color const *)arg1)->green();
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -4039,7 +4090,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_green(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_blue(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4051,12 +4102,12 @@ _wrap_Color_green(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","green", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","blue", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
     try {
-      result = ((Gosu::Color const *)arg1)->green();
+      result = ((Gosu::Color const *)arg1)->blue();
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -4069,7 +4120,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_blue(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_alpha(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
@@ -4081,12 +4132,12 @@ _wrap_Color_blue(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","blue", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color const *","alpha", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   {
     try {
-      result = ((Gosu::Color const *)arg1)->blue();
+      result = ((Gosu::Color const *)arg1)->alpha();
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -4099,7 +4150,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_alphae___(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_rede___(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
@@ -4112,17 +4163,17 @@ _wrap_Color_alphae___(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setAlpha", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setRed", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setAlpha", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setRed", 2, argv[0] ));
   } 
   arg2 = static_cast< Gosu::Color::Channel >(val2);
   {
     try {
-      (arg1)->setAlpha(arg2);
+      (arg1)->setRed(arg2);
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -4134,7 +4185,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_rede___(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_greene___(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
@@ -4147,17 +4198,17 @@ _wrap_Color_rede___(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setRed", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setGreen", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setRed", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setGreen", 2, argv[0] ));
   } 
   arg2 = static_cast< Gosu::Color::Channel >(val2);
   {
     try {
-      (arg1)->setRed(arg2);
+      (arg1)->setGreen(arg2);
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -4169,7 +4220,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_greene___(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_bluee___(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
@@ -4182,17 +4233,17 @@ _wrap_Color_greene___(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setGreen", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setBlue", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setGreen", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setBlue", 2, argv[0] ));
   } 
   arg2 = static_cast< Gosu::Color::Channel >(val2);
   {
     try {
-      (arg1)->setGreen(arg2);
+      (arg1)->setBlue(arg2);
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -4204,7 +4255,7 @@ fail:
 
 
 SWIGINTERN VALUE
-_wrap_Color_bluee___(int argc, VALUE *argv, VALUE self) {
+_wrap_Color_alphae___(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   Gosu::Color::Channel arg2 ;
   void *argp1 = 0 ;
@@ -4217,17 +4268,17 @@ _wrap_Color_bluee___(int argc, VALUE *argv, VALUE self) {
   }
   res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Color, 0 |  0 );
   if (!SWIG_IsOK(res1)) {
-    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setBlue", 1, self )); 
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","setAlpha", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
   ecode2 = SWIG_AsVal_unsigned_SS_char(argv[0], &val2);
   if (!SWIG_IsOK(ecode2)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setBlue", 2, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "Gosu::Color::Channel","setAlpha", 2, argv[0] ));
   } 
   arg2 = static_cast< Gosu::Color::Channel >(val2);
   {
     try {
-      (arg1)->setBlue(arg2);
+      (arg1)->setAlpha(arg2);
     } catch(const std::runtime_error& e) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
@@ -6822,6 +6873,40 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Image_save(int argc, VALUE *argv, VALUE self) {
+  Gosu::Image *arg1 = (Gosu::Image *) 0 ;
+  std::wstring *arg2 = 0 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  std::wstring temp2 ;
+  
+  if ((argc < 1) || (argc > 1)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 1)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Image, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Image const *","save", 1, self )); 
+  }
+  arg1 = reinterpret_cast< Gosu::Image * >(argp1);
+  {
+    VALUE localTemporary = rb_obj_as_string(argv[0]);
+    temp2 = Gosu::utf8ToWstring(StringValueCStr(localTemporary));
+    arg2 = &temp2;
+  }
+  {
+    try {
+      Gosu_Image_save((Gosu::Image const *)arg1,(std::wstring const &)*arg2);
+    } catch(const std::runtime_error& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN void
 free_Gosu_Image(Gosu::Image *arg1) {
     SWIG_RubyRemoveTracking(arg1);
@@ -7951,7 +8036,7 @@ _wrap_disown_TextInput(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< Gosu::TextInput * >(argp1);
   {
-    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
     if (director) director->swig_disown();
   }
   
@@ -9032,9 +9117,10 @@ _wrap_Window_char_to_button_id(int argc, VALUE *argv, VALUE self) {
     }
   }
   {
-    vresult = LONG2NUM((&result)->id());
-    if (vresult == -1)
+    if (result == Gosu::noButton)
     vresult = Qnil;
+    else
+    vresult = LONG2NUM((&result)->id());
   }
   return vresult;
 fail:
@@ -9814,14 +9900,73 @@ fail:
 }
 
 
+SWIGINTERN VALUE
+_wrap_Window_scale__SWIG_2(int argc, VALUE *argv, VALUE self) {
+  Gosu::Window *arg1 = (Gosu::Window *) 0 ;
+  double arg2 ;
+  double arg3 ;
+  double arg4 ;
+  double arg5 ;
+  void *argp1 = 0 ;
+  int res1 = 0 ;
+  double val2 ;
+  int ecode2 = 0 ;
+  double val3 ;
+  int ecode3 = 0 ;
+  double val4 ;
+  int ecode4 = 0 ;
+  double val5 ;
+  int ecode5 = 0 ;
+  
+  if ((argc < 4) || (argc > 4)) {
+    rb_raise(rb_eArgError, "wrong # of arguments(%d for 4)",argc); SWIG_fail;
+  }
+  res1 = SWIG_ConvertPtr(self, &argp1,SWIGTYPE_p_Gosu__Window, 0 |  0 );
+  if (!SWIG_IsOK(res1)) {
+    SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Window *","scale", 1, self )); 
+  }
+  arg1 = reinterpret_cast< Gosu::Window * >(argp1);
+  ecode2 = SWIG_AsVal_double(argv[0], &val2);
+  if (!SWIG_IsOK(ecode2)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode2), Ruby_Format_TypeError( "", "double","scale", 2, argv[0] ));
+  } 
+  arg2 = static_cast< double >(val2);
+  ecode3 = SWIG_AsVal_double(argv[1], &val3);
+  if (!SWIG_IsOK(ecode3)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode3), Ruby_Format_TypeError( "", "double","scale", 3, argv[1] ));
+  } 
+  arg3 = static_cast< double >(val3);
+  ecode4 = SWIG_AsVal_double(argv[2], &val4);
+  if (!SWIG_IsOK(ecode4)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode4), Ruby_Format_TypeError( "", "double","scale", 4, argv[2] ));
+  } 
+  arg4 = static_cast< double >(val4);
+  ecode5 = SWIG_AsVal_double(argv[3], &val5);
+  if (!SWIG_IsOK(ecode5)) {
+    SWIG_exception_fail(SWIG_ArgError(ecode5), Ruby_Format_TypeError( "", "double","scale", 5, argv[3] ));
+  } 
+  arg5 = static_cast< double >(val5);
+  {
+    try {
+      Gosu_Window_scale__SWIG_2(arg1,arg2,arg3,arg4,arg5);
+    } catch(const std::runtime_error& e) {
+      SWIG_exception(SWIG_RuntimeError, e.what());
+    }
+  }
+  return Qnil;
+fail:
+  return Qnil;
+}
+
+
 SWIGINTERN VALUE _wrap_Window_scale(int nargs, VALUE *args, VALUE self) {
   int argc;
-  VALUE argv[4];
+  VALUE argv[6];
   int ii;
   
   argc = nargs + 1;
   argv[0] = self;
-  if (argc > 4) SWIG_fail;
+  if (argc > 6) SWIG_fail;
   for (ii = 1; (ii < argc); ++ii) {
     argv[ii] = args[ii-1];
   }
@@ -9861,11 +10006,45 @@ SWIGINTERN VALUE _wrap_Window_scale(int nargs, VALUE *args, VALUE self) {
       }
     }
   }
+  if (argc == 5) {
+    int _v;
+    void *vptr = 0;
+    int res = SWIG_ConvertPtr(argv[0], &vptr, SWIGTYPE_p_Gosu__Window, 0);
+    _v = SWIG_CheckState(res);
+    if (_v) {
+      {
+        int res = SWIG_AsVal_double(argv[1], NULL);
+        _v = SWIG_CheckState(res);
+      }
+      if (_v) {
+        {
+          int res = SWIG_AsVal_double(argv[2], NULL);
+          _v = SWIG_CheckState(res);
+        }
+        if (_v) {
+          {
+            int res = SWIG_AsVal_double(argv[3], NULL);
+            _v = SWIG_CheckState(res);
+          }
+          if (_v) {
+            {
+              int res = SWIG_AsVal_double(argv[4], NULL);
+              _v = SWIG_CheckState(res);
+            }
+            if (_v) {
+              return _wrap_Window_scale__SWIG_2(nargs, args, self);
+            }
+          }
+        }
+      }
+    }
+  }
   
 fail:
-  Ruby_Format_OverloadedError( argc, 4, "scale", 
+  Ruby_Format_OverloadedError( argc, 6, "scale", 
     "    void scale(double factor)\n"
-    "    void scale(double factorX, double factorY)\n");
+    "    void scale(double factorX, double factorY)\n"
+    "    void scale(double factorX, double factorY, double aroundX, double aroundY)\n");
   
   return Qnil;
 }
@@ -9929,7 +10108,7 @@ _wrap_disown_Window(int argc, VALUE *argv, VALUE self) {
   }
   arg1 = reinterpret_cast< Gosu::Window * >(argp1);
   {
-    Swig::Director *director = dynamic_cast<Swig::Director *>(arg1);
+    Swig::Director *director = SWIG_DIRECTOR_CAST(arg1);
     if (director) director->swig_disown();
   }
   
@@ -10274,8 +10453,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 >(24)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.24"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(25)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.25"));
   rb_define_module_function(mGosu, "milliseconds", VALUEFUNC(_wrap_milliseconds), -1);
   rb_define_module_function(mGosu, "random", VALUEFUNC(_wrap_random), -1);
   rb_define_module_function(mGosu, "degrees_to_radians", VALUEFUNC(_wrap_degrees_to_radians), -1);
@@ -10301,16 +10480,18 @@ SWIGEXPORT void Init_gosu(void) {
   SWIG_TypeClientData(SWIGTYPE_p_Gosu__Color, (void *) &SwigClassColor);
   rb_define_alloc_func(SwigClassColor.klass, _wrap_Color_allocate);
   rb_define_method(SwigClassColor.klass, "initialize", VALUEFUNC(_wrap_new_Color), -1);
+  rb_define_const(SwigClassColor.klass, "GL_FORMAT", SWIG_From_unsigned_SS_int(static_cast< unsigned int >(Gosu::Color::GL_FORMAT)));
+  rb_define_singleton_method(SwigClassColor.klass, "from_rgba", VALUEFUNC(_wrap_Color_from_rgba), -1);
   rb_define_singleton_method(SwigClassColor.klass, "from_hsv", VALUEFUNC(_wrap_Color_from_hsv), -1);
   rb_define_singleton_method(SwigClassColor.klass, "from_ahsv", VALUEFUNC(_wrap_Color_from_ahsv), -1);
-  rb_define_method(SwigClassColor.klass, "alpha", VALUEFUNC(_wrap_Color_alpha), -1);
   rb_define_method(SwigClassColor.klass, "red", VALUEFUNC(_wrap_Color_red), -1);
   rb_define_method(SwigClassColor.klass, "green", VALUEFUNC(_wrap_Color_green), -1);
   rb_define_method(SwigClassColor.klass, "blue", VALUEFUNC(_wrap_Color_blue), -1);
-  rb_define_method(SwigClassColor.klass, "alpha=", VALUEFUNC(_wrap_Color_alphae___), -1);
+  rb_define_method(SwigClassColor.klass, "alpha", VALUEFUNC(_wrap_Color_alpha), -1);
   rb_define_method(SwigClassColor.klass, "red=", VALUEFUNC(_wrap_Color_rede___), -1);
   rb_define_method(SwigClassColor.klass, "green=", VALUEFUNC(_wrap_Color_greene___), -1);
   rb_define_method(SwigClassColor.klass, "blue=", VALUEFUNC(_wrap_Color_bluee___), -1);
+  rb_define_method(SwigClassColor.klass, "alpha=", VALUEFUNC(_wrap_Color_alphae___), -1);
   rb_define_method(SwigClassColor.klass, "hue", VALUEFUNC(_wrap_Color_hue), -1);
   rb_define_method(SwigClassColor.klass, "hue=", VALUEFUNC(_wrap_Color_huee___), -1);
   rb_define_method(SwigClassColor.klass, "saturation", VALUEFUNC(_wrap_Color_saturation), -1);
@@ -10390,6 +10571,7 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_method(SwigClassImage.klass, "to_blob", VALUEFUNC(_wrap_Image_to_blob), -1);
   rb_define_method(SwigClassImage.klass, "columns", VALUEFUNC(_wrap_Image_columns), -1);
   rb_define_method(SwigClassImage.klass, "rows", VALUEFUNC(_wrap_Image_rows), -1);
+  rb_define_method(SwigClassImage.klass, "save", VALUEFUNC(_wrap_Image_save), -1);
   SwigClassImage.mark = 0;
   SwigClassImage.destroy = (void (*)(void *)) free_Gosu_Image;
   SwigClassImage.trackObjects = 1;
@@ -10562,6 +10744,9 @@ SWIGEXPORT void Init_gosu(void) {
   rb_define_const(mGosu, "NoButton", SWIG_From_int(static_cast< int >(Gosu::noButton)));
   
   GosusDarkSide::oncePerTick = GosusDarkSide::yieldToOtherRubyThreads;
+  // While we are at it, to some healthy srand() - otherwise unavailable to Ruby people
+  std::srand(static_cast<unsigned int>(std::time(0)));
+  std::rand(); // and flush the first value
   
   rb_define_module_function(mGosu, "disown_TextInput", VALUEFUNC(_wrap_disown_TextInput), -1);