diff options
| author | Anatol Belski <ab@php.net> | 2014-08-19 08:07:31 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-08-19 08:07:31 +0200 |
| commit | 63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc (patch) | |
| tree | e561a58d6e084c5e4cbdde1f84aed16cf4724383 /ext/exif | |
| parent | 1e8273964fbd517a2eb9e560f9cdb4afffa0c034 (diff) | |
| download | php-git-63d3f0b844b3a5f1c94be3c97bca29235dc2b3fc.tar.gz | |
basic macro replacements, all at once
Diffstat (limited to 'ext/exif')
| -rw-r--r-- | ext/exif/exif.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/ext/exif/exif.c b/ext/exif/exif.c index 127cb30941..57545bf42c 100644 --- a/ext/exif/exif.c +++ b/ext/exif/exif.c @@ -223,9 +223,9 @@ PHP_MINIT_FUNCTION(exif) { REGISTER_INI_ENTRIES(); if (zend_hash_str_exists(&module_registry, "mbstring", sizeof("mbstring")-1)) { - REGISTER_LONG_CONSTANT("EXIF_USE_MBSTRING", 1, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("EXIF_USE_MBSTRING", 1, CONST_CS | CONST_PERSISTENT); } else { - REGISTER_LONG_CONSTANT("EXIF_USE_MBSTRING", 0, CONST_CS | CONST_PERSISTENT); + REGISTER_INT_CONSTANT("EXIF_USE_MBSTRING", 0, CONST_CS | CONST_PERSISTENT); } return SUCCESS; } @@ -2020,16 +2020,16 @@ static void add_assoc_image_info(zval *value, int sub_array, image_info_type *im if (l>1) { info_value = &info_data->value; for (b=0;b<l;b++) { - add_index_long(&array, b, (int)(info_value->s[b])); + add_index_int(&array, b, (int)(info_value->s[b])); } break; } case TAG_FMT_USHORT: case TAG_FMT_ULONG: if (l==1) { - add_assoc_long(&tmpi, name, (int)info_value->u); + add_assoc_int(&tmpi, name, (int)info_value->u); } else { - add_index_long(&array, ap, (int)info_value->u); + add_index_int(&array, ap, (int)info_value->u); } break; @@ -2046,16 +2046,16 @@ static void add_assoc_image_info(zval *value, int sub_array, image_info_type *im if (l>1) { info_value = &info_data->value; for (b=0;b<l;b++) { - add_index_long(&array, ap, (int)info_value->s[b]); + add_index_int(&array, ap, (int)info_value->s[b]); } break; } case TAG_FMT_SSHORT: case TAG_FMT_SLONG: if (l==1) { - add_assoc_long(&tmpi, name, info_value->i); + add_assoc_int(&tmpi, name, info_value->i); } else { - add_index_long(&array, ap, info_value->i); + add_index_int(&array, ap, info_value->i); } break; @@ -4129,12 +4129,12 @@ PHP_FUNCTION(exif_thumbnail) } zval_dtor(p_width); zval_dtor(p_height); - ZVAL_LONG(p_width, ImageInfo.Thumbnail.width); - ZVAL_LONG(p_height, ImageInfo.Thumbnail.height); + ZVAL_INT(p_width, ImageInfo.Thumbnail.width); + ZVAL_INT(p_height, ImageInfo.Thumbnail.height); } if (arg_c >= 4) { zval_dtor(p_imagetype); - ZVAL_LONG(p_imagetype, ImageInfo.Thumbnail.filetype); + ZVAL_INT(p_imagetype, ImageInfo.Thumbnail.filetype); } #ifdef EXIF_DEBUG @@ -4175,7 +4175,7 @@ PHP_FUNCTION(exif_imagetype) if (itype == IMAGE_FILETYPE_UNKNOWN) { RETURN_FALSE; } else { - ZVAL_LONG(return_value, itype); + ZVAL_INT(return_value, itype); } } /* }}} */ |