rays 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a7045b85aab21570ba6c4f816ea00a7638f39645d0b3393ae9ba93d14110be1
-  data.tar.gz: 8492b40089c9a7da4336b72e059b4e189739d4510a0abc2a76ec775a9297bc80
+  metadata.gz: 9afd571fda027a889bb3d2ba60886e08ee8de5b825690d28838d10e729e5097d
+  data.tar.gz: 2bd0652be52c0f2f135cad35abe6b1b7140e90185ef9ec725e673aec2563f041
 SHA512:
-  metadata.gz: 3d48296b01c547a877506077fba4c3b30dae52d74589b947877e8ffc3cf62113619041e7d47d3073222af2ce5dfdc1559004ad08477b5c117c30fbae76a03f68
-  data.tar.gz: 73b031ed35d8519e3ebcf4745d18868fe3ac61559d6159f10aa2e0a2a267051ba5d76bd7f61b28b7427cbc4b1b64da2e4e3f8cf5a066c3bb98d578a69adb64a0
+  metadata.gz: 94278334d219aebbaa3bd11b51f87555b230e8cd296115ccc06476b76f4240c0d5c4d976949b7bd04ce4b11aa056b738e7c9e5247dec8d75d14d36d5c7e388a0
+  data.tar.gz: 9ffd24082a1f0f37d6fbbb5ce016395069de981ba3c1ff0538392de790029f7ed69d50b739fa6a0debe7b5461b8624704c46b5e36967342c22250f8c655bbf0e

data/.doc/ext/rays/bitmap.cpp

@@ -7,7 +7,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Bitmap)
+RUCY_DEFINE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Bitmap)
 
 #define THIS  to<Rays::Bitmap*>(self)
 
@@ -317,23 +317,23 @@ set_pixels (Rays::Bitmap* bmp, Value pixels)
 	}
 }
 
-static inline Value
-to_rgb_value (uint8_t r, uint8_t g, uint8_t b)
+static inline uint32_t
+to_rgb (uint8_t r, uint8_t g, uint8_t b)
 {
-	return value(
-		((uint) r) << 16 |
-		((uint) g) << 8  |
-		((uint) b));
+	return
+		((uint32_t) r) << 16 |
+		((uint32_t) g) << 8  |
+		((uint32_t) b);
 }
 
-static inline Value
-to_argb_value (uint8_t r, uint8_t g, uint8_t b, uint8_t a)
+static inline uint32_t
+to_argb (uint8_t r, uint8_t g, uint8_t b, uint8_t a)
 {
-	return value(
-		((uint) a) << 24 |
-		((uint) r) << 16 |
-		((uint) g) << 8  |
-		((uint) b));
+	return
+		((uint32_t) a) << 24 |
+		((uint32_t) r) << 16 |
+		((uint32_t) g) << 8  |
+		((uint32_t) b);
 }
 
 static void
@@ -392,7 +392,7 @@ get_pixels (auto* pixels, const Rays::Bitmap& bmp)
 			{
 				const auto* p = bmp.at<uint8_t>(0, y);
 				for (int x = 0; x < w; ++x, p += 3)
-					pixels->push_back(to_rgb_value(p[0], p[1], p[2]));
+					pixels->push_back(value(to_rgb(p[0], p[1], p[2])));
 			}
 			break;
 
@@ -402,7 +402,7 @@ get_pixels (auto* pixels, const Rays::Bitmap& bmp)
 			{
 				const auto* p = bmp.at<uint8_t>(0, y);
 				for (int x = 0; x < w; ++x, p += 4)
-					pixels->push_back(to_argb_value(p[0], p[1], p[2], p[3]));
+					pixels->push_back(value(to_argb(p[0], p[1], p[2], p[3])));
 			}
 			break;
 
@@ -412,7 +412,7 @@ get_pixels (auto* pixels, const Rays::Bitmap& bmp)
 			{
 				const auto* p = bmp.at<uint8_t>(0, y);
 				for (int x = 0; x < w; ++x, p += 4)
-					pixels->push_back(to_argb_value(p[1], p[2], p[3], p[0]));
+					pixels->push_back(value(to_argb(p[1], p[2], p[3], p[0])));
 			}
 			break;
 
@@ -421,7 +421,7 @@ get_pixels (auto* pixels, const Rays::Bitmap& bmp)
 			{
 				const auto* p = bmp.at<uint8_t>(0, y);
 				for (int x = 0; x < w; ++x, p += 3)
-					pixels->push_back(to_rgb_value(p[2], p[1], p[0]));
+					pixels->push_back(value(to_rgb(p[2], p[1], p[0])));
 			}
 			break;
 
@@ -431,7 +431,7 @@ get_pixels (auto* pixels, const Rays::Bitmap& bmp)
 			{
 				const auto* p = bmp.at<uint8_t>(0, y);
 				for (int x = 0; x < w; ++x, p += 4)
-					pixels->push_back(to_argb_value(p[2], p[1], p[0], p[3]));
+					pixels->push_back(value(to_argb(p[2], p[1], p[0], p[3])));
 			}
 			break;
 
@@ -441,7 +441,7 @@ get_pixels (auto* pixels, const Rays::Bitmap& bmp)
 			{
 				const auto* p = bmp.at<uint8_t>(0, y);
 				for (int x = 0; x < w; ++x, p += 4)
-					pixels->push_back(to_argb_value(p[3], p[2], p[1], p[0]));
+					pixels->push_back(value(to_argb(p[3], p[2], p[1], p[0])));
 			}
 			break;
 
@@ -532,17 +532,85 @@ get_pixels (auto* pixels, const Rays::Bitmap& bmp)
 	}
 }
 
-static
-VALUE set_pixels(VALUE self, VALUE pixels)
+static Value
+get_32bit_pixels_string (const Rays::Bitmap& bmp)
 {
-	CHECK;
+	// avoid SEGV caused by 32bit argb value on 'x64-mingw-ucrt' platform.
+
+	const auto& cs = bmp.color_space();
+	if (cs.bpp() != 32) return nil();
+
+	int w = bmp.width(), h = bmp.height();
 
-	if (sizeof(VALUE) <= 4)
+	std::vector<uint32_t> pixels;
+	pixels.reserve(w * h);
+
+	switch (cs.type())
 	{
-		not_implemented_error(
-			__FILE__, __LINE__, "Bitmap#pixels=() does not support 32-bit platforms");
+		case Rays::GRAY_32:
+		case Rays::ALPHA_32:
+			for (int y = 0; y < h; ++y)
+			{
+				const auto* p = bmp.at<uint32_t>(0, y);
+				for (int x = 0; x < w; ++x, ++p)
+					pixels.push_back(*p);
+			}
+			break;
+
+		case Rays::RGBA_8888:
+		case Rays::RGBX_8888:
+			for (int y = 0; y < h; ++y)
+			{
+				const auto* p = bmp.at<uint8_t>(0, y);
+				for (int x = 0; x < w; ++x, p += 4)
+					pixels.push_back(to_argb(p[0], p[1], p[2], p[3]));
+			}
+			break;
+
+		case Rays::ARGB_8888:
+		case Rays::XRGB_8888:
+			for (int y = 0; y < h; ++y)
+			{
+				const auto* p = bmp.at<uint8_t>(0, y);
+				for (int x = 0; x < w; ++x, p += 4)
+					pixels.push_back(to_argb(p[1], p[2], p[3], p[0]));
+			}
+			break;
+
+		case Rays::BGRA_8888:
+		case Rays::BGRX_8888:
+			for (int y = 0; y < h; ++y)
+			{
+				const auto* p = bmp.at<uint8_t>(0, y);
+				for (int x = 0; x < w; ++x, p += 4)
+					pixels.push_back(to_argb(p[2], p[1], p[0], p[3]));
+			}
+			break;
+
+		case Rays::ABGR_8888:
+		case Rays::XBGR_8888:
+			for (int y = 0; y < h; ++y)
+			{
+				const auto* p = bmp.at<uint8_t>(0, y);
+				for (int x = 0; x < w; ++x, p += 4)
+					pixels.push_back(to_argb(p[3], p[2], p[1], p[0]));
+			}
+			break;
+
+		default:
+			return nil();
 	}
 
+	return value(
+		(const char*) &pixels[0], pixels.size() * sizeof(uint32_t),
+		rb_ascii8bit_encoding());
+}
+
+static
+VALUE set_pixels(VALUE self, VALUE pixels)
+{
+	CHECK;
+
 	set_pixels(THIS, pixels);
 	return pixels;
 }
@@ -552,11 +620,10 @@ VALUE get_pixels(VALUE self)
 {
 	CHECK;
 
-	if (sizeof(VALUE) <= 4)
-	{
-		not_implemented_error(
-			__FILE__, __LINE__, "Bitmap#pixels() does not support 32-bit platforms");
-	}
+#ifdef RAYS_32BIT_PIXELS_STRING
+	Value str = get_32bit_pixels_string(*THIS);
+	if (str) return str;
+#endif
 
 	std::vector<VALUE> pixels;
 	get_pixels(&pixels, *THIS);
@@ -603,7 +670,7 @@ Init_rays_bitmap ()
 	rb_define_method(cBitmap, "height", RUBY_METHOD_FUNC(height), 0);
 	rb_define_method(cBitmap, "color_space", RUBY_METHOD_FUNC(color_space), 0);
 	rb_define_method(cBitmap, "pixels=", RUBY_METHOD_FUNC(set_pixels), 1);
-	rb_define_method(cBitmap, "pixels", RUBY_METHOD_FUNC(get_pixels), 0);
+	cBitmap.define_method("pixels!", get_pixels);
 	cBitmap.define_method("[]=", set_at);
 	cBitmap.define_method("[]",  get_at);
 }

data/.doc/ext/rays/bounds.cpp

@@ -6,7 +6,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::Bounds)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Bounds)
 
 #define THIS  to<Rays::Bounds*>(self)
 
@@ -70,7 +70,7 @@ VALUE move_to(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#move_to", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_to(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -96,7 +96,7 @@ VALUE move_by(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#move_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -121,7 +121,7 @@ VALUE resize_to(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#resize_to", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->resize_to(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -147,7 +147,7 @@ VALUE resize_by(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#resize_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->resize_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -172,7 +172,7 @@ VALUE inset_by(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Bounds#inset_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->inset_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -460,7 +460,9 @@ VALUE set_at(VALUE self, VALUE index, VALUE value)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 1 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 1)
 		index_error(__FILE__, __LINE__);
 
 	(*THIS)[i] = to<Rays::Point&>(value);
@@ -473,7 +475,9 @@ VALUE get_at(VALUE self, VALUE index)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 1 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 1)
 		index_error(__FILE__, __LINE__);
 
 	return value((*THIS)[i]);
@@ -495,9 +499,9 @@ VALUE op_or(VALUE self, VALUE arg)
 	CHECK;
 
 	Rays::Bounds b = *THIS;
-	if (arg.is_kind_of(Rays::bounds_class()))
+	if (arg.is_a(Rays::bounds_class()))
 		b |= to<Rays::Bounds&>(arg);
-	else if (arg.is_kind_of(Rays::point_class()))
+	else if (arg.is_a(Rays::point_class()))
 		b |= to<Rays::Point&>(arg);
 	else
 		argument_error(__FILE__, __LINE__);
@@ -582,7 +586,7 @@ namespace Rucy
 {
 
 
-	template <> Rays::Bounds
+	template <> RAYS_EXPORT Rays::Bounds
 	value_to<Rays::Bounds> (int argc, const Value* argv, bool convert)
 	{
 		if (argc == 1 && argv->is_array())
@@ -597,7 +601,7 @@ namespace Rucy
 		{
 			if (argc == 0)
 				return Rays::Bounds();
-			else if (argv->is_kind_of(Rays::point_class()))
+			else if (argv->is_a(Rays::point_class()))
 			{
 				switch (argc)
 				{

data/.doc/ext/rays/camera.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Camera)
+RUCY_DEFINE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Camera)
 
 #define THIS  to<Rays::Camera*>(self)
 

data/.doc/ext/rays/color.cpp

@@ -6,7 +6,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::Color)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Color)
 
 #define THIS  to<Rays::Color*>(self)
 
@@ -330,7 +330,7 @@ namespace Rucy
 			return find_color(str_.c_str());
 	}
 
-	template <> Rays::Color
+	template <> RAYS_EXPORT Rays::Color
 	value_to<Rays::Color> (int argc, const Value*argv, bool convert)
 	{
 		if (argc == 1 && argv->is_array())

data/.doc/ext/rays/color_space.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::ColorSpace)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::ColorSpace)
 
 #define THIS  to<Rays::ColorSpace*>(self)
 
@@ -206,7 +206,7 @@ namespace Rucy
 {
 
 
-	template <> Rays::ColorSpace
+	template <> RAYS_EXPORT Rays::ColorSpace
 	value_to<Rays::ColorSpace> (int argc, const Value* argv, bool convert)
 	{
 		if (argc == 1 && argv->is_array())
@@ -234,7 +234,7 @@ namespace Rucy
 	}
 
 
-	template <> Rays::ColorSpaceType
+	template <> RAYS_EXPORT Rays::ColorSpaceType
 	value_to<Rays::ColorSpaceType> (Value value, bool convert)
 	{
 		if (convert)

data/.doc/ext/rays/defs.cpp

@@ -84,7 +84,7 @@ void get_rect_args (
 	if (argc <= 0)
 		argument_error(__FILE__, __LINE__);
 
-	if (argv[0].is_kind_of(Rays::bounds_class()))
+	if (argv[0].is_a(Rays::bounds_class()))
 	{
 		Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x  = b.x;
@@ -96,7 +96,7 @@ void get_rect_args (
 		*lb = argc >= 4 ? to<coord>(argv[3]) : *lt;
 		*rb = argc >= 5 ? to<coord>(argv[4]) : *lt;
 	}
-	else if (argv[0].is_kind_of(Rays::point_class()))
+	else if (argv[0].is_a(Rays::point_class()))
 	{
 		if (argc < 2)
 			argument_error(__FILE__, __LINE__);
@@ -154,7 +154,7 @@ void get_ellipse_args (
 	{
 		*x = *y = *w = *h = 0;
 	}
-	else if (argv[0].is_kind_of(Rays::bounds_class()))
+	else if (argv[0].is_a(Rays::bounds_class()))
 	{
 		const Rays::Bounds& b = to<Rays::Bounds&>(argv[0]);
 		*x = b.x;
@@ -162,7 +162,7 @@ void get_ellipse_args (
 		*w = b.w;
 		*h = b.h;
 	}
-	else if (argv[0].is_kind_of(Rays::point_class()))
+	else if (argv[0].is_a(Rays::point_class()))
 	{
 		if (argc < 2)
 			argument_error(__FILE__, __LINE__);

data/.doc/ext/rays/font.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::Font)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Font)
 
 #define THIS  to<Rays::Font*>(self)
 
@@ -156,7 +156,7 @@ namespace Rucy
 {
 
 
-	template <> Rays::Font
+	template <> RAYS_EXPORT Rays::Font
 	value_to<Rays::Font> (int argc, const Value* argv, bool convert)
 	{
 		if (argc == 1 && argv->is_array())
@@ -172,7 +172,8 @@ namespace Rucy
 			if (argc == 0)
 				return Rays::get_default_font();
 
-			coord size = argc >= 2 ? to<coord>(argv[1]) : Rays::Font::DEFAULT_SIZE;
+			coord size =
+				argc >= 2 ? to<coord>(argv[1]) : (coord) Rays::Font::DEFAULT_SIZE;
 			if (argv->is_nil())
 				return Rays::Font(NULL, size);
 			else if (argv->is_s() || argv->is_sym())

data/.doc/ext/rays/image.cpp

@@ -7,7 +7,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Image)
+RUCY_DEFINE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Image)
 
 #define THIS  to<Rays::Image*>(self)
 
@@ -21,31 +21,28 @@ VALUE alloc(VALUE klass)
 }
 
 static
-VALUE initialize(VALUE self)
+VALUE initialize(VALUE self, VALUE args, VALUE pixel_density, VALUE smooth)
 {
 	RUCY_CHECK_OBJ(Rays::Image, self);
-	check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2, 3, 4);
 
-	if (argv[0].is_kind_of(Rays::bitmap_class()))
-	{
-		check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2);
+	size_t argc = args.size();
+	check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 1, 2, 3);
 
-		const Rays::Bitmap* bitmap = to<Rays::Bitmap*>(argv[0]);
-		if (!bitmap)
+	float pd = to<float>(pixel_density);
+	if (args[0].is_a(Rays::bitmap_class()))
+	{
+		const Rays::Bitmap* bmp = to<Rays::Bitmap*>(args[0]);
+		if (!bmp)
 			argument_error(__FILE__, __LINE__);
 
-		float pixel_density = (argc >= 2) ? to<float>(argv[1]) : 1;
-		*THIS = Rays::Image(*bitmap, pixel_density);
+		*THIS = Rays::Image(*bmp, pd, smooth);
 	}
 	else
 	{
-		check_arg_count(__FILE__, __LINE__, "Image#initialize", argc, 2, 3, 4);
-
-		int width           = to<int>(argv[0]);
-		int height          = to<int>(argv[1]);
-		Rays::ColorSpace cs = (argc >= 3) ? to<Rays::ColorSpace>(argv[2]) : Rays::RGBA;
-		float pixel_density = (argc >= 4) ? to<float>(argv[3]) : 1;
-		*THIS = Rays::Image(width, height, cs, pixel_density);
+		int width  = to<int>(args[0]);
+		int height = to<int>(args[1]);
+		auto cs    = (argc >= 3) ? to<Rays::ColorSpace>(args[2]) : Rays::RGBA;
+		*THIS = Rays::Image(width, height, cs, pd, smooth);
 	}
 
 	return self;
@@ -110,6 +107,21 @@ VALUE get_bitmap(VALUE self, VALUE modify)
 	return value(THIS->bitmap(modify));
 }
 
+static
+VALUE set_smooth(VALUE self, VALUE smooth)
+{
+	CHECK;
+	THIS->set_smooth(smooth);
+	return smooth;
+}
+
+static
+VALUE get_smooth(VALUE self)
+{
+	CHECK;
+	return value(THIS->smooth());
+}
+
 static
 VALUE load(VALUE self, VALUE path)
 {
@@ -126,7 +138,7 @@ Init_rays_image ()
 
 	cImage = rb_define_class_under(mRays, "Image", rb_cObject);
 	rb_define_alloc_func(cImage, alloc);
-	rb_define_private_method(cImage, "initialize", RUBY_METHOD_FUNC(initialize), -1);
+	cImage.define_private_method("initialize!",     initialize);
 	rb_define_private_method(cImage, "initialize_copy", RUBY_METHOD_FUNC(initialize_copy), 1);
 	rb_define_method(cImage, "save", RUBY_METHOD_FUNC(save), 1);
 	rb_define_method(cImage, "width", RUBY_METHOD_FUNC(width), 0);
@@ -135,6 +147,8 @@ Init_rays_image ()
 	rb_define_method(cImage, "pixel_density", RUBY_METHOD_FUNC(pixel_density), 0);
 	rb_define_method(cImage, "painter", RUBY_METHOD_FUNC(painter), 0);
 	rb_define_private_method(cImage, "get_bitmap", RUBY_METHOD_FUNC(get_bitmap), 1);
+	rb_define_method(cImage, "smooth=", RUBY_METHOD_FUNC(set_smooth), 1);
+	rb_define_method(cImage, "smooth", RUBY_METHOD_FUNC(get_smooth), 0);
 	rb_define_module_function(cImage, "load", RUBY_METHOD_FUNC(load), 1);
 }
 

data/.doc/ext/rays/matrix.cpp

@@ -6,7 +6,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::Matrix)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Matrix)
 
 #define THIS  to<Rays::Matrix*>(self)
 
@@ -127,10 +127,10 @@ VALUE mult(VALUE self, VALUE val)
 {
 	CHECK;
 
-	if (val.is_kind_of(Rays::matrix_class()))
+	if (val.is_a(Rays::matrix_class()))
 		return value(*THIS * to<Rays::Matrix&>(val));
 
-	if (val.is_kind_of(Rays::point_class()))
+	if (val.is_a(Rays::point_class()))
 		return value(*THIS * to<Rays::Point&>(val));
 
 	if (val.is_array())
@@ -214,10 +214,10 @@ VALUE s_ortho(VALUE self)
 }
 
 static
-VALUE s_perspective(VALUE self, VALUE fov_y, VALUE aspect_ratio, VALUE near, VALUE far)
+VALUE s_perspective(VALUE self, VALUE fov_y, VALUE aspect_ratio, VALUE near_, VALUE far_)
 {
 	return value(Rays::perspective(
-		to<float>(fov_y), to<float>(aspect_ratio), to<coord>(near), to<coord>(far)));
+		to<float>(fov_y), to<float>(aspect_ratio), to<coord>(near_), to<coord>(far_)));
 }
 
 static
@@ -281,7 +281,7 @@ namespace Rucy
 {
 
 
-	template <> Rays::Matrix
+	template <> RAYS_EXPORT Rays::Matrix
 	value_to<Rays::Matrix> (int argc, const Value* argv, bool convert)
 	{
 		if (argc == 1 && argv->is_array())

data/.doc/ext/rays/painter.cpp

@@ -12,7 +12,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(Rays::Painter)
+RUCY_DEFINE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Painter)
 
 #define THIS  to<Rays::Painter*>(self)
 

data/.doc/ext/rays/point.cpp

@@ -5,7 +5,7 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(Rays::Point)
+RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Point)
 
 #define THIS  to<Rays::Point*>(self)
 
@@ -44,7 +44,7 @@ VALUE move_to(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Point#move_to", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_to(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -64,7 +64,7 @@ VALUE move_by(VALUE self)
 	CHECK;
 	check_arg_count(__FILE__, __LINE__, "Point#move_by", argc, 1, 2, 3);
 
-	if (argv[0].is_kind_of(Rays::point_class()))
+	if (argv[0].is_a(Rays::point_class()))
 		THIS->move_by(to<Rays::Point&>(argv[0]));
 	else
 	{
@@ -204,7 +204,9 @@ VALUE set_at(VALUE self, VALUE index, VALUE value)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 2 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 2)
 		index_error(__FILE__, __LINE__);
 
 	(*THIS)[i] = to<coord>(value);
@@ -217,7 +219,9 @@ VALUE get_at(VALUE self, VALUE index)
 	CHECK;
 
 	int i = index.as_i();
-	if (i < 0 || 2 < i)
+	if (i < 0)
+		index_error(__FILE__, __LINE__);
+	if (i > 2)
 		index_error(__FILE__, __LINE__);
 
 	return value((*THIS)[i]);
@@ -275,7 +279,7 @@ namespace Rucy
 {
 
 
-	template <> Rays::Point
+	template <> RAYS_EXPORT Rays::Point
 	value_to<Rays::Point> (int argc, const Value* argv, bool convert)
 	{
 		if (argc == 1 && argv->is_array())