Changeset 3150 for libcaca/trunk/caca-php/php_caca.cTweet

Timestamp:

Oct 30, 2008, 5:16:31 PM (11 years ago)

Author:

nico

Message:

• Improve php binding of caca_render_canvas
• Destroy php resource in caca_file_close
• Improve sample program render.php

File:

• libcaca/trunk/caca-php/php_caca.c (modified) (2 diffs)

libcaca/trunk/caca-php/php_caca.c

@@ -1401 +1401 @@
         }
 
-        int pitch = img->sx * sizeof(int);
-        void *buffer = malloc(pitch * img->sy);
+        int pitch = img->sx * 4;
+        uint8_t *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);
+        caca_render_canvas(canvas, font, (void *) buffer, img->sx, img->sy, pitch);
+        int i, j;
+        for (i = 0; i < img->sy; i++) {
+                for (j = 0; j < img->sx; j++) {
+                        uint8_t *src = buffer + i * pitch + j * 4;
+                        img->tpixels[i][j] = *(src + 3) | (*(src + 2) << 8) | (*(src + 1) << 16) | (*(src + 0) << 24);
+                }
+        }
         
-        //TODO: fix colors order
         free(buffer);
         RETURN_TRUE;
@@ -1471 +1474 @@
         caca_file_t *file;
         ZEND_FETCH_RESOURCE(file, caca_file_t*, &_zval, -1, PHP_CACA_FILE_RES_NAME, le_caca_file);
-        //TODO: check that file was not already closed
-        RETURN_SUCCESS(caca_file_close(file));
+
+        int res = caca_file_close(file);
+
+        //Delete php resource
+        zend_list_delete(_zval->value.lval);
+        RETURN_SUCCESS(res);
 }