rays 0.4.0 → 0.5.0

data/.github/workflows/tag.yml

@@ -1,35 +1,12 @@
 name: Tag
 
 on:
-  push:
+  workflow_run:
+    workflows: [Test]
+    types: [completed]
     branches: [master]
 
 jobs:
   tag:
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: ruby 3.2
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.2
-
-      - name: checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          token: ${{ secrets.PAT }}
-
-      - name: setup dependencies
-        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies only: :xot'"
-
-      - name: setup user name and email
-        run: |
-          git config --global user.email "xordog@gmail.com"
-          git config --global user.name "xord"
-
-      - name: tag versions
-        run: "ruby -I.github/workflows -rutils -e 'tag_versions'"
-
-      - name: push tags
-        run: git push origin --tags
+    uses: xord/xot/.github/workflows/tag.yml@master
+    secrets: inherit

data/.github/workflows/test.yml

@@ -7,40 +7,4 @@ on:
 
 jobs:
   test:
-    runs-on: macos-latest
-
-    steps:
-      - name: ruby 3.2
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.2
-
-      - name: checkout
-        uses: actions/checkout@v4
-
-      - name: setup gems
-        run: bundle install
-
-      - name: setup dependencies
-        run: "ruby -I.github/workflows -rutils -e 'setup_dependencies'"
-
-      - name: packages
-        run: bundle exec rake verbose packages
-
-      - name: setup zig
-        if: github.event.repository.name == 'reflex-terminal'
-        uses: mlugg/setup-zig@v2
-        with:
-          version: 0.16.0
-
-      - name: vendor
-        run: bundle exec rake vendor
-
-      - name: lib
-        run: bundle exec rake verbose lib
-
-      - name: ext
-        run: bundle exec rake verbose ext
-
-      - name: test
-        run: bundle exec rake verbose test
+    uses: xord/xot/.github/workflows/test.yml@master

data/ChangeLog.md

@@ -1,6 +1,27 @@
 # rays ChangeLog
 
 
+## [v0.5.0] - 2026-11-04
+
+- [BREAKING] Store and blend alpha premultiplied on the GPU, so a fragment shader sees premultiplied samples and must emit premultiplied color
+- [BREAKING] Bitmap#pixels exchanges straight alpha, not premultiplied
+- [BREAKING] Size fonts in pixels on Windows, as on the other platforms
+- [BREAKING] Font#name returns the name asked for, and Font#name(true) the name of the face the platform picked
+- Add weight and italic to Font
+- Add Font#italic? and #smooth?, and Image#smooth?
+- Handle non-ASCII text and file paths on Windows
+- Support High DPI on Windows
+- Draw BGRA bitmaps on every platform
+- Make a paint session that draws nothing cost almost nothing, and stop waiting for the GPU at its end
+
+- Fix Font.new with no arguments sharing the default font, so that changing it changed every default font
+- Fix text drawn off its baseline at a pixel density other than 1
+- Fix a crash on the error paths, as loading a GIF from a missing file, on macOS
+- Fix a crash in Font.families when the GC runs
+- Fix an overflow of a font name longer than 31 characters on Windows
+- Fix linking the extension statically on macOS
+
+
 ## [v0.4.0] - 2026-08-04
 
 - [BREAKING] Rename COLORSPACE_UNKNOWN to COLORSPACE_NONE

data/Gemfile.lock

@@ -1,21 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    power_assert (3.0.1)
-    rake (13.3.1)
-    test-unit (3.7.7)
+    power_assert (3.1.0)
+    rake (13.4.2)
+    test-unit (3.7.8)
       power_assert
-    yard (0.9.39)
+    yard (0.9.45)
 
 PLATFORMS
-  arm64-darwin-21
-  arm64-darwin-23
-  arm64-darwin-24
+  ruby
 
 DEPENDENCIES
   rake
   test-unit
   yard
 
+CHECKSUMS
+  bundler (4.0.20) sha256=7978a8ac648767f5e635bc522445b79e80a52b907a39a36c2d8085ed6bc762ae
+  power_assert (3.1.0) sha256=fefe98ed5d3140628138f3f9f9194d6ece01f1320e69700d3c928adca7518251
+  rake (13.4.2) sha256=cb825b2bd5f1f8e91ca37bddb4b9aaf345551b4731da62949be002fa89283701
+  test-unit (3.7.8) sha256=689d1ca53f4d46f678b4e5d68d8e4294f87fc5e8b9238cc4de7c5727e8d65943
+  yard (0.9.45) sha256=52e211493f7cb8a3ebf7e104a25a1e73937a3103092545d34cb88fafebb3dc51
+
 BUNDLED WITH
-   2.4.19
+  4.0.20

data/Rakefile

@@ -37,7 +37,7 @@ use_external_library 'https://github.com/andrewwillmott/splines-lib',
   commit:   '11e7240d57b0d22871aec3308186a5fcf915ba77',
   excludes: 'Test\.cpp',
   &proc {
-    filter_file('Splines.cpp') do |cpp|
+    filter_file 'Splines.cpp' do |cpp|
       <<~EOS + cpp
         #include <cstdint>
       EOS
@@ -54,6 +54,6 @@ default_tasks :ext
 use_bundler
 build_native_library
 build_ruby_extension
-test_ruby_extension unless github_actions? && win32?
+test_ruby_extension
 generate_documents
 build_ruby_gem

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/ext/rays/bitmap.cpp

@@ -11,7 +11,7 @@ RUCY_DEFINE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Bitmap)
 
 #define THIS  to<Rays::Bitmap*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Bitmap, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Bitmap, self)
 
 
 static
@@ -24,7 +24,7 @@ RUCY_END
 static
 RUCY_DEFN(initialize)
 {
-	RUCY_CHECK_OBJ(Rays::Bitmap, self);
+	RUCY_CHECK_PTR(Rays::Bitmap, self);
 	check_arg_count(__FILE__, __LINE__, "Bitmap#initialize", argc, 2, 3);
 
 	*THIS = Rays::Bitmap(
@@ -38,7 +38,7 @@ RUCY_END
 static
 RUCY_DEF1(initialize_copy, obj)
 {
-	RUCY_CHECK_OBJ(Rays::Bitmap, self);
+	RUCY_CHECK_PTR(Rays::Bitmap, self);
 
 	*THIS = to<Rays::Bitmap&>(obj).dup();
 	return self;
@@ -73,7 +73,7 @@ RUCY_DEF0(color_space)
 RUCY_END
 
 static void
-set_pixels (Rays::Bitmap* bmp, Value pixels)
+set_raw_pixels (Rays::Bitmap* bmp, Value pixels)
 {
 	int w = bmp->width(), h = bmp->height();
 	const auto& cs = bmp->color_space();
@@ -323,6 +323,23 @@ set_pixels (Rays::Bitmap* bmp, Value pixels)
 	}
 }
 
+static void
+set_pixels (Rays::Bitmap* bmp, Value pixels)
+{
+	const auto& cs = bmp->color_space();
+	if (!cs.has_alpha() || !cs.is_premult())
+		return set_raw_pixels(bmp, pixels);
+
+	int w = bmp->width(), h = bmp->height();
+	Rays::Bitmap straight(w, h, Rays::ColorSpace(cs.type(), false));
+	set_raw_pixels(&straight, pixels);
+
+	Rays::Bitmap premult = straight.dup(true);
+	size_t size          = w * cs.Bpp();
+	for (int y = 0; y < h; ++y)
+		memcpy(bmp->at<uint8_t>(0, y), premult.at<uint8_t>(0, y), size);
+}
+
 static inline uint32_t
 to_rgb (uint8_t r, uint8_t g, uint8_t b)
 {
@@ -608,7 +625,7 @@ get_32bit_pixels_string (const Rays::Bitmap& bmp)
 	}
 
 	return value(
-		(const char*) &pixels[0], pixels.size() * sizeof(uint32_t),
+		(const char*) pixels.data(), pixels.size() * sizeof(uint32_t),
 		rb_ascii8bit_encoding());
 }
 
@@ -627,14 +644,17 @@ RUCY_DEF0(get_pixels)
 {
 	CHECK;
 
+	const auto& cs = THIS->color_space();
+	Rays::Bitmap bmp = cs.has_alpha() && cs.is_premult() ? THIS->dup(false) : *THIS;
+
 #ifdef RAYS_32BIT_PIXELS_STRING
-	Value str = get_32bit_pixels_string(*THIS);
+	Value str = get_32bit_pixels_string(bmp);
 	if (str) return str;
 #endif
 
 	std::vector<VALUE> pixels;
-	get_pixels(&pixels, *THIS);
-	return array((const Value*) &pixels[0], pixels.size());
+	get_pixels(&pixels, bmp);
+	return array((const Value*) pixels.data(), pixels.size());
 }
 RUCY_END
 

data/ext/rays/bounds.cpp

@@ -9,7 +9,7 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Bounds)
 
 #define THIS  to<Rays::Bounds*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::Bounds, self)
+#define CHECK RUCY_CHECK_PTR(Rays::Bounds, self)
 
 
 static

data/ext/rays/camera.cpp

@@ -10,7 +10,7 @@ RUCY_DEFINE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Camera)
 
 #define THIS  to<Rays::Camera*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Camera, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Camera, self)
 
 
 static
@@ -23,7 +23,7 @@ RUCY_END
 static
 RUCY_DEF5(initialize, device_name, min_width, min_height, resize, crop)
 {
-	RUCY_CHECK_OBJ(Rays::Camera, self);
+	RUCY_CHECK_PTR(Rays::Camera, self);
 
 	*THIS = Rays::Camera(
 		device_name ? device_name.c_str() : NULL,
@@ -146,10 +146,10 @@ RUCY_DEF0(device_names)
 {
 	auto names = Rays::get_camera_device_names();
 
-	std::vector<Value> v;
+	Value v = array(NULL, names.size());
 	for (const auto& name : names)
-		v.emplace_back(name.c_str());
-	return array(&v[0], v.size());
+		v.push(name.c_str());
+	return v;
 }
 RUCY_END
 

data/ext/rays/color.cpp

@@ -10,7 +10,7 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Color)
 
 #define THIS  to<Rays::Color*>(self)
 
-#define CHECK RUCY_CHECK_OBJ(Rays::Color, self)
+#define CHECK RUCY_CHECK_PTR(Rays::Color, self)
 
 
 static const char* NIL_COLOR_NO   = "no";

data/ext/rays/color_space.cpp

@@ -6,9 +6,11 @@
 
 RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::ColorSpace)
 
+RUCY_DEFINE_CONVERT_TO(RAYS_EXPORT, Rays::ColorSpaceType)
+
 #define THIS  to<Rays::ColorSpace*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::ColorSpace, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::ColorSpace, self)
 
 
 static struct ColorSpaceEnum
@@ -72,7 +74,7 @@ RUCY_END
 static
 RUCY_DEFN(initialize)
 {
-	RUCY_CHECK_OBJ(Rays::ColorSpace, self);
+	RUCY_CHECK_PTR(Rays::ColorSpace, self);
 	check_arg_count(__FILE__, __LINE__, "ColorSpace#initialize", argc, 1, 2);
 
 	*THIS = to<Rays::ColorSpace>(argc, argv);
@@ -248,13 +250,15 @@ namespace Rucy
 
 
 	template <> RAYS_EXPORT Rays::ColorSpaceType
-	value_to<Rays::ColorSpaceType> (Value value, bool convert)
+	value_to<Rays::ColorSpaceType> (int argc, const Value* argv, bool convert)
 	{
+		assert(argc > 0 && argv);
+
 		if (convert)
 		{
-			if (value.is_s() || value.is_sym())
+			if (argv->is_s() || argv->is_sym())
 			{
-				const char* str = value.c_str();
+				const char* str = argv->c_str();
 				for (size_t i = 0; i < COLOR_SPACES_SIZE; ++i)
 				{
 					if (strcasecmp(str, COLOR_SPACES[i].name) == 0)
@@ -263,7 +267,7 @@ namespace Rucy
 			}
 		}
 
-		uint type = value_to<uint>(value, convert);
+		uint type = value_to<uint>(*argv, convert);
 		if (type >= Rays::COLORSPACE_MAX)
 			argument_error(__FILE__, __LINE__, "invalid color space type -- %d", type);
 

data/ext/rays/defs.h

@@ -72,17 +72,17 @@ struct CreateParams
 
 	const Rays::Point* ppoints () const
 	{
-		return points.empty() ? NULL : &points[0];
+		return points.empty() ? NULL : points.data();
 	}
 
 	const Rays::Color* pcolors () const
 	{
-		return colors.empty() ? NULL : &colors[0];
+		return colors.empty() ? NULL : colors.data();
 	}
 
 	const Rays::Point* ptexcoords () const
 	{
-		return texcoords.empty() ? NULL : &texcoords[0];
+		return texcoords.empty() ? NULL : texcoords.data();
 	}
 
 	size_t size () const

data/ext/rays/extconf.rb

@@ -12,11 +12,12 @@ require 'rays/extension'
 Xot::ExtConf.new Xot, Rucy, Rays do
   setup do
     headers    << 'ruby.h'
-    libs.unshift 'gdi32', 'opengl32', 'glew32'           if win32?
-    libs.unshift 'SDL2', 'SDL2_ttf', 'GLEW', 'GL'        if linux? || wasm?
-    frameworks << 'AppKit' << 'OpenGL' << 'AVFoundation' if osx?
-    $CPPFLAGS << ' -DRAYS_32BIT_PIXELS_STRING'           if RUBY_PLATFORM == 'x64-mingw-ucrt'
-    $LDFLAGS  << ' -Wl,--out-implib=librays.dll.a'       if mingw? || cygwin?
+    libs.unshift 'gdi32', 'opengl32', 'glew32'     if win32?
+    libs.unshift 'SDL2', 'SDL2_ttf', 'GLEW', 'GL'  if linux? || wasm?
+    frameworks.concat %w[AppKit OpenGL
+      AVFoundation CoreMedia CoreImage CoreVideo]  if osx?
+    $CPPFLAGS << ' -DRAYS_32BIT_PIXELS_STRING'     if RUBY_PLATFORM == 'x64-mingw-ucrt'
+    $LDFLAGS  << ' -Wl,--out-implib=librays.dll.a' if mingw? || cygwin?
   end
 
   create_makefile 'rays_ext'

data/ext/rays/font.cpp

@@ -1,6 +1,7 @@
 #include "rays/ruby/font.h"
 
 
+#include <strings.h>
 #include "defs.h"
 
 
@@ -8,7 +9,7 @@ RUCY_DEFINE_VALUE_OR_ARRAY_FROM_TO(RAYS_EXPORT, Rays::Font)
 
 #define THIS  to<Rays::Font*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Font, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Font, self)
 
 
 static
@@ -21,7 +22,7 @@ RUCY_END
 static
 RUCY_DEFN(initialize)
 {
-	RUCY_CHECK_OBJ(Rays::Font, self);
+	RUCY_CHECK_PTR(Rays::Font, self);
 	check_arg_count(__FILE__, __LINE__, "Font#initialize", argc, 0, 1, 2, 3);
 
 	*THIS = to<Rays::Font>(argc, argv);
@@ -32,7 +33,7 @@ RUCY_END
 static
 RUCY_DEF1(initialize_copy, obj)
 {
-	RUCY_CHECK_OBJ(Rays::Font, self);
+	RUCY_CHECK_PTR(Rays::Font, self);
 
 	*THIS = to<Rays::Font&>(obj).dup();
 	return self;
@@ -40,10 +41,13 @@ RUCY_DEF1(initialize_copy, obj)
 RUCY_END
 
 static
-RUCY_DEF0(name)
+RUCY_DEFN(name)
 {
 	CHECK;
-	return value(THIS->name().c_str());
+	check_arg_count(__FILE__, __LINE__, "Font#name", argc, 0, 1);
+
+	bool resolved = argc >= 1 ? to<bool>(argv[0]) : false;
+	return value(THIS->name(resolved).c_str());
 }
 RUCY_END
 
@@ -64,6 +68,74 @@ RUCY_DEF0(size)
 }
 RUCY_END
 
+static int
+to_font_weight (Value weight)
+{
+	if (weight.is_s() || weight.is_sym())
+	{
+		static const struct {const char* name; int weight;} WEIGHTS[] =
+		{
+			// most used first
+			{"normal",     Rays::Font::WEIGHT_NORMAL},
+			{"regular",    Rays::Font::WEIGHT_NORMAL},
+			{"bold",       Rays::Font::WEIGHT_BOLD},
+
+			{"thin",       Rays::Font::WEIGHT_THIN},
+			{"extralight", Rays::Font::WEIGHT_EXTRALIGHT},
+			{"light",      Rays::Font::WEIGHT_LIGHT},
+			{"medium",     Rays::Font::WEIGHT_MEDIUM},
+			{"semibold",   Rays::Font::WEIGHT_SEMIBOLD},
+			{"extrabold",  Rays::Font::WEIGHT_EXTRABOLD},
+			{"black",      Rays::Font::WEIGHT_BLACK},
+		};
+
+		const char* name = weight.c_str();
+		for (const auto& w : WEIGHTS)
+		{
+			if (strcasecmp(name, w.name) == 0)
+				return w.weight;
+		}
+
+		argument_error(
+			__FILE__, __LINE__, "unknown font weight: %s", weight.inspect().c_str());
+	}
+	return to<int>(weight);
+}
+
+static
+RUCY_DEF1(set_weight, weight)
+{
+	CHECK;
+	THIS->set_weight(to_font_weight(weight));
+	return weight;
+}
+RUCY_END
+
+static
+RUCY_DEF0(weight)
+{
+	CHECK;
+	return value(THIS->weight());
+}
+RUCY_END
+
+static
+RUCY_DEF1(set_italic, italic)
+{
+	CHECK;
+	THIS->set_italic(to<bool>(italic));
+	return italic;
+}
+RUCY_END
+
+static
+RUCY_DEF0(get_italic)
+{
+	CHECK;
+	return value(THIS->italic());
+}
+RUCY_END
+
 static
 RUCY_DEF1(set_smooth, smooth)
 {
@@ -74,7 +146,7 @@ RUCY_DEF1(set_smooth, smooth)
 RUCY_END
 
 static
-RUCY_DEF0(smooth)
+RUCY_DEF0(get_smooth)
 {
 	CHECK;
 	return value(THIS->smooth());
@@ -133,10 +205,10 @@ RUCY_DEF0(families)
 	Hash hash;
 	for (const auto& family : Rays::get_font_families())
 	{
-		std::vector<Value> members;
+		Value members = array(NULL, family.second.size());
 		for (const auto& member : family.second)
-			members.emplace_back(member.c_str());
-		hash.set(family.first.c_str(), array(&members[0], members.size()));
+			members.push(member.c_str());
+		hash.set(family.first.c_str(), members);
 	}
 	return hash;
 }
@@ -171,8 +243,12 @@ Init_rays_font ()
 	cFont.define_method("name", name);
 	cFont.define_method("size=",   set_size);
 	cFont.define_method("size",        size);
+	cFont.define_method("weight=", set_weight);
+	cFont.define_method("weight",      weight);
+	cFont.define_method("italic=", set_italic);
+	cFont.define_method("italic",  get_italic);
 	cFont.define_method("smooth=", set_smooth);
-	cFont.define_method("smooth",      smooth);
+	cFont.define_method("smooth",  get_smooth);
 	cFont.define_method("width",   width);
 	cFont.define_method("height",  height);
 	cFont.define_method("ascent",  ascent);
@@ -180,6 +256,18 @@ Init_rays_font ()
 	cFont.define_method("leading", leading);
 	cFont.define_module_function("families", families);
 	cFont.define_module_function("load", load);
+
+	cFont.define_const("WEIGHT_MIN",        Rays::Font::WEIGHT_MIN);
+	cFont.define_const("WEIGHT_THIN",       Rays::Font::WEIGHT_THIN);
+	cFont.define_const("WEIGHT_EXTRALIGHT", Rays::Font::WEIGHT_EXTRALIGHT);
+	cFont.define_const("WEIGHT_LIGHT",      Rays::Font::WEIGHT_LIGHT);
+	cFont.define_const("WEIGHT_NORMAL",     Rays::Font::WEIGHT_NORMAL);
+	cFont.define_const("WEIGHT_MEDIUM",     Rays::Font::WEIGHT_MEDIUM);
+	cFont.define_const("WEIGHT_SEMIBOLD",   Rays::Font::WEIGHT_SEMIBOLD);
+	cFont.define_const("WEIGHT_BOLD",       Rays::Font::WEIGHT_BOLD);
+	cFont.define_const("WEIGHT_EXTRABOLD",  Rays::Font::WEIGHT_EXTRABOLD);
+	cFont.define_const("WEIGHT_BLACK",      Rays::Font::WEIGHT_BLACK);
+	cFont.define_const("WEIGHT_MAX",        Rays::Font::WEIGHT_MAX);
 }
 
 
@@ -198,16 +286,30 @@ namespace Rucy
 
 		if (convert)
 		{
-			if (argc == 0)
+			Value options = argc >= 1 && argv[argc - 1].is_hash() ? argv[--argc] : nil();
+			if (argc == 0 && !options)
 				return Rays::get_default_font();
 
-			coord size  = argc >= 2 ? to<coord>(argv[1]) : (coord) Rays::Font::DEFAULT_SIZE;
-			bool smooth = argc >= 3 ? to<bool>(argv[2])  : true;
-
-			if (argv->is_nil())
-				return Rays::Font(NULL, size, smooth);
-			else if (argv->is_s() || argv->is_sym())
-				return Rays::Font(argv[0].c_str(), size, smooth);
+			int weight  = Rays::Font::DEFAULT_WEIGHT;
+			bool italic = false;
+			bool smooth = true;
+			if (options)
+			{
+				RUCY_SYMBOL(weight_sym, "weight");
+				RUCY_SYMBOL(italic_sym, "italic");
+				RUCY_SYMBOL(smooth_sym, "smooth");
+				Value v;
+				if (!(v = options.get(weight_sym.value())).is_nil()) weight = to_font_weight(v);
+				if (!(v = options.get(italic_sym.value())).is_nil()) italic = to<bool>(v);
+				if (!(v = options.get(smooth_sym.value())).is_nil()) smooth = to<bool>(v);
+			}
+
+			if (argc == 0 || argv->is_nil() || argv->is_s() || argv->is_sym())
+			{
+				const char* name = argc >= 1 && !argv[0].is_nil() ? argv[0].c_str() : NULL;
+				coord size       = argc >= 2 ? to<coord>(argv[1]) : (coord) Rays::Font::DEFAULT_SIZE;
+				return Rays::Font(name, size, weight, italic, smooth);
+			}
 		}
 
 		if (argc != 1)

data/ext/rays/image.cpp

@@ -7,11 +7,31 @@
 #include "defs.h"
 
 
-RUCY_DEFINE_VALUE_FROM_TO(RAYS_EXPORT, Rays::Image)
+RUCY_DEFINE_VALUE_TO(RAYS_EXPORT, Rays::Image)
+
+namespace Rucy
+{
+
+	// An image with a loader is read-only, so its ruby object is frozen
+	RAYS_EXPORT Value
+	value (const Rays::Image& obj)
+	{
+		Value v = new_type(get_ruby_class<Rays::Image>(), new Rays::Image(obj));
+		if (obj.loader()) v.freeze();
+		return v;
+	}
+
+	RAYS_EXPORT Value
+	value (const Rays::Image* obj)
+	{
+		return obj ? value(*obj) : nil();
+	}
+
+}// Rucy
 
 #define THIS  to<Rays::Image*>(self)
 
-#define CHECK RUCY_CHECK_OBJECT(Rays::Image, self)
+#define CHECK RUCY_CHECK_OBJ(Rays::Image, self)
 
 
 static
@@ -24,7 +44,7 @@ RUCY_END
 static
 RUCY_DEF3(initialize, args, pixel_density, smooth)
 {
-	RUCY_CHECK_OBJ(Rays::Image, self);
+	RUCY_CHECK_PTR(Rays::Image, self);
 
 	size_t argc = args.size();
 	check_arg_count(__FILE__, __LINE__, "Image#initialize!", argc, 1, 2, 3);
@@ -53,7 +73,7 @@ RUCY_END
 static
 RUCY_DEF1(initialize_copy, obj)
 {
-	RUCY_CHECK_OBJ(Rays::Image, self);
+	RUCY_CHECK_PTR(Rays::Image, self);
 
 	*THIS = to<Rays::Image&>(obj).dup();
 	return self;
@@ -105,6 +125,7 @@ static
 RUCY_DEF0(painter)
 {
 	CHECK;
+	self.check_frozen();
 	return value(THIS->painter());
 }
 RUCY_END
@@ -113,6 +134,7 @@ static
 RUCY_DEF1(get_bitmap, modify)
 {
 	CHECK;
+	if (modify) self.check_frozen();
 	return value(THIS->bitmap(modify));
 }
 RUCY_END
@@ -121,6 +143,7 @@ static
 RUCY_DEF1(set_smooth, smooth)
 {
 	CHECK;
+	self.check_frozen();
 	THIS->set_smooth(smooth);
 	return smooth;
 }