php-directfb-cvs

[Claudio C. <kl...@us...>]

Update of /cvsroot/php-directfb/PHP-DirectFB/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29168

Modified Files:
	datatypes.c 
Log Message:
Renamed DFBSurfaceDescription::$preallocated DFBSurfaceDescription::$preallocated_data.


Index: datatypes.c
===================================================================
RCS file: /cvsroot/php-directfb/PHP-DirectFB/src/datatypes.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- datatypes.c	15 Nov 2004 15:06:18 -0000	1.3
+++ datatypes.c	17 Nov 2004 17:04:25 -0000	1.4
@@ -80,7 +80,8 @@
                break;
           case T_STRING:
                convert_to_string_ex( tmp );
-               *((char**) ret) = estrdup( Z_STRVAL_PP( tmp ));
+               *((char**) ret) = Z_STRVAL_PP( tmp );
+               break;
           case T_ARRAY:
                convert_to_array_ex( tmp );
                *((zval**) ret) = *tmp;
@@ -739,9 +740,9 @@
      add_property_long( this, "height", dsc.height );
      add_property_long( this, "pixelformat", dsc.pixelformat );
      if (buffer && size > 0 && pitch > 0)
-          add_property_stringl( this, "preallocated", buffer, size, 1 );
+          add_property_stringl( this, "preallocated_data", buffer, size, 1 );
      else
-          add_property_unset( this, "preallocated" );
+          add_property_unset( this, "preallocated_data" );
      add_property_long( this, "preallocated_pitch", pitch );
      add_property_zval( this, "palette", palette );
      
@@ -781,10 +782,10 @@
               dsc->pixelformat == DSPF_I420)
                     size += (size >> 1) & ~1;
           
-          add_property_stringl( ret, "preallocated",
+          add_property_stringl( ret, "preallocated_data",
                                 dsc->preallocated[0].data, size, 1 );
      } else
-          add_property_unset( ret, "preallocated" );
+          add_property_unset( ret, "preallocated_data" );
      
      add_property_long( ret, "preallocated_pitch", dsc->preallocated[0].pitch );
      add_property_zval( ret, "palette", palette );
@@ -812,7 +813,7 @@
      if (ret->flags & DSDESC_PREALLOCATED) {
           zval *data = NULL;
           
-          GET_ENTRY_DATA( preallocated, &data );
+          GET_ENTRY_DATA( preallocated_data, &data );
           GET_ENTRY_LONG( preallocated_pitch, &ret->preallocated[0].pitch );
           
           if (data && Z_STRLEN_P( data ) > 0 && ret->preallocated[0].pitch > 0) {
@@ -822,7 +823,7 @@
                ret->preallocated[1] = ret->preallocated[0];
           } else {
                php_error( E_WARNING, 
-                          "wrong or unset DFBSurfaceDescription::$preallocated" );
+                          "wrong or unset DFBSurfaceDescription::$preallocated_data" );
                ret->flags &= ~DSDESC_PREALLOCATED;
           }
      }