Changeset 424 for MagickWandForPHP

Timestamp:

10/21/09 07:46:08 (5 months ago)

Author:

cristy

Message:

 

Location:

MagickWandForPHP/trunk

Files:

• ChangeLog (modified) (2 diffs)
• magickwand.c (modified) (43 diffs)

MagickWandForPHP/trunk/ChangeLog

@@ -30 +30 @@
 
 2007-02-12  1.0.0-0 Cristy  <omicronpersei8@image...>
-  * Deprecate MagickGetImageAttribute()/MagickSetImageAttribute(), use
+  * Deprecate MagickGetImageProperty()/MagickSetImageAttribute(), use
     MagickGetImageProperty()/MagickSetImageProperty() instead.
 
@@ -1047 +1047 @@
 - MagickWand for PHP v0.1.4 has a minimum requirement of ImageMagick-6.2.1-1
 
-- Added the new MagickWand C API functions MagickGetImageAttribute(),
+- Added the new MagickWand C API functions MagickGetImageProperty(),
   MagickIdentifyImage() and MagickSepiaToneImage().
 

MagickWandForPHP/trunk/magickwand.c

@@ -148 +148 @@
                           php_stream_close(stream);
 
-                          if ( MagickSetImageIndex( magick_wand, (long) orig_img_idx ) == MagickTrue ) {
+                          if ( MagickSetIteratorIndex( magick_wand, (long) orig_img_idx ) == MagickTrue ) {
                                   while ( MagickSetImageFilename( magick_wand, (char *) NULL ), MagickNextImage( magick_wand ) == MagickTrue )
                                           ;
@@ -234 +234 @@
                 }
 
-                img_idx = (long) MagickGetImageIndex( magick_wand );
+                img_idx = (long) MagickGetIteratorIndex( magick_wand );
                 if ( MagickGetExceptionType(magick_wand) == UndefinedException ) {
                         img_idx++;
@@ -242 +242 @@
                 if ( MagickReadImage( magick_wand, real_magick_format ) == MagickTrue ) {
 
-                        if ( MagickSetImageIndex( magick_wand, (long) img_idx ) == MagickTrue ) {
+                        if ( MagickSetIteratorIndex( magick_wand, (long) img_idx ) == MagickTrue ) {
 
                                 num_imgs = ((unsigned long) MagickGetNumberImages( magick_wand )) - num_imgs - 1;
@@ -287 +287 @@
                                 }
                                 else {
-                                        img_idx = (long) MagickGetImageIndex( magick_wand );
+                                        img_idx = (long) MagickGetIteratorIndex( magick_wand );
                                 }
 
@@ -298 +298 @@
                                         MW_DEBUG_NOTICE_EX( "The image \"%s\" was read successfully", real_filename );
 
-                                        if ( MagickSetImageIndex( magick_wand, (long) img_idx ) == MagickTrue ) {
+                                        if ( MagickSetIteratorIndex( magick_wand, (long) img_idx ) == MagickTrue ) {
 
                                                 if ( set_wand_format == MagickTrue ) {
@@ -2175 +2175 @@
 /* }}} */
 
-/* {{{ proto float DrawGetFillAlpha( DrawingWand draw_wand )
+/* {{{ proto float DrawGetFillOpacity( DrawingWand draw_wand )
 */
 PHP_FUNCTION( drawgetfillalpha )
@@ -2181 +2181 @@
         MW_PRINT_DEBUG_INFO
 
-        MW_GET_WAND_RET_DOUBLE( DrawingWand, DrawGetFillAlpha );
+        MW_GET_WAND_RET_DOUBLE( DrawingWand, DrawGetFillOpacity );
 }
 /* }}} */
@@ -2285 +2285 @@
 /* }}} */
 
-/* {{{ proto float DrawGetStrokeAlpha( DrawingWand draw_wand )
+/* {{{ proto float DrawGetStrokeOpacity( DrawingWand draw_wand )
 */
 PHP_FUNCTION( drawgetstrokealpha )
@@ -2291 +2291 @@
         MW_PRINT_DEBUG_INFO
 
-        MW_GET_WAND_RET_DOUBLE( DrawingWand, DrawGetStrokeAlpha );
+        MW_GET_WAND_RET_DOUBLE( DrawingWand, DrawGetStrokeOpacity );
 }
 /* }}} */
@@ -3093 +3093 @@
 /* }}} */
 
-/* {{{ proto void DrawSetFillAlpha( DrawingWand draw_wand, float fill_opacity )
+/* {{{ proto void DrawSetFillOpacity( DrawingWand draw_wand, float fill_opacity )
 */
 PHP_FUNCTION( drawsetfillalpha )
@@ -3099 +3099 @@
         MW_PRINT_DEBUG_INFO
 
-        MW_GET_WAND_SET_NORMALIZED_COLOR( DrawingWand, DrawSetFillAlpha );
+        MW_GET_WAND_SET_NORMALIZED_COLOR( DrawingWand, DrawSetFillOpacity );
 }
 /* }}} */
@@ -3262 +3262 @@
 /* }}} */
 
-/* {{{ proto void DrawSetStrokeAlpha( DrawingWand draw_wand, float stroke_opacity )
+/* {{{ proto void DrawSetStrokeOpacity( DrawingWand draw_wand, float stroke_opacity )
 */
 PHP_FUNCTION( drawsetstrokealpha )
@@ -3268 +3268 @@
         MW_PRINT_DEBUG_INFO
 
-        MW_GET_WAND_SET_NORMALIZED_COLOR( DrawingWand, DrawSetStrokeAlpha );
+        MW_GET_WAND_SET_NORMALIZED_COLOR( DrawingWand, DrawSetStrokeOpacity );
 }
 /* }}} */
@@ -4011 +4011 @@
 /* }}} */
 
-/* {{{ proto bool MagickClipPathImage( MagickWand magick_wand, string pathname, bool inside )
+/* {{{ proto bool MagickClipImagePath( MagickWand magick_wand, string pathname, bool inside )
 */
 PHP_FUNCTION( magickclippathimage )
@@ -4029 +4029 @@
         MW_GET_POINTER_FROM_RSRC( MagickWand, magick_wand, &magick_wand_rsrc_zvl_p );
 
-        MW_BOOL_FUNC_RETVAL_BOOL( MagickClipPathImage( magick_wand, path_name, MW_MK_MGCK_BOOL(clip_inside) ) );
+        MW_BOOL_FUNC_RETVAL_BOOL( MagickClipImagePath( magick_wand, path_name, MW_MK_MGCK_BOOL(clip_inside) ) );
 }
 /* }}} */
@@ -4545 +4545 @@
 /* }}} */
 
-/* {{{ proto string MagickDescribeImage( MagickWand magick_wand )
+/* {{{ proto string MagickIdentifyImage( MagickWand magick_wand )
 */
 PHP_FUNCTION( magickdescribeimage )
@@ -4551 +4551 @@
         MW_PRINT_DEBUG_INFO
 
-        MW_GET_WAND_RETVAL_STRING( MagickWand, MagickDescribeImage );
+        MW_GET_WAND_RETVAL_STRING( MagickWand, MagickIdentifyImage );
 }
 /* }}} */
@@ -4597 +4597 @@
            as they will occur if magick_wand contains no images
         */
-        img_idx = (long) MagickGetImageIndex( magick_wand );
+        img_idx = (long) MagickGetIteratorIndex( magick_wand );
         if ( MagickGetExceptionType(magick_wand) != UndefinedException  ) {
                 RETURN_FALSE;
@@ -4723 +4723 @@
            as they will occur if magick_wand contains no images
         */
-        img_idx = (long) MagickGetImageIndex( magick_wand );
+        img_idx = (long) MagickGetIteratorIndex( magick_wand );
         if ( MagickGetExceptionType(magick_wand) != UndefinedException  ) {
                 RETURN_FALSE;
@@ -4851 +4851 @@
            as they will occur if magick_wand contains no images
         */
-        img_idx = (long) MagickGetImageIndex( magick_wand );
+        img_idx = (long) MagickGetIteratorIndex( magick_wand );
         if ( MagickGetExceptionType(magick_wand) != UndefinedException  ) {
                 RETURN_FALSE;
@@ -4951 +4951 @@
            as they will occur if magick_wand contains no images
         */
-        img_idx = (long) MagickGetImageIndex( magick_wand );
+        img_idx = (long) MagickGetIteratorIndex( magick_wand );
         if ( MagickGetExceptionType(magick_wand) != UndefinedException  ) {
                 RETURN_FALSE;
@@ -5425 +5425 @@
            as they will occur if magick_wand contains no images
         */
-        img_idx = (long) MagickGetImageIndex( magick_wand );
+        img_idx = (long) MagickGetIteratorIndex( magick_wand );
         if ( MagickGetExceptionType(magick_wand) != UndefinedException  ) {
                 RETURN_FALSE;
@@ -5508 +5508 @@
            as they will occur if magick_wand contains no images
         */
-        img_idx = (long) MagickGetImageIndex( magick_wand );
+        img_idx = (long) MagickGetIteratorIndex( magick_wand );
         if ( MagickGetExceptionType(magick_wand) != UndefinedException  ) {
                 RETURN_FALSE;
@@ -5754 +5754 @@
 /* }}} */
 
-/* {{{ proto string MagickGetImageAttribute( MagickWand magick_wand, string key )
+/* {{{ proto string MagickGetImageProperty( MagickWand magick_wand, string key )
 */
 PHP_FUNCTION( magickgetimageattribute )
@@ -5771 +5771 @@
         MW_GET_POINTER_FROM_RSRC( MagickWand, magick_wand, &magick_wand_rsrc_zvl_p );
 
-        value = (char *) MagickGetImageAttribute( magick_wand, key );
+        value = (char *) MagickGetImageProperty( magick_wand, key );
 
         if ( value == (char *) NULL || *value == '\0' ) {
@@ -5910 +5910 @@
 /* }}} */
 
-/* {{{ proto int MagickGetImageIndex( MagickWand magick_wand )
+/* {{{ proto int MagickGetIteratorIndex( MagickWand magick_wand )
 */
 PHP_FUNCTION( magickgetimageindex )
@@ -5916 +5916 @@
         MW_PRINT_DEBUG_INFO
 
-        MW_GET_WAND_RET_LONG( MagickWand, MagickGetImageIndex );
+        MW_GET_WAND_RET_LONG( MagickWand, MagickGetIteratorIndex );
 }
 /* }}} */
@@ -6036 +6036 @@
 /* }}} */
 
-/* {{{ proto array MagickGetImagePixels( MagickWand magick_wand, int x_offset, int y_offset, float columns, float rows, string map, int storage_type )
+/* {{{ proto array MagickExportImagePixels( MagickWand magick_wand, int x_offset, int y_offset, float columns, float rows, string map, int storage_type )
 */
 PHP_FUNCTION( magickgetimagepixels )
@@ -6087 +6087 @@
 {   type *pixel_array;  \
         MW_ARR_ECALLOC( type, pixel_array, pixel_array_length );  \
-        if ( MagickGetImagePixels( magick_wand,  \
+        if ( MagickExportImagePixels( magick_wand,  \
                                                            x_offset, y_offset,  \
                                                            (unsigned long) columns, (unsigned long) rows,  \
@@ -6258 +6258 @@
 /* }}} */
 
-/* {{{ proto int MagickGetImageSize( MagickWand magick_wand )
+/* {{{ proto int MagickGetImageLength( MagickWand magick_wand )
 */
 PHP_FUNCTION( magickgetimagesize )
@@ -7047 +7047 @@
         }
 
-        cur_idx = (long) MagickGetImageIndex( magick_wand );
+        cur_idx = (long) MagickGetIteratorIndex( magick_wand );
         if ( MagickGetExceptionType(magick_wand) != UndefinedException ) {
                 cur_idx = -1;
@@ -7054 +7054 @@
 
         if (   MagickNewImage( magick_wand, (unsigned long) width, (unsigned long) height, bg_pixel_wand ) == MagickTrue
-                && MagickSetImageIndex( magick_wand, (cur_idx + 1) ) == MagickTrue )
+                && MagickSetIteratorIndex( magick_wand, (cur_idx + 1) ) == MagickTrue )
         {
                 RETVAL_TRUE;
@@ -7783 +7783 @@
         if( MagickReadImageBlob( magick_wand, (void *) blob, (size_t) blob_len ) == MagickTrue ) {
 
-                if ( MagickSetImageIndex( magick_wand, (long) orig_img_idx ) == MagickTrue ) {
+                if ( MagickSetIteratorIndex( magick_wand, (long) orig_img_idx ) == MagickTrue ) {
                         while ( MagickSetImageFilename( magick_wand, (char *) NULL ), MagickNextImage( magick_wand ) == MagickTrue )
                                 ;
@@ -7824 +7824 @@
                 unsigned long orig_img_idx = (unsigned long) MagickGetNumberImages( magick_wand );
                 
-                if ( MagickSetImageIndex( magick_wand, (long) orig_img_idx ) == MagickTrue ) {
+                if ( MagickSetIteratorIndex( magick_wand, (long) orig_img_idx ) == MagickTrue ) {
                         while ( MagickSetImageFilename( magick_wand, (char *) NULL ), MagickNextImage( magick_wand ) == MagickTrue )
                                 ;
@@ -8340 +8340 @@
 /* }}} */
 
-/* {{{ proto bool MagickSetImageAttribute( MagickWand magick_wand, string key, string value )
+/* {{{ proto bool MagickSetImageProperty( MagickWand magick_wand, string key, string value )
 */
 PHP_FUNCTION( magicksetimageattribute )
@@ -8364 +8364 @@
         MW_GET_POINTER_FROM_RSRC( MagickWand, magick_wand, &magick_wand_rsrc_zvl_p );
 
-        MW_BOOL_FUNC_RETVAL_BOOL( MagickSetImageAttribute( magick_wand, key, value ) );
+        MW_BOOL_FUNC_RETVAL_BOOL( MagickSetImageProperty( magick_wand, key, value ) );
 }
 /* }}} */
@@ -8703 +8703 @@
 /* }}} */
 
-/* {{{ proto bool MagickSetImageIndex( MagickWand magick_wand, int index )
+/* {{{ proto bool MagickSetIteratorIndex( MagickWand magick_wand, int index )
 */
 PHP_FUNCTION( magicksetimageindex )
@@ -8717 +8717 @@
         MW_GET_POINTER_FROM_RSRC( MagickWand, magick_wand, &magick_wand_rsrc_zvl_p );
 
-        MW_BOOL_FUNC_RETVAL_BOOL( MagickSetImageIndex( magick_wand, index ) );
+        MW_BOOL_FUNC_RETVAL_BOOL( MagickSetIteratorIndex( magick_wand, index ) );
 }
 /* }}} */
@@ -8829 +8829 @@
 /* }}} */
 
-/* {{{ proto bool MagickSetImagePixels( MagickWand magick_wand, int x_offset, int y_offset, float columns, float rows, string map, int storage_type, array pixel_array )
+/* {{{ proto bool MagickImportImagePixels( MagickWand magick_wand, int x_offset, int y_offset, float columns, float rows, string map, int storage_type, array pixel_array )
 */
 PHP_FUNCTION( magicksetimagepixels )
@@ -8903 +8903 @@
         }  \
         MW_BOOL_FUNC_RETVAL_BOOL(  \
-                MagickSetImagePixels( magick_wand,  \
+                MagickImportImagePixels( magick_wand,  \
                                                           x_offset, y_offset,  \
                                                           (unsigned long) columns, (unsigned long) rows,  \
@@ -9826 +9826 @@
            as they will occur if magick_wand contains no images
         */
-        img_idx = (long) MagickGetImageIndex( magick_wand );
+        img_idx = (long) MagickGetIteratorIndex( magick_wand );
         if ( MagickGetExceptionType(magick_wand) != UndefinedException  ) {
                 RETURN_FALSE;
@@ -9978 +9978 @@
            which will occur if magick_wand contains no images
         */
-        initial_index = (long) MagickGetImageIndex( magick_wand );
+        initial_index = (long) MagickGetIteratorIndex( magick_wand );
 
         if ( MagickGetExceptionType(magick_wand) != UndefinedException  ) {
@@ -10232 +10232 @@
 
                 /* If all the above was successful, set the image index back to what it was */
-                if ( MagickSetImageIndex( magick_wand, initial_index ) == MagickFalse ) {
-
-                        /* Just in case error occurs in MagickSetImageIndex() */
+                if ( MagickSetIteratorIndex( magick_wand, initial_index ) == MagickFalse ) {
+
+                        /* Just in case error occurs in MagickSetIteratorIndex() */
                         MW_API_FUNC_FAIL_CHECK_WAND_ERROR_EX_1( magick_wand, MagickWand,
                                                                                                         "cannot reset the MagickWand index to %ld",