Various changes:

[imager.git] / freetyp2.c

diff --git a/freetyp2.c b/freetyp2.c
index 6fc3caabd643462e7a778399cb70bb959d2a0aa8..e7625b9ada410a5e3f6d4503b53fa845d0efae22 100644 (file)
--- a/freetyp2.c
+++ b/freetyp2.c
@@ -645,6 +645,7 @@ i_ft2_text(FT2_Fonthandle *handle, i_img *im, int tx, int ty, const i_color *cl,
   int ch;
   i_color pel;
   int loadFlags = FT_LOAD_DEFAULT;
   int ch;
   i_color pel;
   int loadFlags = FT_LOAD_DEFAULT;

+  i_render render;

 
   mm_log((1, "i_ft2_text(handle %p, im %p, tx %d, ty %d, cl %p, cheight %f, cwidth %f, text %p, len %d, align %d, aa %d)\n",
          handle, im, tx, ty, cl, cheight, cwidth, text, align, aa));
 
   mm_log((1, "i_ft2_text(handle %p, im %p, tx %d, ty %d, cl %p, cheight %f, cwidth %f, text %p, len %d, align %d, aa %d)\n",
          handle, im, tx, ty, cl, cheight, cwidth, text, align, aa));


@@ -663,6 +664,9 @@ i_ft2_text(FT2_Fonthandle *handle, i_img *im, int tx, int ty, const i_color *cl,
   if (!i_ft2_bbox(handle, cheight, cwidth, text, len, bbox, utf8))
     return 0;
 
   if (!i_ft2_bbox(handle, cheight, cwidth, text, len, bbox, utf8))
     return 0;
 

+  if (aa)
+    i_render_init(&render, im, bbox[BBOX_POS_WIDTH] - bbox[BBOX_NEG_WIDTH]);
+

   if (!align) {
     /* this may need adjustment */
     tx -= bbox[0] * handle->matrix[0] + bbox[5] * handle->matrix[1] + handle->matrix[2];
   if (!align) {
     /* this may need adjustment */
     tx -= bbox[0] * handle->matrix[0] + bbox[5] * handle->matrix[1] + handle->matrix[2];


@@ -688,6 +692,8 @@ i_ft2_text(FT2_Fonthandle *handle, i_img *im, int tx, int ty, const i_color *cl,
       ft2_push_message(error);
       i_push_errorf(0, "loading glyph for character \\x%02x (glyph 0x%04X)", 
                     c, index);
       ft2_push_message(error);
       i_push_errorf(0, "loading glyph for character \\x%02x (glyph 0x%04X)", 
                     c, index);

+      if (aa)
+        i_render_done(&render);

       return 0;
     }
     slot = handle->face->glyph;
       return 0;
     }
     slot = handle->face->glyph;


@@ -698,6 +704,8 @@ i_ft2_text(FT2_Fonthandle *handle, i_img *im, int tx, int ty, const i_color *cl,
       if (error) {
        ft2_push_message(error);
        i_push_errorf(0, "rendering glyph 0x%04X (character \\x%02X)");
       if (error) {
        ft2_push_message(error);
        i_push_errorf(0, "rendering glyph 0x%04X (character \\x%02X)");

+      if (aa)
+        i_render_done(&render);

        return 0;
       }
       if (slot->bitmap.pixel_mode == ft_pixel_mode_mono) {
        return 0;
       }
       if (slot->bitmap.pixel_mode == ft_pixel_mode_mono) {


@@ -728,20 +736,16 @@ i_ft2_text(FT2_Fonthandle *handle, i_img *im, int tx, int ty, const i_color *cl,
          last_mode = slot->bitmap.pixel_mode;
          last_grays = slot->bitmap.num_grays;
        }
          last_mode = slot->bitmap.pixel_mode;
          last_grays = slot->bitmap.num_grays;
        }

-       
+

        bmp = slot->bitmap.buffer;
        for (y = 0; y < slot->bitmap.rows; ++y) {
        bmp = slot->bitmap.buffer;
        for (y = 0; y < slot->bitmap.rows; ++y) {

-         for (x = 0; x < slot->bitmap.width; ++x) {
-           int value = map[bmp[x]];
-           if (value) {
-             i_gpix(im, tx+x+slot->bitmap_left, ty+y-slot->bitmap_top, &pel);
-             for (ch = 0; ch < im->channels; ++ch) {
-               pel.channel[ch] = 
-                 ((255-value)*pel.channel[ch] + value * cl->channel[ch]) / 255;
-             }
-             i_ppix(im, tx+x+slot->bitmap_left, ty+y-slot->bitmap_top, &pel);
-           }
-         }
+          if (last_mode == ft_pixel_mode_grays &&
+              last_grays != 255) {
+            for (x = 0; x < slot->bitmap.width; ++x) 
+              bmp[x] = map[bmp[x]];
+          }
+          i_render_color(&render, tx + slot->bitmap_left, ty-slot->bitmap_top+y,
+                         slot->bitmap.width, bmp, cl);

          bmp += slot->bitmap.pitch;
        }
       }
          bmp += slot->bitmap.pitch;
        }
       }


@@ -751,6 +755,9 @@ i_ft2_text(FT2_Fonthandle *handle, i_img *im, int tx, int ty, const i_color *cl,
     ty -= slot->advance.y / 64;
   }
 
     ty -= slot->advance.y / 64;
   }
 

+  if (aa)
+    i_render_done(&render);
+

   return 1;
 }
 
   return 1;
 }