Skip to content

Commit

Permalink
Merge pull request #1195 from dreamsxin/image_1.3.0_updated
Browse files Browse the repository at this point in the history 
Use PHP 5.5 new GD function
  • Loading branch information
Phalcon committed Sep 5, 2013
2 parents e3d5a52 + e51b21e commit 926da20
Showing 1 changed file with 61 additions and 8 deletions.
69 changes: 61 additions & 8 deletions ext/image/adapter/gd.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,19 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, __construct){
*/
PHP_METHOD(Phalcon_Image_Adapter_GD, _resize) {

zval *width, *height, *ori_width, *ori_height, *pre_width, *pre_height, *reduction_width, *reduction_height;
zval *image = NULL, *ret = NULL, *dst, *tmp_image = NULL;
zval *width, *height;
zval *image = NULL, *tmp_image = NULL;
#if PHP_VERSION_ID < 50500
zval *ori_width, *ori_height, *pre_width, *pre_height, *reduction_width, *reduction_height, *ret = NULL, *dst;
int tmp_width, tmp_height, tmp_pre_width, tmp_pre_height, tmp_reduction_width, tmp_reduction_height;
#endif

PHALCON_MM_GROW();

phalcon_fetch_params(1, 2, 0, &width, &height);

image = phalcon_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC);
#if PHP_VERSION_ID < 50500
ori_width = phalcon_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC);
ori_height = phalcon_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC);

Expand All @@ -301,8 +306,6 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, _resize) {
tmp_pre_width = phalcon_get_intval(ori_width);
tmp_pre_height = phalcon_get_intval(ori_height);

image = phalcon_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC);

PHALCON_INIT_VAR(dst);
ZVAL_LONG(dst, 0);

Expand Down Expand Up @@ -359,6 +362,18 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, _resize) {
phalcon_update_property_this(this_ptr, SL("_width"), width TSRMLS_CC);
phalcon_update_property_this(this_ptr, SL("_height"), height TSRMLS_CC);
}
#else
PHALCON_OBS_NVAR(tmp_image);
PHALCON_CALL_FUNCTION(tmp_image, &tmp_image, "imagescale", 3, tmp_image, width, height);

phalcon_call_func_p1_noret("imagedestroy", image);
phalcon_update_property_this(this_ptr, SL("_image"), tmp_image TSRMLS_CC);

phalcon_update_property_this(this_ptr, SL("_width"), width TSRMLS_CC);
phalcon_update_property_this(this_ptr, SL("_height"), height TSRMLS_CC);
#endif



PHALCON_MM_RESTORE();
}
Expand Down Expand Up @@ -395,14 +410,20 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, _liquidRescale){
*/
PHP_METHOD(Phalcon_Image_Adapter_GD, _crop) {
zval *width, *height, *offset_x, *offset_y;
zval *image, *tmp_image, *dst, *ret;
zval *image, *tmp_image;
#if PHP_VERSION_ID < 50500
zval *dst, *ret;
#else
zval *rect;
#endif

PHALCON_MM_GROW();

phalcon_fetch_params(1, 4, 0, &width, &height, &offset_x, &offset_y);

image = phalcon_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC);

#if PHP_VERSION_ID < 50500
PHALCON_OBS_VAR(tmp_image);
phalcon_call_method_p2_ex(tmp_image, &tmp_image, this_ptr, "_create", width, height);

Expand All @@ -419,6 +440,17 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, _crop) {
phalcon_update_property_this(this_ptr, SL("_width"), width TSRMLS_CC);
phalcon_update_property_this(this_ptr, SL("_height"), height TSRMLS_CC);
}
#else
PHALCON_INIT_VAR(rect);
array_init_size(rect, 4);
phalcon_array_append(&rect, offset_x, 0);
phalcon_array_append(&rect, offset_y, 0);
phalcon_array_append(&rect, width, 0);
phalcon_array_append(&rect, height, 0);

PHALCON_OBS_VAR(tmp_image);
PHALCON_CALL_FUNCTION(tmp_image, &tmp_image, "imagecrop", 2, image, rect);
#endif

PHALCON_MM_RESTORE();
}
Expand Down Expand Up @@ -492,17 +524,24 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, _rotate) {
PHP_METHOD(Phalcon_Image_Adapter_GD, _flip) {

zval *direction;
zval *image = NULL, *flipped_image, *width, *height;
zval *image = NULL, *flipped_image;
#if PHP_VERSION_ID < 50500
zval *width, *height;
zval *dst_x = NULL, *dst_y = NULL, *src_x = NULL, *src_y = NULL, *src_width = NULL, *src_height = NULL;
int w, h, x, y;
#else
zval *mode;
#endif

PHALCON_MM_GROW();

phalcon_fetch_params(1, 1, 0, &direction);

image = phalcon_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC);

#if PHP_VERSION_ID < 50500
width = phalcon_fetch_nproperty_this(this_ptr, SL("_width"), PH_NOISY_CC);
height = phalcon_fetch_nproperty_this(this_ptr, SL("_height"), PH_NOISY_CC);
image = phalcon_fetch_nproperty_this(this_ptr, SL("_image"), PH_NOISY_CC);

PHALCON_OBS_VAR(flipped_image);
phalcon_call_method_p2_ex(flipped_image, &flipped_image, this_ptr, "_create", width, height);
Expand All @@ -511,7 +550,6 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, _flip) {
h = Z_LVAL_P(height);

if (Z_LVAL_P(direction) == PHALCON_IMAGE_HORIZONTAL) {

PHALCON_INIT_NVAR(dst_y);
ZVAL_LONG(dst_y, 0);

Expand Down Expand Up @@ -558,6 +596,20 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, _flip) {
PHALCON_CALL_FUNCTION(NULL, NULL, "imagecopy", 8, flipped_image, image, dst_x, dst_y, src_x, src_y, src_width, src_height);
}
}
#else
PHALCON_INIT_VAR(mode);
if (Z_LVAL_P(direction) == PHALCON_IMAGE_HORIZONTAL) {
if (zend_get_constant(SL("IMG_FLIP_HORIZONTAL"), mode TSRMLS_CC) == FAILURE) {
RETURN_MM();
}
} else {
if (zend_get_constant(SL("IMG_FLIP_VERTICAL"), mode TSRMLS_CC) == FAILURE) {
RETURN_MM();
}
}
PHALCON_OBS_VAR(flipped_image);
PHALCON_CALL_FUNCTION(flipped_image, &flipped_image, "imageflip", 2, image, mode);
#endif

phalcon_call_func_p1_noret("imagedestroy", image);
phalcon_update_property_this(this_ptr, SL("_image"), flipped_image TSRMLS_CC);
Expand Down Expand Up @@ -1521,3 +1573,4 @@ PHP_METHOD(Phalcon_Image_Adapter_GD, __destruct){

PHALCON_MM_RESTORE();
}

0 comments on commit 926da20

Please sign in to comment.