From 9b87e7fe2cab74dc078185c08bf8c51f7ec8c32a Mon Sep 17 00:00:00 2001 From: dooglus Date: Wed, 24 Oct 2007 22:38:20 +0000 Subject: [PATCH] Crude attempt to get fonts not to render upside-down when rendering to .bmp files. git-svn-id: http://svn.voria.com/code@965 1f10aa63-cdf2-0310-b900-c93c546f37ac --- .../trunk/src/modules/lyr_freetype/lyr_freetype.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) 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 faef2c2..875c0ce 100644 --- a/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp +++ b/synfig-core/trunk/src/modules/lyr_freetype/lyr_freetype.cpp @@ -788,6 +788,11 @@ Layer_Freetype::accelerated_render(Context context,Surface *surface,int quality, float line_height; line_height=vcompress*((float)face->height*(((float)face->size->metrics.y_scale/METRICS_SCALE_ONE))); + // This module sees to expect pixel height to be negative, as it + // usually is. But rendering to .bmp format causes ph to be + // positive, which was causing text to be rendered upside down. + if (ph>0) line_height = -line_height; + int string_height; string_height=round_to_int(((lines.size()-1)*line_height+lines.back().actual_height())); //synfig::info("string_height=%d",string_height); @@ -819,6 +824,13 @@ Layer_Freetype::accelerated_render(Context context,Surface *surface,int quality, { 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(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); @@ -843,7 +855,7 @@ Layer_Freetype::accelerated_render(Context context,Surface *surface,int quality, for(u=0;ubitmap.width;u++) { int x=u+((pen.x+32)>>6)+ bit->left; - int y=v+((pen.y+32)>>6)- bit->top; + int y=((pen.y+32)>>6) + (bit->top - v) * ((ph<0) ? -1 : 1); if( y>=0 && x>=0 && yget_h() && -- 2.7.4