Kill off synfig ./bootstrap

[synfig.git] / synfig-core / trunk / src / modules / lyr_freetype / lyr_freetype.cpp

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..2ef7eae 100644 (file)
--- 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());
@@ -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);
@@ -818,7 +823,14 @@ 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.
+               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);
 
@@ -843,7 +855,7 @@ Layer_Freetype::accelerated_render(Context context,Surface *surface,int quality,
                                for(u=0;u<bit->bitmap.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 &&
                                                y<surface->get_h() &&