gosu 0.7.28 → 0.7.29

data/Gosu/Version.hpp

@@ -3,7 +3,7 @@
 
 #define GOSU_MAJOR_VERSION 0
 #define GOSU_MINOR_VERSION 7
-#define GOSU_POINT_VERSION 28
-#define GOSU_VERSION "0.7.28"
+#define GOSU_POINT_VERSION 29
+#define GOSU_VERSION "0.7.29"
 
 #endif

data/GosuImpl/RubyGosu.swg

@@ -235,20 +235,31 @@ namespace Gosu
             return loadImageFile(Gosu::utf8ToWstring(filename));
         }
 
-        // Otherwise, try to call .to_blob on it.
-        // (Works with RMagick).
+        // Otherwise, try to call .to_blob on it (works with RMagick, TexPlay etc).
         VALUE conversion = rb_str_new2("to_blob { self.format = 'RGBA'; self.depth = 8 }");
         VALUE blob = rb_obj_instance_eval(1, &conversion, val);
         rb_check_safe_obj(blob);
         unsigned width = NUM2UINT(rb_funcall(val, rb_intern("columns"), 0));
         unsigned height = NUM2UINT(rb_funcall(val, rb_intern("rows"), 0));
-                                 
-        if (width * height * 4 != RSTRING_LEN(blob))
-            throw std::logic_error("Blob length mismatch!");
+        
         Bitmap result;
         result.resize(width, height);
-        std::memcpy(result.data(),
-            reinterpret_cast<const boost::uint32_t*>(RSTRING_PTR(blob)), width * height * 4);
+        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);
+        }
+        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());
+            for (int i = width * height * 4; i > 0; --i)
+                *(out++) = *(in++) * 255;
+        }
+        else
+            throw std::logic_error("Blob length mismatch!");
         return result;
     }
 }

data/GosuImpl/RubyGosu_wrap.cxx

@@ -2296,20 +2296,31 @@ namespace Gosu
             return loadImageFile(Gosu::utf8ToWstring(filename));
         }
 
-        // Otherwise, try to call .to_blob on it.
-        // (Works with RMagick).
+        // Otherwise, try to call .to_blob on it (works with RMagick, TexPlay etc).
         VALUE conversion = rb_str_new2("to_blob { self.format = 'RGBA'; self.depth = 8 }");
         VALUE blob = rb_obj_instance_eval(1, &conversion, val);
         rb_check_safe_obj(blob);
         unsigned width = NUM2UINT(rb_funcall(val, rb_intern("columns"), 0));
         unsigned height = NUM2UINT(rb_funcall(val, rb_intern("rows"), 0));
-                                 
-        if (width * height * 4 != RSTRING_LEN(blob))
-            throw std::logic_error("Blob length mismatch!");
+        
         Bitmap result;
         result.resize(width, height);
-        std::memcpy(result.data(),
-            reinterpret_cast<const boost::uint32_t*>(RSTRING_PTR(blob)), width * height * 4);
+        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);
+        }
+        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());
+            for (int i = width * height * 4; i > 0; --i)
+                *(out++) = *(in++) * 255;
+        }
+        else
+            throw std::logic_error("Blob length mismatch!");
         return result;
     }
 }
@@ -11041,8 +11052,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 >(28)));
-  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.28"));
+  rb_define_const(mGosu, "POINT_VERSION", SWIG_From_int(static_cast< int >(29)));
+  rb_define_const(mGosu, "VERSION", SWIG_FromCharPtr("0.7.29"));
   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);

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 7
-  - 28
-  version: 0.7.28
+  - 29
+  version: 0.7.29
 platform: ruby
 authors: 
 - Julian Raschke
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 +08:00
+date: 2011-03-30 00:00:00 +08:00
 default_executable: 
 dependencies: []