Merge branch 'bug_539_add_multicontent_pixmap_progress'

[enigma2.git] / lib / gdi / font.cpp

diff --git a/lib/gdi/font.cpp b/lib/gdi/font.cpp
index c438f89b79a49a6836430b8c0017f23a62bc40ca..a5db43a9e3af99765f12ae4e91d933c5d38c1899 100644 (file)
--- a/lib/gdi/font.cpp
+++ b/lib/gdi/font.cpp
@@ -6,10 +6,21 @@
 #include <pthread.h>
 #include <sys/types.h>
 #include <unistd.h>
 #include <pthread.h>
 #include <sys/types.h>
 #include <unistd.h>

+#include <byteswap.h>
+
+#ifndef BYTE_ORDER
+#error "no BYTE_ORDER defined!"
+#endif

 
 // use this for init Freetype...
 #include <ft2build.h>
 #include FT_FREETYPE_H
 
 // use this for init Freetype...
 #include <ft2build.h>
 #include FT_FREETYPE_H

+#ifdef HAVE_FREETYPE2
+#define FTC_Image_Cache_New(a,b)       FTC_ImageCache_New(a,b)
+#define FTC_Image_Cache_Lookup(a,b,c,d)        FTC_ImageCache_Lookup(a,b,c,d,NULL)
+#define FTC_SBit_Cache_New(a,b)                FTC_SBitCache_New(a,b)
+#define FTC_SBit_Cache_Lookup(a,b,c,d) FTC_SBitCache_Lookup(a,b,c,d,NULL)
+#endif

 
 #include <lib/base/eerror.h>
 #include <lib/gdi/lcd.h>
 
 #include <lib/base/eerror.h>
 #include <lib/gdi/lcd.h>


@@ -30,9 +41,10 @@
 fontRenderClass *fontRenderClass::instance;
 
 static pthread_mutex_t ftlock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;
 fontRenderClass *fontRenderClass::instance;
 
 static pthread_mutex_t ftlock=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;

-static pthread_mutex_t refcntlck=PTHREAD_ADAPTIVE_MUTEX_INITIALIZER_NP;

 
 

+#ifndef HAVE_FREETYPE2

 static FTC_Font cache_current_font=0;
 static FTC_Font cache_current_font=0;

+#endif

 
 struct fntColorCacheKey
 {
 
 struct fntColorCacheKey
 {


@@ -198,9 +210,13 @@ float fontRenderClass::getLineHeight(const gFont& font)
                return 0;
        singleLock s(ftlock);
        FT_Face current_face;
                return 0;
        singleLock s(ftlock);
        FT_Face current_face;

+#ifdef HAVE_FREETYPE2
+       if ((FTC_Manager_LookupFace(cacheManager, fnt->scaler.face_id, &current_face) < 0) ||
+           (FTC_Manager_LookupSize(cacheManager, &fnt->scaler, &fnt->size) < 0))
+#else

        if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, &current_face, &fnt->size)<0)
        if (FTC_Manager_Lookup_Size(cacheManager, &fnt->font.font, &current_face, &fnt->size)<0)

+#endif

        {
        {

-               delete fnt;

                eDebug("FTC_Manager_Lookup_Size failed!");
                return 0;
        }
                eDebug("FTC_Manager_Lookup_Size failed!");
                return 0;
        }


@@ -247,10 +263,21 @@ DEFINE_REF(Font);
 Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
 {
        renderer=render;
 Font::Font(fontRenderClass *render, FTC_FaceID faceid, int isize, int tw): tabwidth(tw)
 {
        renderer=render;

+#ifdef HAVE_FREETYPE2
+       font.face_id = faceid;
+       font.width = isize;
+       font.height = isize;
+       font.flags = FT_LOAD_DEFAULT;
+       scaler.face_id = faceid;
+       scaler.width = isize;
+       scaler.height = isize;
+       scaler.pixel = 1;
+#else

        font.font.face_id=faceid;
        font.font.pix_width     = isize;
        font.font.pix_height = isize;
        font.image_type = ftc_image_grays;
        font.font.face_id=faceid;
        font.font.pix_width     = isize;
        font.font.pix_height = isize;
        font.image_type = ftc_image_grays;

+#endif

        height=isize;
        if (tabwidth==-1)
                tabwidth=8*isize;
        height=isize;
        if (tabwidth==-1)
                tabwidth=8*isize;


@@ -319,6 +346,8 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
                                i->x-=offset.x();
                                i->y-=offset.y();
                                i->bbox.moveBy(-offset.x(), -offset.y());
                                i->x-=offset.x();
                                i->y-=offset.y();
                                i->bbox.moveBy(-offset.x(), -offset.y());

+                               --lineChars.back();
+                               ++charCount;

                        } while (i-- != glyphs.rbegin()); // rearrange them into the next line
                        cursor+=ePoint(linelength, 0);  // put the cursor after that line
                } else
                        } while (i-- != glyphs.rbegin()); // rearrange them into the next line
                        cursor+=ePoint(linelength, 0);  // put the cursor after that line
                } else


@@ -341,7 +370,7 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
        }
 
        pGlyph ng;
        }
 
        pGlyph ng;

-       ng.bbox.setLeft( (flags&GS_ISFIRST|cursor.x()-1)+glyph->left );
+       ng.bbox.setLeft( ((flags&GS_ISFIRST)|(cursor.x()-1))+glyph->left );

        ng.bbox.setTop( cursor.y() - glyph->top );
        ng.bbox.setWidth( glyph->width );
        ng.bbox.setHeight( glyph->height );
        ng.bbox.setTop( cursor.y() - glyph->top );
        ng.bbox.setWidth( glyph->width );
        ng.bbox.setHeight( glyph->height );


@@ -356,6 +385,7 @@ int eTextPara::appendGlyph(Font *current_font, FT_Face current_face, FT_UInt gly
        ng.glyph_index = glyphIndex;
        ng.flags = flags;
        glyphs.push_back(ng);
        ng.glyph_index = glyphIndex;
        ng.flags = flags;
        glyphs.push_back(ng);

+       ++charCount;

 
                /* when we have a SHY, don't xadvance. It will either be the last in the line (when used for breaking), or not displayed. */
        if (!(flags & GS_SOFTHYPHEN))
 
                /* when we have a SHY, don't xadvance. It will either be the last in the line (when used for breaking), or not displayed. */
        if (!(flags & GS_SOFTHYPHEN))


@@ -403,7 +433,13 @@ void eTextPara::newLine(int flags)
        cursor.setX(left);
        previous=0;
        int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);
        cursor.setX(left);
        previous=0;
        int linegap=current_face->size->metrics.height-(current_face->size->metrics.ascender+current_face->size->metrics.descender);

+
+       lineOffsets.push_back(cursor.y());
+       lineChars.push_back(charCount);
+       charCount=0;
+

        cursor+=ePoint(0, (current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap)>>6);
        cursor+=ePoint(0, (current_face->size->metrics.ascender+current_face->size->metrics.descender+linegap)>>6);

+

        if (maximum.height()<cursor.y())
                maximum.setHeight(cursor.y());
        previous=0;
        if (maximum.height()<cursor.y())
                maximum.setHeight(cursor.y());
        previous=0;


@@ -438,9 +474,18 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
                        // we ask for replacment_font first becauseof the cache
        if (replacement_font)
        {
                        // we ask for replacment_font first becauseof the cache
        if (replacement_font)
        {

+#ifdef HAVE_FREETYPE2
+               if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
+                                           replacement_font->scaler.face_id,
+                                           &replacement_face) < 0) ||
+                   (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
+                                           &replacement_font->scaler,
+                                           &replacement_font->size) < 0))
+#else

                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, 
                                &replacement_font->font.font, &replacement_face, 
                                &replacement_font->size)<0)
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, 
                                &replacement_font->font.font, &replacement_face, 
                                &replacement_font->size)<0)

+#endif

                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;
                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;


@@ -448,13 +493,24 @@ void eTextPara::setFont(Font *fnt, Font *replacement)
        }
        if (current_font)
        {
        }
        if (current_font)
        {

+#ifdef HAVE_FREETYPE2
+               if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
+                                           current_font->scaler.face_id,
+                                           &current_face) < 0) ||
+                   (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
+                                           &current_font->scaler,
+                                           &current_font->size) < 0))
+#else

                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)

+#endif

                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;
                }
        }
                {
                        eDebug("FTC_Manager_Lookup_Size failed!");
                        return;
                }
        }

+#ifndef HAVE_FREETYPE2

        cache_current_font=&current_font->font.font;
        cache_current_font=&current_font->font.font;

+#endif

        previous=0;
        use_kerning=FT_HAS_KERNING(current_face);
 }
        previous=0;
        use_kerning=FT_HAS_KERNING(current_face);
 }


@@ -468,13 +524,19 @@ int eTextPara::renderString(const char *string, int rflags)
        
        if (!current_font)
                return -1;
        
        if (!current_font)
                return -1;

-               
-       if (cursor.y()==-1)
+
+#ifdef HAVE_FREETYPE2
+       if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
+                                   current_font->scaler.face_id,
+                                   &current_face) < 0) ||
+           (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
+                                   &current_font->scaler,
+                                   &current_font->size) < 0))

        {
        {

-               cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
-               left=cursor.x();
+               eDebug("FTC_Manager_Lookup_Size failed!");
+               return -1;

        }
        }

-               
+#else

        if (&current_font->font.font != cache_current_font)
        {
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
        if (&current_font->font.font != cache_current_font)
        {
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)


@@ -484,7 +546,19 @@ int eTextPara::renderString(const char *string, int rflags)
                }
                cache_current_font=&current_font->font.font;
        }
                }
                cache_current_font=&current_font->font.font;
        }

-       
+#endif
+
+       if (!current_face)
+               eFatal("eTextPara::renderString: no current_face");
+       if (!current_face->size)
+               eFatal("eTextPara::renderString: no current_face->size");
+
+       if (cursor.y()==-1)
+       {
+               cursor=ePoint(area.x(), area.y()+(current_face->size->metrics.ascender>>6));
+               left=cursor.x();
+       }
+

        std::vector<unsigned long> uc_string, uc_visual;
        if (string)
                uc_string.reserve(strlen(string));
        std::vector<unsigned long> uc_string, uc_visual;
        if (string)
                uc_string.reserve(strlen(string));


@@ -535,22 +609,20 @@ int eTextPara::renderString(const char *string, int rflags)
        shape(uc_shape, uc_string);
        
                // now do the usual logical->visual reordering
        shape(uc_shape, uc_string);
        
                // now do the usual logical->visual reordering

-#ifdef HAVE_FRIBIDI    
+       int size=uc_shape.size();
+#ifdef HAVE_FRIBIDI

        FriBidiCharType dir=FRIBIDI_TYPE_ON;
        FriBidiCharType dir=FRIBIDI_TYPE_ON;

-       {
-               int size=uc_shape.size();
-               uc_visual.resize(size);
-               // gaaanz lahm, aber anders geht das leider nicht, sorry.
-               FriBidiChar array[size], target[size];
-               std::copy(uc_shape.begin(), uc_shape.end(), array);
-               fribidi_log2vis(array, size, &dir, target, 0, 0, 0);
-               uc_visual.assign(target, target+size);
-       }
+       uc_visual.resize(size);
+       // gaaanz lahm, aber anders geht das leider nicht, sorry.
+       FriBidiChar array[size], target[size];
+       std::copy(uc_shape.begin(), uc_shape.end(), array);
+       fribidi_log2vis(array, size, &dir, target, 0, 0, 0);
+       uc_visual.assign(target, target+size);

 #else
        uc_visual=uc_shape;
 #endif
 
 #else
        uc_visual=uc_shape;
 #endif
 

-       glyphs.reserve(uc_visual.size());
+       glyphs.reserve(size);

        
        int nextflags = 0;
        
        
        int nextflags = 0;
        


@@ -644,8 +716,19 @@ nprint:    isprintable=0;
        calc_bbox();
 #ifdef HAVE_FRIBIDI
        if (dir & FRIBIDI_MASK_RTL)
        calc_bbox();
 #ifdef HAVE_FRIBIDI
        if (dir & FRIBIDI_MASK_RTL)

+       {

                realign(dirRight);
                realign(dirRight);

+               doTopBottomReordering=true;
+       }

 #endif
 #endif

+
+       if (charCount)
+       {
+               lineOffsets.push_back(cursor.y());
+               lineChars.push_back(charCount);
+               charCount=0;
+       }
+

        return 0;
 }
 
        return 0;
 }
 


@@ -656,6 +739,18 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        if (!current_font)
                return;
 
        if (!current_font)
                return;
 

+#ifdef HAVE_FREETYPE2
+       if ((FTC_Manager_LookupFace(fontRenderClass::instance->cacheManager,
+                                   current_font->scaler.face_id,
+                                   &current_face) < 0) ||
+           (FTC_Manager_LookupSize(fontRenderClass::instance->cacheManager,
+                                   &current_font->scaler,
+                                   &current_font->size) < 0))
+       {
+               eDebug("FTC_Manager_Lookup_Size failed!");
+               return;
+       }
+#else

        if (&current_font->font.font != cache_current_font)
        {
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)
        if (&current_font->font.font != cache_current_font)
        {
                if (FTC_Manager_Lookup_Size(fontRenderClass::instance->cacheManager, &current_font->font.font, &current_face, &current_font->size)<0)


@@ -665,6 +760,7 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
                }
                cache_current_font=&current_font->font.font;
        }
                }
                cache_current_font=&current_font->font.font;
        }

+#endif

 
        ePtr<gPixmap> target;
        dc.getPixmap(target);
 
        ePtr<gPixmap> target;
        dc.getPixmap(target);


@@ -675,8 +771,9 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
        gColor *lookup8, lookup8_invert[16];
        gColor *lookup8_normal=0;
 
        gColor *lookup8, lookup8_invert[16];
        gColor *lookup8_normal=0;
 

+       __u16 lookup16_normal[16], lookup16_invert[16], *lookup16;

        __u32 lookup32_normal[16], lookup32_invert[16], *lookup32;
        __u32 lookup32_normal[16], lookup32_invert[16], *lookup32;

-       
+

        if (surface->bpp == 8)
        {
                if (surface->clut.data)
        if (surface->bpp == 8)
        {
                if (surface->clut.data)


@@ -690,10 +787,33 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
                        opcode=0;
                } else
                        opcode=1;
                        opcode=0;
                } else
                        opcode=1;

+       } else if (surface->bpp == 16)
+       {
+               opcode=2;
+               for (int i=0; i<16; ++i)
+               {
+#define BLEND(y, x, a) (y + (((x-y) * a)>>8))
+                       unsigned char da = background.a, dr = background.r, dg = background.g, db = background.b;
+                       int sa = i * 16;
+                       if (sa < 256)
+                       {
+                               dr = BLEND(background.r, foreground.r, sa) & 0xFF;
+                               dg = BLEND(background.g, foreground.g, sa) & 0xFF;
+                               db = BLEND(background.b, foreground.b, sa) & 0xFF;
+                       }
+#undef BLEND
+#if BYTE_ORDER == LITTLE_ENDIAN
+                       lookup16_normal[i] = bswap_16(((db >> 3) << 11) | ((dg >> 2) << 5) | (dr >> 3));
+#else
+                       lookup16_normal[i] = ((db >> 3) << 11) | ((dg >> 2) << 5) | (dr >> 3);
+#endif
+                       da ^= 0xFF;
+               }
+               for (int i=0; i<16; ++i)
+                       lookup16_invert[i]=lookup16_normal[i^0xF];

        } else if (surface->bpp == 32)
        {
                opcode=3;
        } else if (surface->bpp == 32)
        {
                opcode=3;

-

                for (int i=0; i<16; ++i)
                {
 #define BLEND(y, x, a) (y + (((x-y) * a)>>8))
                for (int i=0; i<16; ++i)
                {
 #define BLEND(y, x, a) (y + (((x-y) * a)>>8))


@@ -718,35 +838,47 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
                eWarning("can't render to %dbpp", surface->bpp);
                return;
        }
                eWarning("can't render to %dbpp", surface->bpp);
                return;
        }

-       
+

        gRegion area(eRect(0, 0, surface->x, surface->y));
        gRegion clip = dc.getClip() & area;
 
        int buffer_stride=surface->stride;
        gRegion area(eRect(0, 0, surface->x, surface->y));
        gRegion clip = dc.getClip() & area;
 
        int buffer_stride=surface->stride;

-       
+

        for (unsigned int c = 0; c < clip.rects.size(); ++c)
        {
        for (unsigned int c = 0; c < clip.rects.size(); ++c)
        {

-               for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i)
+               std::list<int>::reverse_iterator line_offs_it(lineOffsets.rbegin());
+               std::list<int>::iterator line_chars_it(lineChars.begin());
+               int line_offs=0;
+               int line_chars=0;
+               for (glyphString::iterator i(glyphs.begin()); i != glyphs.end(); ++i, --line_chars)

                {
                {

+                       while(!line_chars)
+                       {
+                               line_offs = *(line_offs_it++);
+                               line_chars = *(line_chars_it++);
+                       }
+

                        if (i->flags & GS_SOFTHYPHEN)
                                continue;
 
                        if (!(i->flags & GS_INVERT))
                        {
                                lookup8 = lookup8_normal;
                        if (i->flags & GS_SOFTHYPHEN)
                                continue;
 
                        if (!(i->flags & GS_INVERT))
                        {
                                lookup8 = lookup8_normal;

+                               lookup16 = lookup16_normal;

                                lookup32 = lookup32_normal;
                        } else
                        {
                                lookup8 = lookup8_invert;
                                lookup32 = lookup32_normal;
                        } else
                        {
                                lookup8 = lookup8_invert;

+                               lookup16 = lookup16_invert;

                                lookup32 = lookup32_invert;
                        }
                                lookup32 = lookup32_invert;
                        }

-               
+

                        static FTC_SBit glyph_bitmap;
                        if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
                                continue;
                        int rx=i->x+glyph_bitmap->left + offset.x();
                        static FTC_SBit glyph_bitmap;
                        if (fontRenderClass::instance->getGlyphBitmap(&i->font->font, i->glyph_index, &glyph_bitmap))
                                continue;
                        int rx=i->x+glyph_bitmap->left + offset.x();

-                       int ry=i->y-glyph_bitmap->top  + offset.y();
-               
+                       int ry=(doTopBottomReordering ? line_offs : i->y) - glyph_bitmap->top + offset.y();
+

                        __u8 *d=(__u8*)(surface->data)+buffer_stride*ry+rx*surface->bypp;
                        __u8 *s=glyph_bitmap->buffer;
                        register int sx=glyph_bitmap->width;
                        __u8 *d=(__u8*)(surface->data)+buffer_stride*ry+rx*surface->bypp;
                        __u8 *s=glyph_bitmap->buffer;
                        register int sx=glyph_bitmap->width;


@@ -772,46 +904,76 @@ void eTextPara::blit(gDC &dc, const ePoint &offset, const gRGB &background, cons
                                d+=diff*buffer_stride;
                        }
                        if (sx>0)
                                d+=diff*buffer_stride;
                        }
                        if (sx>0)

-                               for (int ay=0; ay<sy; ay++)
-                               {
-                                       if (!opcode)            // 4bit lookup to 8bit
+                       {
+                               switch(opcode) {
+                               case 0: // 4bit lookup to 8bit
+                                       for (int ay=0; ay<sy; ay++)

                                        {
                                                register __u8 *td=d;
                                                register int ax;
                                        {
                                                register __u8 *td=d;
                                                register int ax;

-                                               

                                                for (ax=0; ax<sx; ax++)
                                                for (ax=0; ax<sx; ax++)

-                                               {       
+                                               {

                                                        register int b=(*s++)>>4;
                                                        if(b)
                                                                *td++=lookup8[b];
                                                        else
                                                                td++;
                                                }
                                                        register int b=(*s++)>>4;
                                                        if(b)
                                                                *td++=lookup8[b];
                                                        else
                                                                td++;
                                                }

-                                       } else if (opcode == 1) // 8bit direct
+                                               s+=glyph_bitmap->pitch-sx;
+                                               d+=buffer_stride;
+                                       }
+                                       break;
+                               case 1: // 8bit direct
+                                       for (int ay=0; ay<sy; ay++)

                                        {
                                                register __u8 *td=d;
                                                register int ax;
                                                for (ax=0; ax<sx; ax++)
                                        {
                                                register __u8 *td=d;
                                                register int ax;
                                                for (ax=0; ax<sx; ax++)

-                                               {       
+                                               {

                                                        register int b=*s++;
                                                        *td++^=b;
                                                }
                                                        register int b=*s++;
                                                        *td++^=b;
                                                }

-                                       } else
+                                               s+=glyph_bitmap->pitch-sx;
+                                               d+=buffer_stride;
+                                       }
+                                       break;
+                               case 2: // 16bit
+                                       for (int ay=0; ay<sy; ay++)
+                                       {
+                                               register __u16 *td=(__u16*)d;
+                                               register int ax;
+                                               for (ax=0; ax<sx; ax++)
+                                               {
+                                                       register int b=(*s++)>>4;
+                                                       if(b)
+                                                               *td++=lookup16[b];
+                                                       else
+                                                               td++;
+                                               }
+                                               s+=glyph_bitmap->pitch-sx;
+                                               d+=buffer_stride;
+                                       }
+                                       break;
+                               case 3: // 32bit
+                                       for (int ay=0; ay<sy; ay++)

                                        {
                                                register __u32 *td=(__u32*)d;
                                                register int ax;
                                                for (ax=0; ax<sx; ax++)
                                        {
                                                register __u32 *td=(__u32*)d;
                                                register int ax;
                                                for (ax=0; ax<sx; ax++)

-                                               {       
+                                               {

                                                        register int b=(*s++)>>4;
                                                        if(b)
                                                                *td++=lookup32[b];
                                                        else
                                                                td++;
                                                }
                                                        register int b=(*s++)>>4;
                                                        if(b)
                                                                *td++=lookup32[b];
                                                        else
                                                                td++;
                                                }

+                                               s+=glyph_bitmap->pitch-sx;
+                                               d+=buffer_stride;

                                        }
                                        }

-                                       s+=glyph_bitmap->pitch-sx;
-                                       d+=buffer_stride;
+                               default:
+                                       break;

                                }
                                }

+                       }

                }
        }
 }
                }
        }
 }