Changeset 3170Tweet

Timestamp:

Oct 31, 2008, 10:02:15 PM (15 years ago)

Author:

nico

Message:

• Centralize pipi's errors managment in macro RETURN_SUCCESS
• Change php headers in samples programs
• Add binding for pipi_draw_line
• Check args in pipi_new_histogram and pipi_get_version

Location:

libpipi/trunk/pipi-php

Files:

• examples/example1.php (modified) (2 diffs)
• examples/histogram.php (modified) (2 diffs)
• examples/pipi.php (modified) (2 diffs)
• php_pipi.c (modified) (8 diffs)

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

@@ -1 @@
-<?
+#!/usr/bin/php5
+<?php
+
 $img = pipi_load_stock("random:128x128");
 $img = pipi_gaussian_blur($img, 10);
@@ -6 +8 @@
 $img = pipi_tile($img, 256, 256);
 pipi_save($img, "out.png");
+
+?>

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

@@ -1 @@
-<?
+#!/usr/bin/php5
+<?php
+
 $img = pipi_load_stock("random:128x128");
 $img = pipi_gaussian_blur($img, 10);
@@ -10 +12 @@
 
 pipi_save($histogram_img, "out.png");
+
+?>

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

@@ -1 +1 @@
 #!/usr/bin/php5
-<?
+<?php
 $aliases = array(
         "-o" => "--save", 
@@ -47 +47 @@
         }
 }
+
+?>

libpipi/trunk/pipi-php/php_pipi.c

@@ -194 +194 @@
         ZEND_FETCH_RESOURCE(img2, pipi_image_t*, &_zval2, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 
 
+#define RETURN_SUCCESS(i) \
+        RETURN_BOOL((i) == 0);
 
 
@@ -202 +204 @@
 
 PHP_FUNCTION(pipi_get_version) {
+        if (ZEND_NUM_ARGS() != 0) {
+                WRONG_PARAM_COUNT;
+        }
         RETURN_STRING(estrdup(pipi_get_version()), 0);
 }
@@ -232 +237 @@
 
         if (arg2_len != 0) {
-                RETURN_BOOL(pipi_command(ctxt, arg1, arg2) == 0);
-        }
-        RETURN_BOOL(pipi_command(ctxt, arg1) == 0);     
+                RETURN_SUCCESS(pipi_command(ctxt, arg1, arg2));
+        }
+        RETURN_SUCCESS(pipi_command(ctxt, arg1));       
 }
 
@@ -281 +286 @@
         ZEND_FETCH_RESOURCE(img, pipi_image_t*, &res, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image); 
 
-        RETURN_BOOL(pipi_save(img, str) == 0);  
+        RETURN_SUCCESS(pipi_save(img, str));    
 }
 
@@ -691 +696 @@
 
 PHP_FUNCTION(pipi_draw_line) {
+        zval *_zval;
+        long x1, y1, x2, y2, color, style = 0;
+        if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlllll|l", &_zval, &x1, &y1, &x2, &y2, &color, &style) == FAILURE) {
+                RETURN_FALSE;
+        }
+        pipi_image_t *img;
+        ZEND_FETCH_RESOURCE(img, pipi_image_t*, &_zval, -1, PHP_PIPI_IMAGE_RES_NAME, le_pipi_image);
+        RETURN_SUCCESS(pipi_draw_line(img, x1, y1, x2, y2, color, style));
 }
 
@@ -767 +780 @@
 
 PHP_FUNCTION(pipi_new_histogram) {
+        if (ZEND_NUM_ARGS() != 0) {
+                WRONG_PARAM_COUNT;
+        }
         pipi_histogram_t *histogram;
         histogram = pipi_new_histogram();
@@ -783 +799 @@
         ZEND_FETCH_RESOURCE(histogram, pipi_histogram_t*, &_zval_hst, -1, PHP_PIPI_HISTOGRAM_RES_NAME, le_pipi_histogram);
 
-        RETURN_BOOL(pipi_get_image_histogram(image, histogram, flags) == 0);
+        RETURN_SUCCESS(pipi_get_image_histogram(image, histogram, flags));
 }
 
@@ -797 +813 @@
         ZEND_FETCH_RESOURCE(histogram, pipi_histogram_t*, &_zval_hst, -1, PHP_PIPI_HISTOGRAM_RES_NAME, le_pipi_histogram);
 
-        RETURN_BOOL(pipi_render_histogram(image, histogram, flags) == 0);
-}
-
-
+        RETURN_SUCCESS(pipi_render_histogram(image, histogram, flags));
+}
+
+