[Bf-blender-cvs] [2420a3c] master: Fix T42797: -Werror=sign-conversion Triggered in blf_glyph.c

Bastien Montagne noreply at git.blender.org
Thu Dec 4 10:24:26 CET 2014


Commit: 2420a3c189951dbe910bd65e3b2c58082bfb4b1b
Author: Bastien Montagne
Date:   Thu Dec 4 10:23:21 2014 +0100
Branches: master
https://developer.blender.org/rB2420a3c189951dbe910bd65e3b2c58082bfb4b1b

Fix T42797: -Werror=sign-conversion Triggered in blf_glyph.c

Very minor, but since it was reported...

===================================================================

M	source/blender/blenfont/intern/blf_glyph.c

===================================================================

diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index 7978d28..c65a082 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -262,8 +262,8 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c)
 	g->xoff = -1;
 	g->yoff = -1;
 	bitmap = slot->bitmap;
-	g->width = bitmap.width;
-	g->height = bitmap.rows;
+	g->width = (int)bitmap.width;
+	g->height = (int)bitmap.rows;
 
 	if (g->width && g->height) {
 		if (sharp) {




More information about the Bf-blender-cvs mailing list