gosu 0.7.33 → 0.7.35

data/GosuImpl/MacUtility.hpp

@@ -45,12 +45,14 @@ namespace Gosu
 #ifdef __OBJC__
 #import <objc/objc.h>
 #import <stdexcept>
-#import <boost/utility.hpp>
 namespace Gosu
 {
     template<typename T>
-    class ObjRef : boost::noncopyable
+    class ObjRef
     {
+        ObjRef(const ObjRef&);
+        ObjRef& operator=(const ObjRef&);
+        
         T* ptr;
     public:
         ObjRef(T* ptr = nil)
@@ -89,10 +91,13 @@ namespace Gosu
 namespace Gosu
 {
     template<typename CFRefType = CFTypeRef>
-    class CFRef : boost::noncopyable
+    class CFRef
     {
+        CFRef(const CFRef&);
+        CFRef& operator=(const CFRef&);
+        
         CFRefType ref;
-
+        
     public:
         CFRef(CFRefType ref)
         :   ref(ref)

data/GosuImpl/RubyGosu.swg

@@ -18,8 +18,8 @@
 %feature("director") Gosu::TextInput;
 
 // Resolve typedefs that SWIG doesn't recognize.
-%apply unsigned char { boost::uint8_t };
-%apply unsigned long { boost::uint32_t };
+%apply unsigned char { std::tr1::uint8_t };
+%apply unsigned long { std::tr1::uint32_t };
 
 // Custom typemaps for wchar/wstring.
 #pragma SWIG nowarn=-490,-319
@@ -128,18 +128,6 @@
     }
 }
 
-// Allow integral constants to be passed in place of Color values.
-%typemap(in) boost::optional<Gosu::Color> {    
-    if (TYPE($input) == T_FIXNUM || TYPE($input) == T_BIGNUM)
-        $1 = Gosu::Color(NUM2UINT($input));
-    else {
-        void* ptr;
-        int res = SWIG_ConvertPtr($input, &ptr, SWIGTYPE_p_Gosu__Color, 0);
-        if (SWIG_IsOK(res) && ptr)
-            $1 = *reinterpret_cast<Gosu::Color*>(ptr);
-    }
-}
-
 // Header inclusion (order irrelevant)
 %module(directors="1") gosu
 %{
@@ -184,16 +172,16 @@
 #ifdef GOSU_IS_WIN
 #include <FreeImage.h>
 #endif
+#include <Gosu/TR1.hpp>
 
 namespace Gosu {
     void enableUndocumentedRetrofication() { extern bool undocumentedRetrofication; undocumentedRetrofication = true; }
     void register_entity(const std::wstring& name, Gosu::Image* image) { registerEntity(name, image->getData().toBitmap()); }
 }
 
+#include <cstring>
 #include <ctime>
 #include <sstream>
-#include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
 
 // Preprocessor check for 1.9 (thanks banister)
 #if defined(ROBJECT_EMBED_LEN_MAX)
@@ -249,9 +237,9 @@ namespace Gosu
         #undef VcppException
         #undef FACILITY_VISUALCPP
     }
-	Bitmap loadImageFile_FreeImage(const std::wstring& filename);
+    void loadImageFile_FreeImage(Bitmap& result, const std::wstring& filename);
     #endif
-    Gosu::Bitmap loadBitmap(VALUE val)
+    void loadBitmap(Bitmap& bitmap, VALUE val)
     {
         // Try to treat as filename first.
         if (rb_respond_to(val, rb_intern("to_str")))
@@ -260,11 +248,13 @@ namespace Gosu
             const char* filenameUTF8 = StringValuePtr(to_str);
             std::wstring filename = Gosu::utf8ToWstring(filenameUTF8);
             try {
-	            return loadImageFile(filename);
+                loadImageFile(bitmap, filename);
+                return;
 	        } catch (const std::exception&) {
             #ifdef GOSU_IS_WIN
                 ping_FreeImage();
-				return loadImageFile_FreeImage(filename);
+                loadImageFile_FreeImage(bitmap, filename);
+                return;
 	        #else
 				throw;
 			#endif
@@ -278,24 +268,23 @@ namespace Gosu
         unsigned width = NUM2UINT(rb_funcall(val, rb_intern("columns"), 0));
         unsigned height = NUM2UINT(rb_funcall(val, rb_intern("rows"), 0));
         
-        Bitmap result(width, height);
+        bitmap.resize(width, height, Gosu::Color::NONE);
         if (width * height * 4 == RSTRING_LEN(blob))
         {
             // 32 bit per pixel, assume R8G8B8A8
-            std::memcpy(result.data(),
-                reinterpret_cast<const boost::uint32_t*>(RSTRING_PTR(blob)), width * height * 4);
+            std::memcpy(bitmap.data(),
+                reinterpret_cast<const unsigned*>(RSTRING_PTR(blob)), width * height * 4);
         }
         else if (width * height * 4 * sizeof(float) == RSTRING_LEN(blob))
         {
             // 32 bit per channel, assume float/float/float/float
             const float* in = reinterpret_cast<const float*>(RSTRING_PTR(blob));
-            Gosu::Color::Channel* out = reinterpret_cast<Gosu::Color::Channel*>(result.data());
+            Gosu::Color::Channel* out = reinterpret_cast<Gosu::Color::Channel*>(bitmap.data());
             for (int i = width * height * 4; i > 0; --i)
                 *(out++) = *(in++) * 255;
         }
         else
             throw std::logic_error("Blob length mismatch!");
-        return result;
     }
     
     const char* cstrFromSymbol(VALUE symbol) {
@@ -402,7 +391,7 @@ namespace Gosu {
         return Gosu::Color(a, r, g, b);
     }
     
-    static Gosu::Color rgba(boost::uint32_t rgba)
+    static Gosu::Color rgba(std::tr1::uint32_t rgba)
     {
         return Gosu::Color(rgba & 0xff, (rgba >> 24) & 0xff,
             (rgba >> 16) & 0xff, (rgba >> 8) & 0xff);
@@ -414,9 +403,9 @@ namespace Gosu {
         return Gosu::Color(a, r, g, b);
     }
     
-    static Gosu::Color argb(boost::uint32_t argb)
+    static Gosu::Color argb(std::tr1::uint32_t argb)
     {
-        return argb;
+        return Gosu::Color(argb);
     }
     
     Gosu::Color dup() const {
@@ -432,8 +421,12 @@ namespace Gosu {
         return stream.str();
     }
     
-    bool operator==(boost::optional<Gosu::Color> other) {
-        return other && *$self == *other;
+    bool operator==(VALUE other) {
+        if (TYPE(other) == T_FIXNUM || TYPE(other) == T_BIGNUM)
+            return *$self == Gosu::Color(NUM2UINT(other));
+        void* ptr;
+        int res = SWIG_ConvertPtr(other, &ptr, SWIGTYPE_p_Gosu__Color, 0);
+        return SWIG_IsOK(res) && ptr && *$self == *reinterpret_cast<Gosu::Color*>(ptr);
     }
 }
 
@@ -489,11 +482,15 @@ namespace Gosu {
 %include "../Gosu/Image.hpp"
 %extend Gosu::Image {
     Image(Gosu::Window& window, VALUE source, bool tileable = false) {
-        return new Gosu::Image(window.graphics(), Gosu::loadBitmap(source), tileable);
+        Gosu::Bitmap bmp;
+        Gosu::loadBitmap(bmp, source);
+        return new Gosu::Image(window.graphics(), bmp, tileable);
     }
     Image(Gosu::Window& window, VALUE source, bool tileable,
           unsigned srcX, unsigned srcY, unsigned srcWidth, unsigned srcHeight) {
-        return new Gosu::Image(window.graphics(), Gosu::loadBitmap(source),
+        Gosu::Bitmap bmp;
+        Gosu::loadBitmap(bmp, source);
+        return new Gosu::Image(window.graphics(), bmp,
             srcX, srcY, srcWidth, srcHeight, tileable);
     }
     #ifndef WIN32
@@ -511,7 +508,7 @@ namespace Gosu {
     }
     %newobject glTexInfo;
     Gosu::GLTexInfo* glTexInfo() const {
-        boost::optional<Gosu::GLTexInfo> info = $self->getData().glTexInfo();
+        const Gosu::GLTexInfo* info = $self->getData().glTexInfo();
         if (info)
             return new Gosu::GLTexInfo(*info);
         else
@@ -537,7 +534,9 @@ namespace Gosu {
     {
         std::vector<Gosu::Image*> vec;
         // TODO: const correctness (<- did I mean exception safety?)
-        Gosu::imagesFromTiledBitmap(window.graphics(), Gosu::loadBitmap(source),
+        Gosu::Bitmap bmp;
+        Gosu::loadBitmap(bmp, source);
+        Gosu::imagesFromTiledBitmap(window.graphics(), bmp,
             tileWidth, tileHeight, tileable, vec);
         return vec;        
     }
@@ -558,17 +557,13 @@ namespace Gosu {
     }
     void save(const std::wstring& filename) const
     {
-        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);
+        Gosu::saveImageFile($self->getData().toBitmap(), filename);
     }
     void insert(VALUE source, int x, int y)
     {
-        $self->getData().insert(Gosu::loadBitmap(source), x, y);
+        Gosu::Bitmap bmp;
+        Gosu::loadBitmap(bmp, source);
+        $self->getData().insert(bmp, x, y);
     }
 }
 
@@ -722,7 +717,7 @@ namespace Gosu {
         $self->graphics().endGL();
     }
     void gl(Gosu::ZPos z) {
-        $self->graphics().scheduleGL(boost::bind(callRubyBlock, rb_block_proc()), z);
+        $self->graphics().scheduleGL(std::tr1::bind(callRubyBlock, rb_block_proc()), z);
     }
     void clipTo(double x, double y, double width, double height) {
         $self->graphics().beginClipping(x, y, width, height);

data/GosuImpl/RubyGosu_wrap.cxx

@@ -2171,13 +2171,12 @@ namespace Swig {
 #define SWIGTYPE_p_Gosu__Song swig_types[9]
 #define SWIGTYPE_p_Gosu__TextInput swig_types[10]
 #define SWIGTYPE_p_Gosu__Window swig_types[11]
-#define SWIGTYPE_p_boost__arrayT_double_16_t swig_types[12]
-#define SWIGTYPE_p_boost__optionalT_Gosu__Color_t swig_types[13]
-#define SWIGTYPE_p_char swig_types[14]
-#define SWIGTYPE_p_double swig_types[15]
-#define SWIGTYPE_p_std__wstring swig_types[16]
-static swig_type_info *swig_types[18];
-static swig_module_info swig_module = {swig_types, 17, 0, 0, 0, 0};
+#define SWIGTYPE_p_char swig_types[12]
+#define SWIGTYPE_p_double swig_types[13]
+#define SWIGTYPE_p_std__tr1__arrayT_double_16_t swig_types[14]
+#define SWIGTYPE_p_std__wstring swig_types[15]
+static swig_type_info *swig_types[17];
+static swig_module_info swig_module = {swig_types, 16, 0, 0, 0, 0};
 #define SWIG_TypeQuery(name) SWIG_TypeQueryModule(&swig_module, &swig_module, name)
 #define SWIG_MangledTypeQuery(name) SWIG_MangledTypeQueryModule(&swig_module, &swig_module, name)
 
@@ -2244,16 +2243,16 @@ static VALUE mGosu;
 #ifdef GOSU_IS_WIN
 #include <FreeImage.h>
 #endif
+#include <Gosu/TR1.hpp>
 
 namespace Gosu {
     void enableUndocumentedRetrofication() { extern bool undocumentedRetrofication; undocumentedRetrofication = true; }
     void register_entity(const std::wstring& name, Gosu::Image* image) { registerEntity(name, image->getData().toBitmap()); }
 }
 
+#include <cstring>
 #include <ctime>
 #include <sstream>
-#include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
 
 // Preprocessor check for 1.9 (thanks banister)
 #if defined(ROBJECT_EMBED_LEN_MAX)
@@ -2309,9 +2308,9 @@ namespace Gosu
         #undef VcppException
         #undef FACILITY_VISUALCPP
     }
-	Bitmap loadImageFile_FreeImage(const std::wstring& filename);
+    void loadImageFile_FreeImage(Bitmap& result, const std::wstring& filename);
     #endif
-    Gosu::Bitmap loadBitmap(VALUE val)
+    void loadBitmap(Bitmap& bitmap, VALUE val)
     {
         // Try to treat as filename first.
         if (rb_respond_to(val, rb_intern("to_str")))
@@ -2320,11 +2319,13 @@ namespace Gosu
             const char* filenameUTF8 = StringValuePtr(to_str);
             std::wstring filename = Gosu::utf8ToWstring(filenameUTF8);
             try {
-	            return loadImageFile(filename);
+                loadImageFile(bitmap, filename);
+                return;
 	        } catch (const std::exception&) {
             #ifdef GOSU_IS_WIN
                 ping_FreeImage();
-				return loadImageFile_FreeImage(filename);
+                loadImageFile_FreeImage(bitmap, filename);
+                return;
 	        #else
 				throw;
 			#endif
@@ -2338,24 +2339,23 @@ namespace Gosu
         unsigned width = NUM2UINT(rb_funcall(val, rb_intern("columns"), 0));
         unsigned height = NUM2UINT(rb_funcall(val, rb_intern("rows"), 0));
         
-        Bitmap result(width, height);
+        bitmap.resize(width, height, Gosu::Color::NONE);
         if (width * height * 4 == RSTRING_LEN(blob))
         {
             // 32 bit per pixel, assume R8G8B8A8
-            std::memcpy(result.data(),
-                reinterpret_cast<const boost::uint32_t*>(RSTRING_PTR(blob)), width * height * 4);
+            std::memcpy(bitmap.data(),
+                reinterpret_cast<const unsigned*>(RSTRING_PTR(blob)), width * height * 4);
         }
         else if (width * height * 4 * sizeof(float) == RSTRING_LEN(blob))
         {
             // 32 bit per channel, assume float/float/float/float
             const float* in = reinterpret_cast<const float*>(RSTRING_PTR(blob));
-            Gosu::Color::Channel* out = reinterpret_cast<Gosu::Color::Channel*>(result.data());
+            Gosu::Color::Channel* out = reinterpret_cast<Gosu::Color::Channel*>(bitmap.data());
             for (int i = width * height * 4; i > 0; --i)
                 *(out++) = *(in++) * 255;
         }
         else
             throw std::logic_error("Blob length mismatch!");
-        return result;
     }
     
     const char* cstrFromSymbol(VALUE symbol) {
@@ -2508,6 +2508,22 @@ SWIG_AsVal_unsigned_SS_long (VALUE obj, unsigned long *val)
 }
 
 
+SWIGINTERN int
+SWIG_AsVal_unsigned_SS_int (VALUE obj, unsigned int *val)
+{
+  unsigned long v;
+  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
+  if (SWIG_IsOK(res)) {
+    if ((v > UINT_MAX)) {
+      return SWIG_OverflowError;
+    } else {
+      if (val) *val = static_cast< unsigned int >(v);
+    }
+  }  
+  return res;
+}
+
+
 SWIGINTERN int
 SWIG_AsVal_unsigned_SS_char (VALUE obj, unsigned char *val)
 {
@@ -2536,15 +2552,15 @@ SWIGINTERN Gosu::Color Gosu_Color_rgb(Gosu::Color::Channel r,Gosu::Color::Channe
 SWIGINTERN Gosu::Color Gosu_Color_rgba__SWIG_0(Gosu::Color::Channel r,Gosu::Color::Channel g,Gosu::Color::Channel b,Gosu::Color::Channel a){
         return Gosu::Color(a, r, g, b);
     }
-SWIGINTERN Gosu::Color Gosu_Color_rgba__SWIG_1(boost::uint32_t rgba){
+SWIGINTERN Gosu::Color Gosu_Color_rgba__SWIG_1(std::tr1::uint32_t rgba){
         return Gosu::Color(rgba & 0xff, (rgba >> 24) & 0xff,
             (rgba >> 16) & 0xff, (rgba >> 8) & 0xff);
     }
 SWIGINTERN Gosu::Color Gosu_Color_argb__SWIG_1(Gosu::Color::Channel a,Gosu::Color::Channel r,Gosu::Color::Channel g,Gosu::Color::Channel b){
         return Gosu::Color(a, r, g, b);
     }
-SWIGINTERN Gosu::Color Gosu_Color_argb__SWIG_2(boost::uint32_t argb){
-        return argb;
+SWIGINTERN Gosu::Color Gosu_Color_argb__SWIG_2(std::tr1::uint32_t argb){
+        return Gosu::Color(argb);
     }
 SWIGINTERN Gosu::Color Gosu_Color_dup(Gosu::Color const *self){
         return *self;
@@ -2564,8 +2580,12 @@ SWIG_From_std_string  (const std::string& s)
   return SWIG_FromCharPtrAndSize(s.data(), s.size());
 }
 
-SWIGINTERN bool Gosu_Color_operator_Se__Se_(Gosu::Color *self,boost::optional< Gosu::Color > other){
-        return other && *self == *other;
+SWIGINTERN bool Gosu_Color_operator_Se__Se_(Gosu::Color *self,VALUE other){
+        if (TYPE(other) == T_FIXNUM || TYPE(other) == T_BIGNUM)
+            return *self == Gosu::Color(NUM2UINT(other));
+        void* ptr;
+        int res = SWIG_ConvertPtr(other, &ptr, SWIGTYPE_p_Gosu__Color, 0);
+        return SWIG_IsOK(res) && ptr && *self == *reinterpret_cast<Gosu::Color*>(ptr);
     }
 
 SWIGINTERNINLINE VALUE
@@ -2619,22 +2639,6 @@ SWIG_AsVal_int (VALUE obj, int *val)
   return res;
 }
 
-
-SWIGINTERN int
-SWIG_AsVal_unsigned_SS_int (VALUE obj, unsigned int *val)
-{
-  unsigned long v;
-  int res = SWIG_AsVal_unsigned_SS_long (obj, &v);
-  if (SWIG_IsOK(res)) {
-    if ((v > UINT_MAX)) {
-      return SWIG_OverflowError;
-    } else {
-      if (val) *val = static_cast< unsigned int >(v);
-    }
-  }  
-  return res;
-}
-
 SWIGINTERN Gosu::Font *new_Gosu_Font(Gosu::Window &window,std::wstring const &fontName,unsigned int height){
         return new Gosu::Font(window.graphics(), fontName, height);
     }
@@ -2685,17 +2689,21 @@ SWIG_AsVal_bool (VALUE obj, bool *val)
 }
 
 SWIGINTERN Gosu::Image *new_Gosu_Image__SWIG_0(Gosu::Window &window,VALUE source,bool tileable=false){
-        return new Gosu::Image(window.graphics(), Gosu::loadBitmap(source), tileable);
+        Gosu::Bitmap bmp;
+        Gosu::loadBitmap(bmp, source);
+        return new Gosu::Image(window.graphics(), bmp, tileable);
     }
 SWIGINTERN Gosu::Image *new_Gosu_Image__SWIG_1(Gosu::Window &window,VALUE source,bool tileable,unsigned int srcX,unsigned int srcY,unsigned int srcWidth,unsigned int srcHeight){
-        return new Gosu::Image(window.graphics(), Gosu::loadBitmap(source),
+        Gosu::Bitmap bmp;
+        Gosu::loadBitmap(bmp, source);
+        return new Gosu::Image(window.graphics(), bmp,
             srcX, srcY, srcWidth, srcHeight, tileable);
     }
 SWIGINTERN void Gosu_Image_drawAsQuad(Gosu::Image *self,double x1,double y1,Gosu::Color c1,double x2,double y2,Gosu::Color c2,double x3,double y3,Gosu::Color c3,double x4,double y4,Gosu::Color c4,Gosu::ZPos z,Gosu::AlphaMode mode=Gosu::amDefault){
         self->getData().draw(x1, y1, c1, x2, y2, c2, x3, y3, c3, x4, y4, c4, z, mode);
     }
 SWIGINTERN Gosu::GLTexInfo *Gosu_Image_glTexInfo(Gosu::Image const *self){
-        boost::optional<Gosu::GLTexInfo> info = self->getData().glTexInfo();
+        const Gosu::GLTexInfo* info = self->getData().glTexInfo();
         if (info)
             return new Gosu::GLTexInfo(*info);
         else
@@ -2712,7 +2720,9 @@ SWIGINTERN Gosu::Image *Gosu_Image_fromText7(Gosu::Window &window,std::wstring c
 SWIGINTERN std::vector< Gosu::Image * > Gosu_Image_loadTiles(Gosu::Window &window,VALUE source,int tileWidth,int tileHeight,bool tileable){
         std::vector<Gosu::Image*> vec;
         // TODO: const correctness (<- did I mean exception safety?)
-        Gosu::imagesFromTiledBitmap(window.graphics(), Gosu::loadBitmap(source),
+        Gosu::Bitmap bmp;
+        Gosu::loadBitmap(bmp, source);
+        Gosu::imagesFromTiledBitmap(window.graphics(), bmp,
             tileWidth, tileHeight, tileable, vec);
         return vec;        
     }
@@ -2729,16 +2739,12 @@ 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);
+        Gosu::saveImageFile(self->getData().toBitmap(), filename);
     }
 SWIGINTERN void Gosu_Image_insert(Gosu::Image *self,VALUE source,int x,int y){
-        self->getData().insert(Gosu::loadBitmap(source), x, y);
+        Gosu::Bitmap bmp;
+        Gosu::loadBitmap(bmp, source);
+        self->getData().insert(bmp, x, y);
     }
 SWIGINTERN unsigned int Gosu_TextInput_caret_pos(Gosu::TextInput const *self){
         return RUBY_18_19(Gosu::wstringToUTF8(self->text().substr(0, self->caretPos())).size(),
@@ -2809,7 +2815,7 @@ SWIGINTERN void Gosu_Window_gl__SWIG_0(Gosu::Window *self){
         self->graphics().endGL();
     }
 SWIGINTERN void Gosu_Window_gl__SWIG_1(Gosu::Window *self,Gosu::ZPos z){
-        self->graphics().scheduleGL(boost::bind(callRubyBlock, rb_block_proc()), z);
+        self->graphics().scheduleGL(std::tr1::bind(callRubyBlock, rb_block_proc()), z);
     }
 SWIGINTERN void Gosu_Window_clipTo(Gosu::Window *self,double x,double y,double width,double height){
         self->graphics().beginClipping(x, y, width, height);
@@ -3479,7 +3485,7 @@ _wrap_translate(int argc, VALUE *argv, VALUE self) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
-  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_boost__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_std__tr1__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -3529,7 +3535,7 @@ _wrap_rotate(int argc, VALUE *argv, VALUE self) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
-  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_boost__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_std__tr1__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -3559,7 +3565,7 @@ _wrap_scale__SWIG_0(int argc, VALUE *argv, VALUE self) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
-  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_boost__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_std__tr1__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -3617,7 +3623,7 @@ _wrap_scale__SWIG_1(int argc, VALUE *argv, VALUE self) {
       SWIG_exception(SWIG_RuntimeError, e.what());
     }
   }
-  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_boost__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
+  vresult = SWIG_NewPointerObj((new Gosu::Transform(static_cast< const Gosu::Transform& >(result))), SWIGTYPE_p_std__tr1__arrayT_double_16_t, SWIG_POINTER_OWN |  0 );
   return vresult;
 fail:
   return Qnil;
@@ -3767,8 +3773,8 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_new_Color__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  boost::uint32_t arg1 ;
-  unsigned long val1 ;
+  unsigned int arg1 ;
+  unsigned int val1 ;
   int ecode1 = 0 ;
   const char *classname SWIGUNUSED = "Gosu::Color";
   Gosu::Color *result = 0 ;
@@ -3776,11 +3782,11 @@ _wrap_new_Color__SWIG_1(int argc, VALUE *argv, VALUE self) {
   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);
+  ecode1 = SWIG_AsVal_unsigned_SS_int(argv[0], &val1);
   if (!SWIG_IsOK(ecode1)) {
-    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "boost::uint32_t","Gosu::Color", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "unsigned int","Gosu::Color", 1, argv[0] ));
   } 
-  arg1 = static_cast< boost::uint32_t >(val1);
+  arg1 = static_cast< unsigned int >(val1);
   {
     try {
       result = (Gosu::Color *)new Gosu::Color(arg1);
@@ -3931,7 +3937,7 @@ SWIGINTERN VALUE _wrap_new_Color(int nargs, VALUE *args, VALUE self) {
   if (argc == 1) {
     int _v;
     {
-      int res = SWIG_AsVal_unsigned_SS_long(argv[0], NULL);
+      int res = SWIG_AsVal_unsigned_SS_int(argv[0], NULL);
       _v = SWIG_CheckState(res);
     }
     if (_v) {
@@ -3992,7 +3998,7 @@ SWIGINTERN VALUE _wrap_new_Color(int nargs, VALUE *args, VALUE self) {
 fail:
   Ruby_Format_OverloadedError( argc, 4, "Color.new", 
     "    Color.new()\n"
-    "    Color.new(boost::uint32_t argb)\n"
+    "    Color.new(unsigned int argb)\n"
     "    Color.new(Gosu::Color::Channel red, Gosu::Color::Channel green, Gosu::Color::Channel blue)\n"
     "    Color.new(Gosu::Color::Channel alpha, Gosu::Color::Channel red, Gosu::Color::Channel green, Gosu::Color::Channel blue)\n");
   
@@ -4560,7 +4566,7 @@ _wrap_Color_argb__SWIG_0(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  boost::uint32_t result;
+  std::tr1::uint32_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -4590,7 +4596,7 @@ _wrap_Color_bgr(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  boost::uint32_t result;
+  std::tr1::uint32_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -4620,7 +4626,7 @@ _wrap_Color_abgr(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  boost::uint32_t result;
+  std::tr1::uint32_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -4650,7 +4656,7 @@ _wrap_Color_gl(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
-  boost::uint32_t result;
+  std::tr1::uint32_t result;
   VALUE vresult = Qnil;
   
   if ((argc < 0) || (argc > 0)) {
@@ -4777,7 +4783,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_Color_rgba__SWIG_1(int argc, VALUE *argv, VALUE self) {
-  boost::uint32_t arg1 ;
+  std::tr1::uint32_t arg1 ;
   unsigned long val1 ;
   int ecode1 = 0 ;
   Gosu::Color result;
@@ -4788,9 +4794,9 @@ _wrap_Color_rgba__SWIG_1(int argc, VALUE *argv, VALUE self) {
   }
   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_rgba__SWIG_1", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::tr1::uint32_t","Gosu_Color_rgba__SWIG_1", 1, argv[0] ));
   } 
-  arg1 = static_cast< boost::uint32_t >(val1);
+  arg1 = static_cast< std::tr1::uint32_t >(val1);
   {
     try {
       result = Gosu_Color_rgba__SWIG_1(arg1);
@@ -4857,7 +4863,7 @@ SWIGINTERN VALUE _wrap_Color_rgba(int nargs, VALUE *args, VALUE self) {
 fail:
   Ruby_Format_OverloadedError( argc, 4, "rgba", 
     "    Gosu::Color rgba(Gosu::Color::Channel r, Gosu::Color::Channel g, Gosu::Color::Channel b, Gosu::Color::Channel a)\n"
-    "    Gosu::Color rgba(boost::uint32_t rgba)\n");
+    "    Gosu::Color rgba(std::tr1::uint32_t rgba)\n");
   
   return Qnil;
 }
@@ -4919,7 +4925,7 @@ fail:
 
 SWIGINTERN VALUE
 _wrap_Color_argb__SWIG_2(int argc, VALUE *argv, VALUE self) {
-  boost::uint32_t arg1 ;
+  std::tr1::uint32_t arg1 ;
   unsigned long val1 ;
   int ecode1 = 0 ;
   Gosu::Color result;
@@ -4930,9 +4936,9 @@ _wrap_Color_argb__SWIG_2(int argc, VALUE *argv, VALUE self) {
   }
   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_argb__SWIG_2", 1, argv[0] ));
+    SWIG_exception_fail(SWIG_ArgError(ecode1), Ruby_Format_TypeError( "", "std::tr1::uint32_t","Gosu_Color_argb__SWIG_2", 1, argv[0] ));
   } 
-  arg1 = static_cast< boost::uint32_t >(val1);
+  arg1 = static_cast< std::tr1::uint32_t >(val1);
   {
     try {
       result = Gosu_Color_argb__SWIG_2(arg1);
@@ -5009,7 +5015,7 @@ fail:
   Ruby_Format_OverloadedError( argc, 4, "Color.argb", 
     "    Gosu::Color Color.argb(Gosu::Color const *self)\n"
     "    Gosu::Color Color.argb(Gosu::Color::Channel a, Gosu::Color::Channel r, Gosu::Color::Channel g, Gosu::Color::Channel b)\n"
-    "    Gosu::Color Color.argb(boost::uint32_t argb)\n");
+    "    Gosu::Color Color.argb(std::tr1::uint32_t argb)\n");
   
   return Qnil;
 }
@@ -5096,7 +5102,7 @@ Equality comparison operator.
 SWIGINTERN VALUE
 _wrap_Color___eq__(int argc, VALUE *argv, VALUE self) {
   Gosu::Color *arg1 = (Gosu::Color *) 0 ;
-  boost::optional< Gosu::Color > arg2 ;
+  VALUE arg2 = (VALUE) 0 ;
   void *argp1 = 0 ;
   int res1 = 0 ;
   bool result;
@@ -5110,16 +5116,7 @@ _wrap_Color___eq__(int argc, VALUE *argv, VALUE self) {
     SWIG_exception_fail(SWIG_ArgError(res1), Ruby_Format_TypeError( "", "Gosu::Color *","operator ==", 1, self )); 
   }
   arg1 = reinterpret_cast< Gosu::Color * >(argp1);
-  {
-    if (TYPE(argv[0]) == T_FIXNUM || TYPE(argv[0]) == T_BIGNUM)
-    arg2 = Gosu::Color(NUM2UINT(argv[0]));
-    else {
-      void* ptr;
-      int res = SWIG_ConvertPtr(argv[0], &ptr, SWIGTYPE_p_Gosu__Color, 0);
-      if (SWIG_IsOK(res) && ptr)
-      arg2 = *reinterpret_cast<Gosu::Color*>(ptr);
-    }
-  }
+  arg2 = argv[0];
   {
     try {
       result = (bool)Gosu_Color_operator_Se__Se_(arg1,arg2);
@@ -10924,10 +10921,9 @@ static swig_type_info _swigt__p_Gosu__SampleInstance = {"_p_Gosu__SampleInstance
 static swig_type_info _swigt__p_Gosu__Song = {"_p_Gosu__Song", "Gosu::Song *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Gosu__TextInput = {"_p_Gosu__TextInput", "Gosu::TextInput *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_Gosu__Window = {"_p_Gosu__Window", "Gosu::Window *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_boost__arrayT_double_16_t = {"_p_boost__arrayT_double_16_t", "boost::array< double,16 > *|Gosu::Transform *", 0, 0, (void*)0, 0};
-static swig_type_info _swigt__p_boost__optionalT_Gosu__Color_t = {"_p_boost__optionalT_Gosu__Color_t", "boost::optional< Gosu::Color > *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_char = {"_p_char", "char *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_double = {"_p_double", "Gosu::ZPos *|double *", 0, 0, (void*)0, 0};
+static swig_type_info _swigt__p_std__tr1__arrayT_double_16_t = {"_p_std__tr1__arrayT_double_16_t", "std::tr1::array< double,16 > *|Gosu::Transform *", 0, 0, (void*)0, 0};
 static swig_type_info _swigt__p_std__wstring = {"_p_std__wstring", "std::wstring *", 0, 0, (void*)0, 0};
 
 static swig_type_info *swig_type_initial[] = {
@@ -10943,10 +10939,9 @@ static swig_type_info *swig_type_initial[] = {
   &_swigt__p_Gosu__Song,
   &_swigt__p_Gosu__TextInput,
   &_swigt__p_Gosu__Window,
-  &_swigt__p_boost__arrayT_double_16_t,
-  &_swigt__p_boost__optionalT_Gosu__Color_t,
   &_swigt__p_char,
   &_swigt__p_double,
+  &_swigt__p_std__tr1__arrayT_double_16_t,
   &_swigt__p_std__wstring,
 };
 
@@ -10962,10 +10957,9 @@ static swig_cast_info _swigc__p_Gosu__SampleInstance[] = {  {&_swigt__p_Gosu__Sa
 static swig_cast_info _swigc__p_Gosu__Song[] = {  {&_swigt__p_Gosu__Song, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Gosu__TextInput[] = {  {&_swigt__p_Gosu__TextInput, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_Gosu__Window[] = {  {&_swigt__p_Gosu__Window, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_boost__arrayT_double_16_t[] = {  {&_swigt__p_boost__arrayT_double_16_t, 0, 0, 0},{0, 0, 0, 0}};
-static swig_cast_info _swigc__p_boost__optionalT_Gosu__Color_t[] = {  {&_swigt__p_boost__optionalT_Gosu__Color_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_char[] = {  {&_swigt__p_char, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_double[] = {  {&_swigt__p_double, 0, 0, 0},{0, 0, 0, 0}};
+static swig_cast_info _swigc__p_std__tr1__arrayT_double_16_t[] = {  {&_swigt__p_std__tr1__arrayT_double_16_t, 0, 0, 0},{0, 0, 0, 0}};
 static swig_cast_info _swigc__p_std__wstring[] = {  {&_swigt__p_std__wstring, 0, 0, 0},{0, 0, 0, 0}};
 
 static swig_cast_info *swig_cast_initial[] = {
@@ -10981,10 +10975,9 @@ static swig_cast_info *swig_cast_initial[] = {
   _swigc__p_Gosu__Song,
   _swigc__p_Gosu__TextInput,
   _swigc__p_Gosu__Window,
-  _swigc__p_boost__arrayT_double_16_t,
-  _swigc__p_boost__optionalT_Gosu__Color_t,
   _swigc__p_char,
   _swigc__p_double,
+  _swigc__p_std__tr1__arrayT_double_16_t,
   _swigc__p_std__wstring,
 };
 
@@ -11248,8 +11241,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 >(33)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.33"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(35)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.35"));
   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);