Changeset 3148Tweet

Timestamp:

Oct 30, 2008, 12:39:24 PM (12 years ago)

Author:

nico

Message:

• Remove "_gd" suffix from dithering functions
• caca_dithering_bitmap can load palette from gd resource
• Remove caca_set_dither_palette_gd function
• Adapt sample program "dithering.php"

Location:

libcaca/trunk/caca-php

Files:

• examples/dithering.php (modified) (2 diffs)
• php_caca.c (modified) (7 diffs)
• php_caca.h (modified) (2 diffs)

libcaca/trunk/caca-php/examples/dithering.php

@@ -6 +6 @@
         die("Can not open image.\n");
 
-$dither = caca_create_dither_gd($img);
+$dither = caca_create_dither($img);
 if (!$dither) 
         die("Can not create dither. Maybe this image is not truecolor.\n");
@@ -15 +15 @@
         die("Can not create display.\n");
 
-//caca_set_dither_palette_gd($dither, $img);
-caca_dither_bitmap_gd($canvas, 0, 0, caca_get_canvas_width($canvas), caca_get_canvas_height($canvas), $dither, $img);
+caca_dither_bitmap($canvas, 0, 0, caca_get_canvas_width($canvas), caca_get_canvas_height($canvas), $dither, $img);
 caca_refresh_display($display);
 

libcaca/trunk/caca-php/php_caca.c

@@ -86 +86 @@
         PHP_FE(caca_free_frame, NULL)
         PHP_FE(caca_create_dither, NULL)
-        PHP_FE(caca_create_dither_gd, NULL)
         PHP_FE(caca_set_dither_palette, NULL)
-        PHP_FE(caca_set_dither_palette_gd, NULL)
         PHP_FE(caca_set_dither_brightness, NULL)
         PHP_FE(caca_get_dither_brightness, NULL)
@@ -107 +105 @@
         PHP_FE(caca_get_dither_algorithm_list, NULL)
         PHP_FE(caca_get_dither_algorithm, NULL)
-        PHP_FE(caca_dither_bitmap_gd, NULL)
+        PHP_FE(caca_dither_bitmap, NULL)
         PHP_FE(caca_load_font, NULL)
         PHP_FE(caca_get_font_list, NULL)
@@ -381 +379 @@
 }
 
+int gd_load_palette(gdImage *img, caca_dither_t *dither) {
+        if (!img || img->trueColor || gdMaxColors != 256) {
+                return -1;
+        }
+
+        uint32_t r[256], g[256], b[256], a[256];
+        int i;
+        for (i = 0; i < 256; i++) {
+                r[i] = img->red[i] << 4;
+                g[i] = img->green[i] << 4;
+                b[i] = img->blue[i] << 4;
+                a[i] = img->alpha[i] << 4;
+        }
+
+        return caca_set_dither_palette(dither, &r[0], &g[0], &b[0], &a[0]);
+}
+
 //------- Caca's functions ----------------//
 
@@ -1007 +1022 @@
 
 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_create_dither_gd) {
         zval *_zval;
         if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &_zval) == FAILURE) {
@@ -1062 +1068 @@
 }
 
-PHP_FUNCTION(caca_set_dither_palette_gd) {
-        zval *_zval1, *_zval2;
-        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &_zval1, &_zval2) == FAILURE) {
-                RETURN_FALSE;
-        }
-
-        caca_dither_t *dither;
-        ZEND_FETCH_RESOURCE(dither, caca_dither_t*, &_zval1, -1, PHP_CACA_CANVAS_RES_NAME, le_caca_dither);
-
-        gdImage *img = fetch_external_resource(_zval2, "gd");
-        if (!img || img->trueColor || gdMaxColors != 256) {
-                RETURN_FALSE;
-        }
-
-        uint32_t r[256], g[256], b[256], a[256];
-        int i;
-        for (i = 0; i < 256; i++) {
-                r[i] = img->red[i] << 4;
-                g[i] = img->green[i] << 4;
-                b[i] = img->blue[i] << 4;
-                a[i] = img->alpha[i] << 4;
-        }
-
-        RETURN_SUCCESS(caca_set_dither_palette(dither, &r[0], &g[0], &b[0], &a[0]));
-}
-
 PHP_FUNCTION(caca_set_dither_brightness) {
         zval *_zval;
@@ -1288 +1268 @@
 }
 
-PHP_FUNCTION(caca_dither_bitmap_gd) {
+PHP_FUNCTION(caca_dither_bitmap) {
         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) {
+        zend_bool load_palette = 1;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rllllrr|b", &_zval1, &x, &y, &w, &h, &_zval2, &_zval3, &load_palette) == FAILURE) {
                 RETURN_FALSE;
         }
@@ -1307 +1288 @@
         void *pixels = gd_get_pixels(img);
         if (!pixels) {
+                RETURN_FALSE;
+        }
+
+        //load palette if image is not true color
+        if (load_palette && !img->trueColor && gd_load_palette(img, dither) != 0) {
                 RETURN_FALSE;
         }

libcaca/trunk/caca-php/php_caca.h

@@ -102 +102 @@
 PHP_FUNCTION(caca_free_frame);
 PHP_FUNCTION(caca_create_dither);
-PHP_FUNCTION(caca_create_dither_gd);
 PHP_FUNCTION(caca_set_dither_palette);
-PHP_FUNCTION(caca_set_dither_palette_gd);
 PHP_FUNCTION(caca_set_dither_brightness);
 PHP_FUNCTION(caca_get_dither_brightness);
@@ -123 +121 @@
 PHP_FUNCTION(caca_get_dither_algorithm_list);
 PHP_FUNCTION(caca_get_dither_algorithm);
-PHP_FUNCTION(caca_dither_bitmap_gd);
+PHP_FUNCTION(caca_dither_bitmap);
 PHP_FUNCTION(caca_load_font);
 PHP_FUNCTION(caca_get_font_list);