Changeset 3120 for libcacaTweet

Timestamp:

Oct 27, 2008, 6:15:08 PM (11 years ago)

Author:

nico

Message:

• Improve function "caca_dither_bitmap_gd"
• Add php binding for "caca_create_dither"
• Add new sample program "dithering.php"

Location:

libcaca/trunk/caca-php

Files:

• examples/dithering.php (added)
• php_caca.c (modified) (3 diffs)
• php_caca.h (modified) (1 diff)

libcaca/trunk/caca-php/php_caca.c

@@ -88 +88 @@
         PHP_FE(caca_create_frame, NULL)
         PHP_FE(caca_free_frame, NULL)
+        PHP_FE(caca_create_dither, NULL)
         PHP_FE(caca_set_dither_palette, NULL)
         PHP_FE(caca_set_dither_brightness, NULL)
@@ -934 +935 @@
 }
 
+PHP_FUNCTION(caca_create_dither) {
+        long bpp, w, h, pitch, rmask, gmask, bmask, amask = 0;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "llllllll", &bpp, &w, &h, &pitch, &rmask, &gmask, &bmask, &amask) == FAILURE) {
+                RETURN_FALSE;
+        }
+        caca_dither_t *dither = caca_create_dither(bpp, w, h, pitch, rmask, gmask, bmask, amask);
+        ZEND_REGISTER_RESOURCE(return_value, dither, le_caca_dither);
+}
+
 PHP_FUNCTION(caca_set_dither_palette) {
 }
@@ -1137 +1147 @@
 
 PHP_FUNCTION(caca_dither_bitmap_gd) {
-        zval *_zval;
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &_zval) == FAILURE) {
-                RETURN_FALSE;
-        }
-        gdImage *img = fetch_external_resource(_zval, "gd");
-        if (img) {
-                printf("image size: %i x %i\n", img->sx, img->sy);
+        zval *_zval1, *_zval2, *_zval3;
+        long x, y, w, h = 0;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllllrr", &_zval1, &x, &y, &w, &h, &_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_dither_t *dither;
+        ZEND_FETCH_RESOURCE(dither, caca_dither_t*, &_zval2, -1, PHP_CACA_DITHER_RES_NAME, le_caca_dither);
+
+        gdImage *img = fetch_external_resource(_zval3, "gd");
+        if (!img) {
+                RETURN_FALSE;
+        }
+
+        printf("image size: %i x %i\n", img->sx, img->sy);
+        if (img->trueColor) {
+                printf("image is true color\n");
+                RETURN_SUCCESS(caca_dither_bitmap(canvas, x, y, w, h, dither, (void *) *(img->tpixels)));
         }
 }

libcaca/trunk/caca-php/php_caca.h

@@ -105 +105 @@
 PHP_FUNCTION(caca_create_frame);
 PHP_FUNCTION(caca_free_frame);
+PHP_FUNCTION(caca_create_dither);
 PHP_FUNCTION(caca_set_dither_palette);
 PHP_FUNCTION(caca_set_dither_brightness);