Changeset 1039 for libcaca/trunkTweet

Timestamp:

Sep 17, 2006, 2:02:31 AM (16 years ago)

Author:

Sam Hocevar

Message:

• Fixed cucul_render_glyph(). There is no way this could have ever possibly worked properly.

Location:

libcaca/trunk

Files:

• caca/driver_gl.c (modified) (2 diffs)
• cucul/cucul.h (modified) (1 diff)
• cucul/font.c (modified) (4 diffs)

libcaca/trunk/caca/driver_gl.c

@@ -570 +570 @@
     uint8_t *glyph32 = calloc(16*16*4, 1);
 
-    cucul_render_glyph(dp->drv.p->f, c,
-                       glyph8, dp->drv.p->font_width, dp->drv.p->font_height);
-
+    cucul_render_glyph(dp->drv.p->f, c, glyph8, dp->drv.p->font_width);
 
     /* Convert resulting 8bbp glyph to 32bits, 16x16*/
@@ -604 +602 @@
     uint8_t *glyph32 = calloc(16*16*4, 1);
 
-    cucul_render_glyph(dp->drv.p->f, c,
-                       glyph8, dp->drv.p->font_width, dp->drv.p->font_height);
-
+    cucul_render_glyph(dp->drv.p->f, c, glyph8, dp->drv.p->font_width);
 
     /* Convert resulting 8bbp glyph to 32bits, 16x16*/

libcaca/trunk/cucul/cucul.h

@@ -209 +209 @@
 int cucul_render_canvas(cucul_canvas_t *, cucul_font_t *, void *,
                          unsigned int, unsigned int, unsigned int);
-int cucul_render_glyph(cucul_font_t *, unsigned int, void *,
-                       unsigned int, unsigned int);
+int cucul_render_glyph(cucul_font_t *, unsigned int, void *, unsigned int);
 int cucul_free_font(cucul_font_t *);
 /*  @} */

libcaca/trunk/cucul/font.c

@@ -448 +448 @@
 /** \brief Render the given character onto given buffer
  *
- *  This function renders the given character on an image buffer using a specific
- *  font. The pixel format is fixed (8 bits per pixel).
- *
- *  The required buffer width can be computed using
- *  cucul_get_canvas_width() and cucul_get_font_width(). The required
- *  height can be computed using cucul_get_canvas_height() and
- *  cucul_get_font_height().
- *
- *  Glyphs that do not fit in the image buffer are currently not rendered at
- *  all. They may be cropped instead in future versions.
+ *  This function renders the given character on an image buffer using a
+ *  specific font. The pixel format is fixed (8 bits per pixel).
+ *
+ *  The required buffer size can be computed using cucul_get_font_width()
+ *  and cucul_get_font_height().
  *
  *  This function never fails.
@@ -464 +459 @@
  *  \param ch The character to render
  *  \param buf The image buffer
- *  \param width The width (in pixels) of the image buffer
- *  \param height The height (in pixels) of the image buffer
- *  \return This function return 1 if glyph is succesfully renderer, 0 otherwise
- */
-int cucul_render_glyph(cucul_font_t *f, unsigned int ch, void *buffer,
-                       unsigned int width, unsigned int height)
-{
-    unsigned int b;
+ *  \param pitch The pitch of the image buffer
+ *  \return This function always returns 0.
+ */
+int cucul_render_glyph(cucul_font_t *f, unsigned int ch, void *buf,
+                       unsigned int stride)
+{
+    unsigned int b, y;
     struct glyph_info *g;
-    uint8_t *glyph = buffer;
-
-
+    uint8_t *glyph;
 
     /* Find the Unicode block where our glyph lies */
@@ -493 +485 @@
     if(b == f->header.blocks)
         return 0;
+
+    if(f->header.bpp != 8)
+        glyph = malloc(f->header.width * f->header.height);
 
     g = &f->glyph_list[f->block_list[b].index
@@ -516 +511 @@
         break;
     }
-    return 1;
-}
-
-
+
+    /* Step 2: render glyph */
+    for(y = 0; y < g->height; y++)
+        memcpy((uint8_t*)buf + y * stride, glyph + y * g->width, g->width);
+
+    if(f->header.bpp != 8)
+        free(glyph);
+
+    return 0;
+}
 
 /*