cvs: pecl /imagick imagick.c

mkoppanen Wed Sep 12 22:05:37 2007 UTC Modified files: /pecl/imagick imagick.c Log: Moved getImageLength into an #if http://cvs.php.net/viewvc.cgi/pecl/imagick/imagick.c?r1=1.148&r2=1.149&diff_format=u Index: pecl/imagick/imagick.c diff -u pecl/imagick/imagick.c:1.148 pecl/imagick/imagick.c:1.149 --- pecl/imagick/imagick.c:1.148 Wed Sep 12 21:59:37 2007 +++ pecl/imagick/imagick.c Wed Sep 12 22:05:37 2007 @@ -165,6 +165,7 @@ PHP_METHOD(imagick, setimageinterpolatemethod); PHP_METHOD(imagick, getimageinterpolatemethod); PHP_METHOD(imagick, linearstretchimage); +PHP_METHOD(imagick, getimagelength); #endif #if MagickLibVersion > 0x635 && IMAGICK_CHECK_MAGICKLIB_REVISION(MagickLibVersionNumber) >= 7 PHP_METHOD(imagick, clutimage); @@ -197,7 +198,6 @@ PHP_METHOD(imagick, getimagefilename); PHP_METHOD(imagick, getimageformat); PHP_METHOD(imagick, getimagesize); -PHP_METHOD(imagick, getimagelength); PHP_METHOD(imagick, getimagegeometry); PHP_METHOD(imagick, getimagecolors); PHP_METHOD(imagick, scaleimage); @@ -2385,6 +2385,7 @@ PHP_ME(imagick, setimageinterpolatemethod, imagick_setimageinterpolatemethod_args, ZEND_ACC_PUBLIC) PHP_ME(imagick, getimageinterpolatemethod, imagick_zero_args, ZEND_ACC_PUBLIC) PHP_ME(imagick, linearstretchimage, imagick_linearstretchimage_args, ZEND_ACC_PUBLIC) + PHP_ME(imagick, getimagelength, imagick_zero_args, ZEND_ACC_PUBLIC) #endif #if MagickLibVersion > 0x635 && IMAGICK_CHECK_MAGICKLIB_REVISION(MagickLibVersionNumber) >= 7 PHP_ME(imagick, clutimage, imagick_clutimage_args, ZEND_ACC_PUBLIC) @@ -2409,7 +2410,6 @@ PHP_ME(imagick, clear, imagick_zero_args, ZEND_ACC_PUBLIC) PHP_ME(imagick, clone, imagick_zero_args, ZEND_ACC_PUBLIC) PHP_ME(imagick, getimagesize, imagick_zero_args, ZEND_ACC_PUBLIC) - PHP_ME(imagick, getimagelength, imagick_zero_args, ZEND_ACC_PUBLIC) PHP_ME(imagick, getimageblob, imagick_zero_args, ZEND_ACC_PUBLIC) PHP_ME(imagick, getimagesblob, imagick_zero_args, ZEND_ACC_PUBLIC) PHP_ME(imagick, setfirstiterator, imagick_zero_args, ZEND_ACC_PUBLIC) @@ -4006,6 +4006,31 @@ RETURN_TRUE; } /* }}} */ + +/* {{{ proto int Imagick::getImageLength() + returns the image length in bytes +*/ +PHP_METHOD(imagick, getimagelength) +{ + php_imagick_object *intern; + zval *object; + MagickSizeType length; + MagickBooleanType status; + + IMAGICK_INITIALIZE_ZERO_ARGS( object, php_imagick_object *, intern ); + IMAGICK_CHECK_NOT_EMPTY( intern->magick_wand, 1, 1 ); + + status = MagickGetImageLength( intern->magick_wand, &length ); + + if ( status == MagickFalse ) + { + throwExceptionWithMessage( 1, "Unable to acquire image length", 1 TSRMLS_CC ); + RETURN_FALSE; + } + + RETVAL_LONG( length ); +} +/* }}} */ #endif #if MagickLibVersion > 0x635 && IMAGICK_CHECK_MAGICKLIB_REVISION(MagickLibVersionNumber) >= 7 @@ -8752,31 +8777,6 @@ } /* }}} */ -/* {{{ proto int Imagick::getImageLength() - returns the image length in bytes -*/ -PHP_METHOD(imagick, getimagelength) -{ - php_imagick_object *intern; - zval *object; - MagickSizeType length; - MagickBooleanType status; - - IMAGICK_INITIALIZE_ZERO_ARGS( object, php_imagick_object *, intern ); - IMAGICK_CHECK_NOT_EMPTY( intern->magick_wand, 1, 1 ); - - status = MagickGetImageLength( intern->magick_wand, &length ); - - if ( status == MagickFalse ) - { - throwExceptionWithMessage( 1, "Unable to acquire image length", 1 TSRMLS_CC ); - RETURN_FALSE; - } - - RETVAL_LONG( length ); -} -/* }}} */ - /* {{{ proto string Imagick::getImageBlob() Returns the current image sequence as a string */