Changeset 3087 for libpipi/trunk/pipi-phpTweet

Timestamp:

Oct 24, 2008, 5:16:59 PM (12 years ago)

Author:

nico

Message:

• Change return value for function (success return (bool) true):

pipi_load, pipi_save, pipi_command, pipi_render_histogram,
pipi_get_image_histogram

• Add pipi's php constants definitions

Location:

libpipi/trunk/pipi-php

Files:

• examples/example1.php (modified) (1 diff)
• examples/pipi.php (modified) (3 diffs)
• php_pipi.c (modified) (7 diffs)

libpipi/trunk/pipi-php/examples/example1.php

@@ -1 +1 @@
 <?
 //print_r(pipi_get_command_list());
+echo PIPI_COLOR_Y;
 
 $img = pipi_load_stock("random:128x128");

libpipi/trunk/pipi-php/examples/pipi.php

@@ -23 +23 @@
                 
                 $cmd_argc = $list[$cmd_name];
-                if ($argi + $cmd_argc > $argc) {
-                        die("too few arguments for $arg_name\n");
+                if ($argi + $cmd_argc + 1 > $argc) {
+                        die("too few arguments for $cmd_name\n");
                 }
 
@@ -37 +37 @@
                                 die();
                 }
-                if ($res != 0) {
+                if (!$res) {
                         die("command $cmd_name failed\n");
                 }
@@ -43 +43 @@
         }
         else {
-                  if (pipi_command($ctx, "load", $arg) != 0)
+                  if (!pipi_command($ctx, "load", $arg))
                         die("could not load $arg\n");
         }

libpipi/trunk/pipi-php/php_pipi.c

@@ -143 +143 @@
         le_pipi_context = zend_register_list_destructors_ex(php_pipi_context_dtor, NULL, PHP_PIPI_CONTEXT_RES_NAME, module_number);
         le_pipi_histogram = zend_register_list_destructors_ex(php_pipi_histogram_dtor, NULL, PHP_PIPI_HISTOGRAM_RES_NAME, module_number);
+
+        REGISTER_LONG_CONSTANT("PIPI_SCAN_RASTER", PIPI_SCAN_RASTER, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_SCAN_SERPENTINE", PIPI_SCAN_SERPENTINE, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_PIXELS_UNINITIALISED", PIPI_PIXELS_UNINITIALISED, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_PIXELS_RGBA_C", PIPI_PIXELS_RGBA_C, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_PIXELS_BGR_C", PIPI_PIXELS_BGR_C, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_PIXELS_RGBA_F", PIPI_PIXELS_RGBA_F, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_PIXELS_Y_F", PIPI_PIXELS_Y_F, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_PIXELS_MASK_C", PIPI_PIXELS_MASK_C, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_PIXELS_MAX", PIPI_PIXELS_MAX, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_COLOR_R", PIPI_COLOR_R, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_COLOR_G", PIPI_COLOR_G, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_COLOR_B", PIPI_COLOR_B, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_COLOR_A", PIPI_COLOR_A, CONST_CS | CONST_PERSISTENT);
+        REGISTER_LONG_CONSTANT("PIPI_COLOR_Y", PIPI_COLOR_Y, CONST_CS | CONST_PERSISTENT);
+
         return SUCCESS;
 }
 
-//----------SOMEMACROS---------------//
+//----------SOME USEFULL MACROS---------------//
 
 #define FETCH_STR(str) \
@@ -167 +183 @@
 
 #define FETCH_IMG_IMG(img1, img2) \
-        zval *_zval1; \
-        zval *_zval2; \
+        zval *_zval1, *_zval2; \
         if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &_zval1, &_zval2) == FAILURE) { \
                 RETURN_FALSE; \
@@ -193 +208 @@
 
 PHP_FUNCTION(pipi_get_command_list) {
-        pipi_command_t const *list;
-        pipi_command_t const *cmd;
+        pipi_command_t const *list, *cmd;
         list = pipi_get_command_list();
 
@@ -214 +228 @@
 
         if (arg2_len != 0) {
-                RETURN_LONG(pipi_command(ctxt, arg1, arg2));
-        }
-        RETURN_LONG(pipi_command(ctxt, arg1));  
+                RETURN_BOOL(pipi_command(ctxt, arg1, arg2) == 0);
+        }
+        RETURN_BOOL(pipi_command(ctxt, arg1) == 0);     
 }
 
@@ -263 +277 @@
         ZEND_FETCH_RESOURCE(img, pipi_image_t*, &res, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 
 
-        RETURN_LONG(pipi_save(img, str));       
+        RETURN_BOOL(pipi_save(img, str) == 0);  
 }
 
@@ -762 +776 @@
         ZEND_FETCH_RESOURCE(histogram, pipi_histogram_t*, &_zval_hst, -1, PHP_PIPI_HISTOGRAM_RES_NAME, le_pipi_histogram);
 
-        RETURN_LONG(pipi_get_image_histogram(image, histogram, flags));
+        RETURN_BOOL(pipi_get_image_histogram(image, histogram, flags) == 0);
 }
 
@@ -776 +790 @@
         ZEND_FETCH_RESOURCE(histogram, pipi_histogram_t*, &_zval_hst, -1, PHP_PIPI_HISTOGRAM_RES_NAME, le_pipi_histogram);
 
-        RETURN_LONG(pipi_render_histogram(image, histogram, flags));
-}
-
-
+        RETURN_BOOL(pipi_render_histogram(image, histogram, flags) == 0);
+}
+
+