Changeset 3122 for libcaca/trunk/caca-phpTweet

Timestamp:

Oct 27, 2008, 8:14:32 PM (14 years ago)

Author:

nico

Message:

• Add working sample program dithering.php (open logo-caca.png with Gd and render it with caca caca_dither_bitmap_gd)
• Add a function to fetch a buffer of gd pixels in php_caca.c

Location:

libcaca/trunk/caca-php

Files:

• examples/dithering.php (modified) (1 diff)
• examples/logo-caca.png (added)
• php_caca.c (modified) (3 diffs)

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

@@ -2 +2 @@
 <?
 $img = imagecreatefrompng(dirname(__FILE__)."/logo-caca.png");
-//$img = imagecreatefromjpeg("/home/nicolas/images/Clown Fish-mini.jpg");
 $canvas = caca_create_canvas(0, 0);
 
-$dither = caca_create_dither(16, 128, 128, 3 * 256, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000);
-caca_set_dither_gamma($dither, -1.0);
+$dither = caca_create_dither(32, 128, 128, 4 * 128, 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000);
 
-if (caca_dither_bitmap_gd($canvas, 0, 0, 30, 30, $dither, $img)) {
-        $dp = caca_create_display($canvas);
-        caca_refresh_display($dp);
-        sleep(5);
-}
+$display = caca_create_display($canvas);
+caca_set_display_time($display, 80000);
 
+caca_dither_bitmap_gd($canvas, 0, 0, caca_get_canvas_width($canvas), caca_get_canvas_height($canvas), $dither, $img);
+caca_refresh_display($display);
+
+sleep(5);
+
+
+
+

libcaca/trunk/caca-php/php_caca.c

@@ -344 +344 @@
         RETURN_BOOL((i) == 0);
 
-//------- Function that allows to fetch external php resources such as gd resouces
+//---------- Some usefull functions --------------------//
+
+//Fetch external php resources such as gd resouces
 
 void *fetch_external_resource(zval *_zval, char const *type_name) {
@@ -350 +352 @@
         int resource_type;
         void *result = zend_list_find(resource_id, &resource_type);
+        if (!result) 
+                return NULL;
         char *resource_type_name = zend_rsrc_list_get_rsrc_type(resource_id);
         return (strcmp(resource_type_name, type_name) == 0) ? result : NULL;
 }
+
+//Fetch buffer of pixels from gdImage
+
+void *gd_get_pixels(gdImage *img) {
+        if (img->trueColor) {
+                int line_size = img->sx * sizeof(int);
+                void *result = malloc(img->sy * line_size);
+                int j;          
+                for (j = 0; j < img->sy; j++)
+                        memcpy(result + (j * line_size), (const void *) img->tpixels[j], line_size);
+                return result;
+        }
+        return NULL;
+}
+
+
 
 //------- PHP Binding's specific functions ----------//
@@ -1163 +1183 @@
         }
 
-        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)));
-        }
+        void *pixels = gd_get_pixels(img);
+        if (!pixels) {
+                RETURN_FALSE;
+        }
+
+        caca_dither_bitmap(canvas, x, y, w, h, dither, pixels);
+        free(pixels);
+        RETURN_TRUE;
 }