rays 0.4.0 → 0.5.0

data/src/sdl/font.cpp

@@ -20,7 +20,11 @@ namespace Rays
 
 		String name;
 
-		coord size = 0;
+		coord size  = 0;
+
+		int weight  = Font::WEIGHT_NORMAL;
+
+		bool italic = false;
 
 		virtual ~Data ()
 		{
@@ -63,7 +67,7 @@ namespace Rays
 
 		String path;
 
-		SDLFontData (const char* path, coord size)
+		SDLFontData (const char* path, coord size, int weight, bool italic)
 		{
 			if (!path)
 				argument_error(__FILE__, __LINE__);
@@ -72,8 +76,16 @@ namespace Rays
 			if (!font)
 				rays_error(__FILE__, __LINE__, "failed to open font: %s", TTF_GetError());
 
-			this->path = path;
-			this->size = size;
+			this->path   = path;
+			this->size   = size;
+			this->weight = weight;
+			this->italic = italic;
+
+			int style = TTF_STYLE_NORMAL;
+			if (weight >= Font::WEIGHT_SEMIBOLD) style |= TTF_STYLE_BOLD;
+			if (italic)                          style |= TTF_STYLE_ITALIC;
+			if (style != TTF_STYLE_NORMAL)
+				TTF_SetFontStyle(font, style);
 
 			const char* family = TTF_FontFaceFamilyName(font);
 			if (family) this->name = family;
@@ -91,8 +103,9 @@ namespace Rays
 				rays_error(__FILE__, __LINE__, "TTF_RenderUTF8_Blended failed: %s", TTF_GetError());
 
 			SDL_Rect dst = {(int) x, (int) y, surface->w, surface->h};
+			// blending onto zeros premultiplies the straight alpha of SDL_ttf
 			SDL_FillRect(target, &dst, 0);
-			SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE);
+			SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND);
 			SDL_BlitSurface(surface, NULL, target, &dst);
 			SDL_FreeSurface(surface);
 		}
@@ -126,7 +139,7 @@ namespace Rays
 
 		Data* dup (coord size) const override
 		{
-			return new SDLFontData(path.c_str(), size);
+			return new SDLFontData(path.c_str(), size, weight, italic);
 		}
 
 	};// SDLData
@@ -144,22 +157,22 @@ namespace Rays
 	});
 
 	EM_JS(double, rays_wasm_font_text_width_, (
-		const char* str, const char* name, double size),
+		const char* str, const char* name, double size, int weight, int italic),
 	{
 		const s = UTF8ToString(str);
 		const n = UTF8ToString(name);
 		const c = Module._raysFontContext;
-		c.font  = `${size}px "${n}"`;
+		c.font  = `${italic ? 'italic' : 'normal'} ${weight} ${size}px "${n}"`;
 		return c.measureText(s).width;
 	});
 
 	EM_JS(void, rays_wasm_font_get_metrics_, (
-		const char* name, double size,
+		const char* name, double size, int weight, int italic,
 		double* out_ascent, double* out_descent, double* out_leading),
 	{
 		const n   = UTF8ToString(name);
 		const c   = Module._raysFontContext;
-		c.font    = `${size}px "${n}"`;
+		c.font    = `${italic ? 'italic' : 'normal'} ${weight} ${size}px "${n}"`;
 		const m   = c.measureText('Mgjpqy');
 		const asc = Math.max(
 			m.  fontBoundingBoxAscent  ?? 0,
@@ -174,29 +187,30 @@ namespace Rays
 	});
 
 	EM_JS(void*, rays_wasm_font_render_, (
-		const char* str, const char* name, double size,
+		const char* str, const char* name, double size, int weight, int italic,
 		int* out_width,  int* out_height, double* out_ascent, double* out_descent),
 	{
-		const s   = UTF8ToString(str);
-		const n   = UTF8ToString(name);
-		const c   = Module._raysFontContext;
-		const cv  = Module._raysFontCanvas;
-		c.font    = `${size}px "${n}"`;
-		const m   = c.measureText(s);
-		const asc = Math.max(
+		const s    = UTF8ToString(str);
+		const n    = UTF8ToString(name);
+		const c    = Module._raysFontContext;
+		const cv   = Module._raysFontCanvas;
+		const font = `${italic ? 'italic' : 'normal'} ${weight} ${size}px "${n}"`;
+		c.font     = font;
+		const m    = c.measureText(s);
+		const asc  = Math.max(
 			m.  fontBoundingBoxAscent  ?? 0,
 			m.actualBoundingBoxAscent  ?? size * 0.8);
-		const dsc = Math.max(
+		const dsc  = Math.max(
 			m.  fontBoundingBoxDescent ?? 0,
 			m.actualBoundingBoxDescent ?? size * 0.2);
-		const w   = Math.max(1, Math.ceil(m.width));
-		const h   = Math.max(1, Math.ceil(asc + dsc));
+		const w    = Math.max(1, Math.ceil(m.width));
+		const h    = Math.max(1, Math.ceil(asc + dsc));
 
 		if (cv.width  < w) cv.width  = w;
 		if (cv.height < h) cv.height = h;
 
 		c.clearRect(0, 0, cv.width, cv.height);
-		c.font         = `${size}px "${n}"`;// re-apply after canvas resize
+		c.font         = font;// re-apply after canvas resize
 		c.fillStyle    = 'white';
 		c.textBaseline = 'alphabetic';
 		c.fillText(s, 0, asc);
@@ -234,12 +248,14 @@ namespace Rays
 	struct CanvasFontData : public RawFont::Data
 	{
 
-		CanvasFontData (const char* name, coord size)
+		CanvasFontData (const char* name, coord size, int weight, bool italic)
 		{
 			rays_wasm_font_init_();
 
-			this->name = name && *name != '\0' ? name : "sans-serif";
-			this->size = size;
+			this->name   = name && *name != '\0' ? name : "sans-serif";
+			this->size   = size;
+			this->weight = weight;
+			this->italic = italic;
 		}
 
 		void draw_string (SDL_Surface* target, const char* str, coord x, coord y) override
@@ -248,7 +264,7 @@ namespace Rays
 			double ascent = 0, descent = 0;
 			std::shared_ptr<void> pixels(
 				rays_wasm_font_render_(
-					str, name.c_str(), (double) size,
+					str, name.c_str(), (double) size, weight, italic,
 					&w, &h, &ascent, &descent),
 				free);
 			if (!pixels || w <= 0 || h <= 0) return;
@@ -260,21 +276,24 @@ namespace Rays
 				rays_error(__FILE__, __LINE__, "SDL_CreateRGBSurfaceFrom failed: %s", SDL_GetError());
 
 			SDL_Rect dest = {(int) x, (int) y, w, h};
+			// blending onto zeros premultiplies the straight alpha of the canvas
 			SDL_FillRect(target, &dest, 0);
-			SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_NONE);
+			SDL_SetSurfaceBlendMode(surface, SDL_BLENDMODE_BLEND);
 			SDL_BlitSurface(surface, NULL, target, &dest);
 			SDL_FreeSurface(surface);
 		}
 
 		coord get_width (const char* str) override
 		{
-			return (coord) rays_wasm_font_text_width_(str, name.c_str(), (double) size);
+			return (coord) rays_wasm_font_text_width_(
+				str, name.c_str(), (double) size, weight, italic);
 		}
 
 		coord get_height (coord* ascent, coord* descent, coord* leading) override
 		{
 			double asc = 0, desc = 0, lead = 0;
-			rays_wasm_font_get_metrics_(name.c_str(), (double) size, &asc, &desc, &lead);
+			rays_wasm_font_get_metrics_(
+				name.c_str(), (double) size, weight, italic, &asc, &desc, &lead);
 
 			if (ascent)  *ascent  = (coord) asc;
 			if (descent) *descent = (coord) desc;
@@ -290,7 +309,7 @@ namespace Rays
 
 		Data* dup (coord size) const override
 		{
-			return new CanvasFontData(name.c_str(), size);
+			return new CanvasFontData(name.c_str(), size, weight, italic);
 		}
 
 	};// CanvasData
@@ -334,7 +353,7 @@ namespace Rays
 	RawFont_load (const char* path, coord size)
 	{
 		RawFont rawfont;
-		rawfont.self.reset(new SDLFontData(path, size));
+		rawfont.self.reset(new SDLFontData(path, size, Font::WEIGHT_NORMAL, false));
 		return rawfont;
 	}
 
@@ -344,29 +363,23 @@ namespace Rays
 	}
 
 	static RawFont::Data*
-	create_data (const char* name, coord size)
+	create_data (const char* name, coord size, int weight, bool italic)
 	{
 #ifdef WASM
-		return new CanvasFontData(name, size);
+		return new CanvasFontData(name, size, weight, italic);
 #else
 		if (name)
 			not_implemented_error(__FILE__, __LINE__);
-		return new SDLFontData("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", size);
+		return new SDLFontData(
+			"/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", size, weight, italic);
 #endif
 	}
 
-	RawFont::RawFont (const char* name, coord size)
-	:	self(create_data(name, size))
+	RawFont::RawFont (const char* name, coord size, int weight, bool italic)
+	:	self(create_data(name, size, weight, italic))
 	{
 	}
 
-	RawFont::RawFont (const This& obj, coord size)
-	{
-		if (!obj) return;
-
-		self.reset(obj.self->dup(size));
-	}
-
 	RawFont::~RawFont ()
 	{
 	}
@@ -398,13 +411,6 @@ namespace Rays
 		return self->name;
 	}
 
-	coord
-	RawFont::size () const
-	{
-		if (!*this) return 0;
-		return self->size;
-	}
-
 	coord
 	RawFont::get_width (const char* str) const
 	{

data/src/win32/bitmap.cpp

@@ -1,11 +1,15 @@
 #include "../bitmap.h"
 
 
+#define STBI_WINDOWS_UTF8
+#define STBIW_WINDOWS_UTF8
+
 #define STB_IMAGE_IMPLEMENTATION
 #include <stb_image.h>
 #define STB_IMAGE_WRITE_IMPLEMENTATION
 #include <stb_image_write.h>
 
+#include <memory>
 #include "rays/exception.h"
 #include "rays/image.h"
 #include "rays/painter.h"
@@ -166,13 +170,13 @@ namespace Rays
 		}
 
 		const auto& cs = bitmap.color_space();
-		size_t w       = bitmap.width();
-		size_t h       = bitmap.height();
-		size_t pitch   = w * cs.Bpp();
+		int w          = bitmap.width();
+		int h          = bitmap.height();
+		int row_size   = w * cs.Bpp();
 
-		std::unique_ptr<uchar[]> pixels(new uchar[h * pitch]);
-		for (size_t y = 0; y < h; ++y)
-			memcpy(pixels.get() + pitch * y, bitmap.at<uchar>(0, y), pitch);
+		std::unique_ptr<uchar[]> pixels(new uchar[h * row_size]);
+		for (int y = 0; y < h; ++y)
+			memcpy(pixels.get() + row_size * y, bitmap.at<uchar>(0, y), row_size);
 
 		String ext = extension;
 		ext.downcase();
@@ -207,6 +211,10 @@ namespace Rays
 			p.end();
 			bmp = img.bitmap();
 		}
+
+		if (bmp.color_space().has_alpha())
+			bmp = bmp.dup(false);// stb_image_write expects straight alpha
+
 		save_bitmap(bmp, path);
 	}
 
@@ -217,16 +225,17 @@ namespace Rays
 			argument_error(__FILE__, __LINE__);
 
 		int w = 0, h = 0, Bpp = 0;
-		uchar* pixels = stbi_load(path, &w, &h, &Bpp, 0);
+		std::unique_ptr<uchar, decltype(&stbi_image_free)>
+			pixels(stbi_load(path, &w, &h, &Bpp, 0), stbi_image_free);
 		if (!pixels)
 			rays_error(__FILE__, __LINE__, "failed to load: '%s'", path);
 
 		ColorSpace cs;
 		switch (Bpp)
 		{
-			case 1: cs = GRAY_8;    break;
-			case 3: cs = RGB_888;   break;
-			case 4: cs = RGBA_8888; break;
+			case 1: cs = GRAY_8;  break;
+			case 3: cs = RGB_888; break;
+			case 4: cs = ColorSpace(RGBA_8888, false); break;// stb_image gives straight alpha
 			default:
 				rays_error(__FILE__, __LINE__, "unsupported image file: '%s'", path);
 		}
@@ -235,11 +244,11 @@ namespace Rays
 		if (!bmp)
 			rays_error(__FILE__, __LINE__, "failed to create Bitmap object");
 
-		int pitch = Bpp * w;
+		int size = Bpp * w;
 		for (int y = 0; y < h; ++y)
-			memcpy(bmp.at<uchar>(0, y), pixels + pitch * y, pitch);
+			memcpy(bmp.at<uchar>(0, y), pixels.get() + size * y, size);
 
-		return bmp;
+		return cs.has_alpha() ? bmp.dup(true) : bmp;
 	}
 
 	HBITMAP

data/src/win32/font.cpp

@@ -2,6 +2,7 @@
 
 
 #include <assert.h>
+#include <string>
 #include <set>
 #include "rays/exception.h"
 #include "gdi.h"
@@ -16,7 +17,7 @@ namespace Rays
 
 		Win32::Font font;
 
-		String path;
+		mutable coord height = -1, ascent = 0, descent = 0, leading = 0;
 
 	};// RawFont::Data
 
@@ -40,15 +41,18 @@ namespace Rays
 
 	static int CALLBACK
 	enum_callback (
-		const ENUMLOGFONT* elf, const NEWTEXTMETRIC* ntm, DWORD font_type, LPARAM lp)
+		const ENUMLOGFONTW* elf, const NEWTEXTMETRICW* ntm, DWORD font_type, LPARAM lp)
 	{
-		const auto* params = (EnumFontFamiliesCallbackParams*) lp;
-		const char* name   = params->fullname
-			?	(const char*) elf->elfFullName
-			:	(const char*) elf->elfLogFont.lfFaceName;
+		const auto* params  = (EnumFontFamiliesCallbackParams*) lp;
+		const wchar_t* name = params->fullname
+			?	elf->elfFullName
+			:	elf->elfLogFont.lfFaceName;
 
-		if (name && *name != '\0'  && *name != '@')
-			params->names->insert(name);
+		if (name && *name != L'\0' && *name != L'@')
+		{
+			size_t max_ = params->fullname ? LF_FULLFACESIZE : LF_FACESIZE;
+			params->names->insert(String(name, wcsnlen(name, max_)));
+		}
 
 		return TRUE;
 	}
@@ -57,16 +61,19 @@ namespace Rays
 	get_font_names (
 		StringSet* names, HDC hdc, const char* query = NULL, bool fullname = false)
 	{
-		assert(!query || strlen(query) < LF_FACESIZE);
-
-		LOGFONT lf   = {0};
+		LOGFONTW lf  = {0};
 		lf.lfCharSet = DEFAULT_CHARSET;
 
-		if (query) strcpy(lf.lfFaceName, query);
+		if (query)
+		{
+			std::wstring wquery = String(query).to_wstr();
+			assert(wquery.size() < LF_FACESIZE);
+			wcsncpy(lf.lfFaceName, wquery.c_str(), LF_FACESIZE - 1);
+		}
 
 		EnumFontFamiliesCallbackParams params(names, fullname);
-		EnumFontFamiliesEx(
-			hdc, &lf, (FONTENUMPROC) &enum_callback, (LPARAM) &params, 0);
+		EnumFontFamiliesExW(
+			hdc, &lf, (FONTENUMPROCW) &enum_callback, (LPARAM) &params, 0);
 	}
 
 	const FontFamilyMap&
@@ -105,18 +112,9 @@ namespace Rays
 	{
 	}
 
-	RawFont::RawFont (const char* name, coord size)
-	{
-		self->font = Win32::Font(name, size);
-	}
-
-	RawFont::RawFont (const This& obj, coord size)
+	RawFont::RawFont (const char* name, coord size, int weight, bool italic)
 	{
-		const char* path = obj.self->path.empty() ? NULL : obj.self->path.c_str();
-		if (path)
-			*this = RawFont_load(path, size);
-		else
-			self->font = Win32::Font(obj.name().c_str(), size);
+		self->font = Win32::Font(name, size, weight, italic);
 	}
 
 	RawFont::~RawFont ()
@@ -142,8 +140,10 @@ namespace Rays
 		if (!*this)
 			invalid_state_error(__FILE__, __LINE__);
 
+		std::wstring wstr = String(str).to_wstr();
+
 		coord width = 0, height = 0;
-		if (!self->font.get_extent(&width, &height, str))
+		if (!self->font.get_extent(&width, &height, wstr.c_str()))
 			rays_error(__FILE__, __LINE__, "failed to get font extent.");
 
 		DC dc               = hdc;
@@ -155,7 +155,7 @@ namespace Rays
 		dc.set_text_color(RGB(255, 255, 255));
 		dc.set_back_color(RGB(0, 0, 0));
 
-		BOOL ret = TextOutA(dc.handle(), x, y, str, strlen(str));
+		BOOL ret = TextOutW(dc.handle(), x, y, wstr.c_str(), (int) wstr.size());
 
 		dc.set_font(font);
 		dc.set_text_color(text_color);
@@ -172,13 +172,6 @@ namespace Rays
 		return self->font.name();
 	}
 
-	coord
-	RawFont::size () const
-	{
-		if (!*this) return 0;
-		return self->font.size();
-	}
-
 	coord
 	RawFont::get_width (const char* str) const
 	{
@@ -203,24 +196,30 @@ namespace Rays
 		if (!*this)
 			invalid_state_error(__FILE__, __LINE__);
 
-		if (ascent || descent || leading)
+		if (self->height < 0)
 		{
 			Win32::DC dc(GetDC(NULL), true, Win32::DC::RELEASE_DC);
 			dc.set_font(self->font);
 
-			TEXTMETRIC tm;
-			GetTextMetrics(dc.handle(), &tm);
+			TEXTMETRICW tm;
+			if (!GetTextMetricsW(dc.handle(), &tm))
+				rays_error(__FILE__, __LINE__, "failed to get font metrics");
+
+			coord height;
+			if (!self->font.get_extent(NULL, &height, L"X"))
+				rays_error(__FILE__, __LINE__, "failed to get font height");
 
-			if (ascent)  *ascent  = tm.tmAscent;
-			if (descent) *descent = tm.tmDescent;
-			if (leading) *leading = tm.tmExternalLeading;
+			self->height  = height;
+			self->ascent  = tm.tmAscent;
+			self->descent = tm.tmDescent;
+			self->leading = tm.tmExternalLeading;
 		}
 
-		coord height;
-		if (!self->font.get_extent(NULL, &height, "X"))
-			rays_error(__FILE__, __LINE__, "failed to get font height");
+		if (ascent)  *ascent  = self->ascent;
+		if (descent) *descent = self->descent;
+		if (leading) *leading = self->leading;
 
-		return height;
+		return self->height;
 	}
 
 	RawFont::operator bool () const

data/src/win32/gdi.cpp

@@ -2,6 +2,8 @@
 
 
 #include <assert.h>
+#include <math.h>
+#include <string>
 #include <vector>
 
 
@@ -117,7 +119,7 @@ namespace Rays
 				return false;
 
 			LOGPEN logpen;
-			if (!GetObject(handle(), sizeof(logpen), &logpen))
+			if (!GetObjectW(handle(), sizeof(logpen), &logpen))
 				return false;
 
 			if (red)   *red   = GetRValue(logpen.lopnColor);
@@ -179,7 +181,7 @@ namespace Rays
 				return false;
 
 			LOGBRUSH logbrush;
-			if (!GetObject(handle(), sizeof(logbrush), &logbrush))
+			if (!GetObjectW(handle(), sizeof(logbrush), &logbrush))
 				return false;
 
 			if (red)   *red   = GetRValue(logbrush.lbColor);
@@ -215,34 +217,34 @@ namespace Rays
 
 
 		static HFONT
-		create_font (const char* name, coord size = 0)
+		create_font (const char* name, coord size, int weight, bool italic)
 		{
-			NONCLIENTMETRICSA metrics;
+			NONCLIENTMETRICSW metrics;
 			memset(&metrics, 0, sizeof(metrics));
 			metrics.cbSize = sizeof(metrics);
 
-			if (!SystemParametersInfoA(
+			if (!SystemParametersInfoW(
 				SPI_GETNONCLIENTMETRICS, sizeof(metrics), &metrics, 0))
 			{
 				return NULL;
 			}
 
-			LOGFONTA& logfont = metrics.lfMessageFont;
+			LOGFONTW& logfont = metrics.lfMessageFont;
 
 			if (name)
-				strcpy(logfont.lfFaceName, name);
-
-			if (size == 0)
-				logfont.lfHeight = 0;
-			else
 			{
-				logfont.lfHeight = -MulDiv(
-					size,
-					GetDeviceCaps(screen_dc().handle(), LOGPIXELSY),
-					72);
+				std::wstring wname = String(name).to_wstr();
+				wcsncpy(logfont.lfFaceName, wname.c_str(), LF_FACESIZE - 1);
+				logfont.lfFaceName[LF_FACESIZE - 1] = L'\0';
 			}
 
-			return CreateFontIndirectA(&logfont);
+			logfont.lfHeight = size == 0 ? 0 : -(LONG) fmax(1, round(size));
+
+			if (weight == 0) weight = 1;// 0 == FW_DONTCARE
+			if (weight >= 0) logfont.lfWeight = weight;
+			if (italic)      logfont.lfItalic = TRUE;
+
+			return CreateFontIndirectW(&logfont);
 		}
 
 
@@ -252,9 +254,9 @@ namespace Rays
 			self->handle.reset(handle, owner);
 		}
 
-		Font::Font (const char* name, coord size)
+		Font::Font (const char* name, coord size, int weight, bool italic)
 		{
-			self->handle.reset(create_font(name, size));
+			self->handle.reset(create_font(name, size, weight, italic));
 		}
 
 		Font::~Font ()
@@ -262,16 +264,15 @@ namespace Rays
 		}
 
 		static bool
-		calc_size (
-			coord* width, coord* height, HDC hdc, const char* str)
+		calc_size (coord* width, coord* height, HDC hdc, const wchar_t* str)
 		{
 			if (!width || !height || !hdc || !str) return false;
 
-			bool empty = *str == '\0';
-			if (empty) str = " ";
+			bool empty = *str == L'\0';
+			if (empty) str = L" ";
 
 			RECT rect = {0, 0, 0, 0};
-			int ret = DrawTextA(
+			int ret = DrawTextW(
 				hdc, str, -1, &rect,
 				DT_EXPANDTABS | DT_NOPREFIX | DT_CALCRECT);
 			if (!ret) return false;
@@ -282,10 +283,16 @@ namespace Rays
 		}
 
 		bool
-		Font::get_extent (
-			coord* width, coord* height, const char* str, HDC hdc)
+		Font::get_extent (coord* width, coord* height, const char* str, HDC hdc)
+		{
+			if (!str) return false;
+			return get_extent(width, height, String(str).to_wstr().c_str(), hdc);
+		}
+
+		bool
+		Font::get_extent (coord* width, coord* height, const wchar_t* str, HDC hdc)
 		{
-			if (!*this || (!width && !height))
+			if (!*this || (!width && !height) || !str)
 				return false;
 
 			if (width)  *width  = 0;
@@ -312,12 +319,12 @@ namespace Rays
 		{
 			if (!*this) return "";
 
-			LOGFONT logfont;
+			LOGFONTW logfont;
 			int size = sizeof(logfont);
-			if (GetObject(self->handle.handle(), size, &logfont) != size)
+			if (GetObjectW(self->handle.handle(), size, &logfont) != size)
 				return "";
 
-			return logfont.lfFaceName;
+			return String(logfont.lfFaceName, wcsnlen(logfont.lfFaceName, LF_FACESIZE));
 		}
 
 		coord
@@ -325,22 +332,12 @@ namespace Rays
 		{
 			if (!*this) return 0;
 
-			LOGFONT logfont;
+			LOGFONTW logfont;
 			int size = sizeof(logfont);
-			if (GetObject(self->handle.handle(), size, &logfont) != size)
+			if (GetObjectW(self->handle.handle(), size, &logfont) != size)
 				return 0;
 
-			if (logfont.lfHeight >= 0)
-				return logfont.lfHeight;
-
-			if (logfont.lfHeight < 0)
-			{
-				return -MulDiv(
-					logfont.lfHeight, 72,
-					GetDeviceCaps(screen_dc().handle(), LOGPIXELSY));
-			}
-			else
-				return logfont.lfHeight;
+			return logfont.lfHeight >= 0 ? logfont.lfHeight : -logfont.lfHeight;
 		}
 
 		HFONT
@@ -373,8 +370,8 @@ namespace Rays
 		static bool
 		load_bitmap (uint id, HINSTANCE hinst = NULL)
 		{
-			if (!hinst) hinst = (HINSTANCE) GetModuleHandle(NULL);
-			self->handle.reset(LoadBitmap(hinst, MAKEINTRESOURCE(id)));
+			if (!hinst) hinst = (HINSTANCE) GetModuleHandleW(NULL);
+			self->handle.reset(LoadBitmapW(hinst, MAKEINTRESOURCEW(id)));
 			return !!self->handle;
 		}
 #endif
@@ -398,7 +395,7 @@ namespace Rays
 		Bitmap::width () const
 		{
 			BITMAP bmp;
-			if (!*this || !GetObject(handle(), sizeof(bmp), &bmp))
+			if (!*this || !GetObjectW(handle(), sizeof(bmp), &bmp))
 				return 0;
 			return bmp.bmWidth;
 		}
@@ -407,7 +404,7 @@ namespace Rays
 		Bitmap::height () const
 		{
 			BITMAP bmp;
-			if (!*this || !GetObject(handle(), sizeof(bmp), &bmp))
+			if (!*this || !GetObjectW(handle(), sizeof(bmp), &bmp))
 				return 0;
 			return bmp.bmHeight;
 		}