Changeset 2305 for libcaca/trunk/cucul/font.cTweet

Timestamp:

Apr 19, 2008, 9:25:52 PM (14 years ago)

Author:

Sam Hocevar

Message:

• Remove all unsigned ints from exported functions. Signed arithmetic is far better for error checking.

File:

• libcaca/trunk/cucul/font.c (modified) (8 diffs)

libcaca/trunk/cucul/font.c

@@ -71 +71 @@
 #define DECLARE_UNPACKGLYPH(bpp) \
     static inline void \
-      unpack_glyph ## bpp(uint8_t *glyph, uint8_t *packed_data, \
-                          unsigned int n) \
+      unpack_glyph ## bpp(uint8_t *glyph, uint8_t *packed_data, int n) \
 { \
-    unsigned int i; \
+    int i; \
     \
     for(i = 0; i < n; i++) \
@@ -112 +111 @@
  *  \return A font handle or NULL in case of error.
  */
-cucul_font_t *cucul_load_font(void const *data, unsigned int size)
+cucul_font_t *cucul_load_font(void const *data, size_t size)
 {
     cucul_font_t *f;
-    unsigned int i;
+    int i;
 
     if(size == 0)
@@ -248 +247 @@
                 + f->header.blocks * sizeof(struct block_info),
            f->header.glyphs * sizeof(struct glyph_info));
-    for(i = 0; i < f->header.glyphs; i++)
+    for(i = 0; i < (int)f->header.glyphs; i++)
     {
         f->glyph_list[i].width = hton16(f->glyph_list[i].width);
@@ -325 +324 @@
  *  \return The standard glyph width.
  */
-unsigned int cucul_get_font_width(cucul_font_t const *f)
+int cucul_get_font_width(cucul_font_t const *f)
 {
     return f->header.width;
@@ -340 +339 @@
  *  \return The standard glyph height.
  */
-unsigned int cucul_get_font_height(cucul_font_t const *f)
+int cucul_get_font_height(cucul_font_t const *f)
 {
     return f->header.height;
@@ -405 +404 @@
  *  all. They may be cropped instead in future versions.
  *
- *  This function never fails.
+ *  If an error occurs, -1 is returned and \b errno is set accordingly:
+ *  - \c EINVAL Specified width, height or pitch is invalid.
  *
  *  \param cv The canvas to render
@@ -413 +413 @@
  *  \param height The height (in pixels) of the image buffer
  *  \param pitch The pitch (in bytes) of an image buffer line.
- *  \return This function always returns 0.
+ *  \return 0 in case of success, -1 if an error occurred.
  */
 int cucul_render_canvas(cucul_canvas_t const *cv, cucul_font_t const *f,
-                        void *buf, unsigned int width,
-                        unsigned int height, unsigned int pitch)
+                        void *buf, int width, int height, int pitch)
 {
     uint8_t *glyph = NULL;
-    unsigned int x, y, xmax, ymax;
+    int x, y, xmax, ymax;
+
+    if(width < 0 || height < 0 || pitch < 0)
+    {
+        seterrno(EINVAL);
+        return -1;
+    }
 
     if(f->header.bpp != 8)
@@ -440 +445 @@
         {
             uint8_t argb[8];
-            unsigned int starty = y * f->header.height;
-            unsigned int startx = x * f->header.width;
+            int starty = y * f->header.height;
+            int startx = x * f->header.width;
             uint32_t ch = cv->chars[y * cv->width + x];
             uint32_t attr = cv->attrs[y * cv->width + x];
-            unsigned int b, i, j;
+            int b, i, j;
             struct glyph_info *g;