Changeset 3149Tweet

Timestamp:

Oct 30, 2008, 2:21:26 PM (15 years ago)

Author:

nico

Message:

• Add new php specific function caca_load_builtin_font(string name)
• Add php bindings for caca_get_dither_antialias_list, caca_render_canvas
• Add a new sample program examples/render.php

Location:

libcaca/trunk/caca-php

Files:

• examples/render.php (added)
• php_caca.c (modified) (9 diffs)
• php_caca.h (modified) (1 diff)

libcaca/trunk/caca-php/php_caca.c

@@ -107 +107 @@
         PHP_FE(caca_dither_bitmap, NULL)
         PHP_FE(caca_load_font, NULL)
+        PHP_FE(caca_load_builtin_font, NULL)
         PHP_FE(caca_get_font_list, NULL)
         PHP_FE(caca_get_font_width, NULL)
@@ -361 +362 @@
 
 void *gd_get_pixels(gdImage *img) {
+        void *result;
+        int j, pitch;           
         if (img->trueColor)  {
-                int line_size = img->sx * sizeof(int);
-                void *result = malloc(img->sy * line_size);
-                int j;          
+                pitch = img->sx * sizeof(int);
+                result = malloc(img->sy * pitch);
                 for (j = 0; j < img->sy; j++)
-                        memcpy(result + (j * line_size), (const void *) img->tpixels[j], line_size);
-                return result;
+                        memcpy(result + (j * pitch), (const void *) img->tpixels[j], pitch);
         }
         else {
-                int line_size = img->sx * sizeof(char);
-                void *result = malloc(img->sy * line_size);
-                int j;          
+                pitch = img->sx * sizeof(char);
+                result = malloc(img->sy * pitch);
                 for (j = 0; j < img->sy; j++)
-                        memcpy(result + (j * line_size), (const void *) img->pixels[j], line_size);
-                return result;
-        }
+                        memcpy(result + (j * pitch), (const void *) img->pixels[j], pitch);
+        }
+        return result;
 }
 
@@ -1038 +1038 @@
                 dither = caca_create_dither(sizeof(char) * 8, img->sx, img->sy, img->sx * sizeof(char), 0, 0, 0, 0);
 
+        if (!dither) {
+                RETURN_FALSE;
+        }
+
         ZEND_REGISTER_RESOURCE(return_value, dither, le_caca_dither);
 }
@@ -1144 +1148 @@
 
 PHP_FUNCTION(caca_get_dither_antialias_list) {
-        //TODO: write
+        zval *_zval;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &_zval) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_dither_t *dither;
+        ZEND_FETCH_RESOURCE(dither, caca_dither_t*, &_zval, -1, PHP_CACA_DITHER_RES_NAME, le_caca_dither);
+
+        char const * const *list = caca_get_dither_antialias_list(dither);
+        int i;
+        array_init(return_value);       
+        for(i = 0; list[i]; i += 1)
+                add_next_index_string(return_value, (char*) list[i], 1);
 }
 
@@ -1308 +1323 @@
         }
         caca_font_t *font = caca_load_font(str, str_len);
+        if (!font) {
+                RETURN_FALSE;
+        }
+        ZEND_REGISTER_RESOURCE(return_value, font, le_caca_font);
+}
+
+PHP_FUNCTION(caca_load_builtin_font) {
+        char *str;
+        long str_len;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &str_len) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_font_t *font = caca_load_font(str, 0);
+        if (!font) {
+                RETURN_FALSE;
+        }
         ZEND_REGISTER_RESOURCE(return_value, font, le_caca_font);
 }
@@ -1356 +1387 @@
 
 PHP_FUNCTION(caca_render_canvas) {
-        //TODO: write
+        zval *_zval1, *_zval2, *_zval3;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rrr", &_zval1, &_zval2, &_zval3) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_canvas_t *canvas;
+        ZEND_FETCH_RESOURCE(canvas, caca_canvas_t*, &_zval1, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_canvas);
+        caca_font_t *font;
+        ZEND_FETCH_RESOURCE(font, caca_font_t*, &_zval2, -1, PHP_CACA_FONT_RES_NAME, le_caca_font);
+
+        gdImage *img = fetch_external_resource(_zval3, "gd");
+        if (!img || !img->trueColor) {
+                RETURN_FALSE;
+        }
+
+        int pitch = img->sx * sizeof(int);
+        void *buffer = malloc(pitch * img->sy);
+        if (!buffer) {
+                RETURN_FALSE;
+        }
+
+        caca_render_canvas(canvas, font, buffer, img->sx, img->sy, pitch);
+        int i;
+        for (i = 0; i < img->sy; i++)
+                memcpy(img->tpixels[i], buffer + (i * pitch), pitch);
+        
+        //TODO: fix colors order
+        free(buffer);
+        RETURN_TRUE;
 }
 
@@ -1400 +1458 @@
         }
         caca_file_t *file = caca_file_open(path, mode);
+        if (!file) {
+                RETURN_FALSE;
+        }
         ZEND_REGISTER_RESOURCE(return_value, file, le_caca_file);
 }
@@ -1566 +1627 @@
 
         caca_display_t *display = caca_create_display(canvas);
+        if (!display) {
+                RETURN_FALSE;
+        }
         ZEND_REGISTER_RESOURCE(return_value, display, le_caca_display);
 }
@@ -1624 +1688 @@
         ZEND_FETCH_RESOURCE(display, caca_display_t*, &_zval, -1, PHP_CACA_DISPLAY_RES_NAME, le_caca_display);
         caca_canvas_t *canvas = caca_get_canvas(display);
+        if (!canvas) {
+                RETURN_FALSE;
+        }
         ZEND_REGISTER_RESOURCE(return_value, canvas, le_caca_canvas);
 }

libcaca/trunk/caca-php/php_caca.h

@@ -123 +123 @@
 PHP_FUNCTION(caca_dither_bitmap);
 PHP_FUNCTION(caca_load_font);
+PHP_FUNCTION(caca_load_builtin_font);
 PHP_FUNCTION(caca_get_font_list);
 PHP_FUNCTION(caca_get_font_width);