Changeset 3294 for libcacaTweet

Timestamp:

Nov 6, 2008, 8:11:01 AM (14 years ago)

Author:

bsittler

Message:

fix some bugs and inconsistencies in the PHP object layer

File:

• libcaca/trunk/caca-php/caca.php (modified) (3 diffs)

libcaca/trunk/caca-php/caca.php

@@ -57 +57 @@
         }
 
-        function importString($codec) {
-                return caca_import_string($this->cv, $codec);
+        function importString($str, $codec) {
+                return caca_import_string($this->cv, $str, $codec);
         }
 
@@ -181 +181 @@
         }
 
-        function Blit($x, $y, $canvas, $mask = false) {
-                return caca_blit($this->cv, $x, $y, $canvas->get_resource(), ($mask != false) ? $mask->get_resource() : false );
+        function Blit($x, $y, $canvas, $mask = NULL) {
+                if($mask)
+                        return caca_blit($this->cv, $x, $y, $canvas->get_resource(), $mask->get_resource());
+                return caca_blit($this->cv, $x, $y, $canvas->get_resource());
         }
 
@@ -451 +453 @@
         }
 
-        function __construct($canvas, $driver = false) {
-                if ($driver)
+        function __construct($canvas, $driver = NULL) {
+                if($driver)
                         $this->dp = caca_create_display_with_driver($canvas->get_resource(), $driver);
                 else