X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-core%2Ftrunk%2Fsrc%2Fmodules%2Flyr_freetype%2Flyr_freetype.cpp;h=2ef7eae19c2d3cc40772c738c52a9511454a4203;hb=e39139a360bdc175b83df6d2fab68deff8b9813f;hp=875c0ce834bcc81c390507beb6d4ea5eef4e13f2;hpb=9b87e7fe2cab74dc078185c08bf8c51f7ec8c32a;p=synfig.git

diff --git a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp
index 875c0ce..2ef7eae 100644
--- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp
+++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp
@@ -381,7 +381,7 @@ Layer_Freetype::new_face(const String &newfont)
 		FcResult result;
 		if( !FcInit() )
 		{
-			synfig::warning("Layer_Freetype: fontconfig: %s",_("unable to initialise"));
+			synfig::warning("Layer_Freetype: fontconfig: %s",_("unable to initialize"));
 			error = 1;
 		} else {
 			FcPattern* pat = FcNameParse((FcChar8 *) newfont.c_str());
@@ -823,13 +823,13 @@ Layer_Freetype::accelerated_render(Context context,Surface *surface,int quality,
 	for(curr_line=0,iter=lines.begin();iter!=lines.end();++iter,curr_line++)
 	{
 		bx=round_to_int((pos[0]-renddesc.get_tl()[0])*pw*CHAR_RESOLUTION-orient[0]*iter->width);
-		by=round_to_int((pos[1]-renddesc.get_tl()[1])*ph*CHAR_RESOLUTION+(1.0-orient[1])*string_height-line_height*curr_line);
-
 		// I've no idea why 1.5, but it kind of works.  Otherwise,
 		// rendering to .bmp (which renders from bottom to top, due to
 		// the .bmp format describing the image from bottom to top,
 		// renders text in the wrong place.
-		if (ph>0) by += line_height/1.5;
+		by=round_to_int((pos[1]-renddesc.get_tl()[1])*ph*CHAR_RESOLUTION +
+						(1.0-orient[1])*string_height-line_height*curr_line +
+						((ph>0) ? line_height/1.5 : 0));
 
 		//by=round_to_int(vcompress*((pos[1]-renddesc.get_tl()[1])*ph*64+(1.0-orient[1])*string_height-face->size->metrics.height*curr_line));
 		//synfig::info("curr_line=%d, bx=%d, by=%d",curr_line,bx,by);