mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-14 04:16:30 +08:00
Code Issues Packages Projects Releases Wiki Activity
47c787ff5b
php-src/ext/gd/gd.c

4214 lines
103 KiB
C
Raw Normal View History

updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
/*
+----------------------------------------------------------------------+
Remove year range from copyright notice
2019-01-30 17:00:23 +08:00
| Copyright (c) The PHP Group |
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
+----------------------------------------------------------------------+
bump year and license version
2006-01-01 20:51:34 +08:00
| This source file is subject to version 3.01 of the PHP license, |
License update
1999-07-16 21:13:16 +08:00
| that is bundled with this package in the file LICENSE, and is |
updating license information in the headers.
2003-06-11 04:04:29 +08:00
| available through the world-wide-web at the following url: |
bump year and license version
2006-01-01 20:51:34 +08:00
| http://www.php.net/license/3_01.txt |
License update
1999-07-16 21:13:16 +08:00
| If you did not receive a copy of the PHP license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@php.net so we can mail you a copy immediately. |
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
+----------------------------------------------------------------------+
Maintain headers.
2002-02-28 16:29:35 +08:00
| Authors: Rasmus Lerdorf <rasmus@php.net> |
* email address change
2003-03-18 20:06:09 +08:00
| Stig Bakken <ssb@php.net> |
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
| Jim Winstead <jimw@php.net> |
+----------------------------------------------------------------------+
*/
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* gd 1.2 is copyright 1994, 1995, Quest Protein Database Center,
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Cold Spring Harbor Labs. */
/* Note that there is no code from the gd package in this file */
Remove tls.[ch]
1999-04-24 04:06:01 +08:00
* include "config.h" if HAVE_CONFIG_H is defined (for standalone dso build)
2001-05-24 18:07:29 +08:00
#ifdef HAVE_CONFIG_H
#include "config.h"
#endif
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#include "php.h"
- MFH: add a weak/tolerant mode to the jpeg loader
2006-02-05 23:53:58 +08:00
#include "php_ini.h"
moved fdf, hyperwave, informix and some smaller files
1999-04-22 08:25:57 +08:00
#include "ext/standard/head.h"
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#include <math.h>
* Get the Apache module to compile again * Get rid of php3_rqst, use SG(server_context) instead (there's still Apache-specific code, but it nuked a global)
1999-04-27 01:26:37 +08:00
#include "SAPI.h"
Clean up php3.*\.h files. The files itself are renamed, and references in all .*\.[ch] files were changed. There is a slight chance that my script missed a few changes, please correct them manually.
1999-12-05 03:19:57 +08:00
#include "php_gd.h"
made gd working correct under win32 # fixes the issues when running php threadsafe
2000-11-29 23:25:42 +08:00
#include "ext/standard/info.h"
Fixed bug #29594 (Use PHP's own tmpfile() implementation).
2004-08-17 07:07:42 +08:00
#include "php_open_temporary_file.h"
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
#include "zend_object_handlers.h"
#include "zend_interfaces.h"
- MFH: fix warning
2008-08-29 19:09:28 +08:00
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#ifdef HAVE_SYS_WAIT_H
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
# include <sys/wait.h>
#endif
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#ifdef HAVE_UNISTD_H
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
# include <unistd.h>
#endif
- More #if WIN32|WINNT -> #ifdef PHP_WIN32 conversions
2000-06-16 07:45:05 +08:00
#ifdef PHP_WIN32
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
# include <io.h>
# include <fcntl.h>
- ws
2009-04-07 20:45:26 +08:00
# include <windows.h>
# include <Winuser.h>
# include <Wingdi.h>
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#endif
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
fix build with bundled libgd
2013-05-04 22:51:56 +08:00
# include <X11/xpm.h>
- #47812, undefined symbol: gdJpegGetVersionInt - #46015, Build fails with system gd - enable gd_compat when built using system's gd
2009-04-07 17:26:22 +08:00
#endif
Revert removal of overflow2 use in gd.c Function provided by gd_security with bundled libgd Function provided by gd_compat with system libgd This fix failed test imageloadfont_invalid.phpt This test now also pass with system libgd
2013-05-06 16:00:45 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
#include "gd_compat.h"
Move png and jpeg version functions to gd.c so the external library build doesn't include anything from libgd/.
2013-05-03 21:37:39 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
static int le_gd_font;
phpinfo() prettying I will get to the rest of the functions later tonight or tomorrow (i.e. from hyperwave to snmp)
2000-04-06 06:30:19 +08:00
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#include <gd.h>
Unify error handling of bundled and external libgd There's no need anymore to call an own error handler directly. Instead we register our error handler and call libgd's error functions (which will forward). We do this regardless of compiling with the bundled or an external libgd.
2016-10-07 07:06:24 +08:00
#include <gd_errors.h>
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#include <gdfontt.h> /* 1 Tiny font */
#include <gdfonts.h> /* 2 Small font */
#include <gdfontmb.h> /* 3 Medium bold font */
#include <gdfontl.h> /* 4 Large font */
#include <gdfontg.h> /* 5 Giant font */
- MFH: fix warning
2008-08-29 19:09:28 +08:00
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#if defined(HAVE_GD_FREETYPE) && defined(HAVE_GD_BUNDLED)
Drop superfluous ENABLE_GD_TTF If we `HAVE_LIBFREETYPE`, we define `ENABLE_GD_TTF` if it is not defined. Therefore we can check for `HAVE_LIBFREETYPE` in the first place.
2019-07-21 23:28:49 +08:00
# include <ft2build.h>
# include FT_FREETYPE_H
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#endif
- fix regression (imagerotate_overflow.phpt)
2013-03-22 15:28:11 +08:00
#if defined(HAVE_GD_XPM) && defined(HAVE_GD_BUNDLED)
# include "X11/xpm.h"
#endif
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#ifndef M_PI
#define M_PI 3.14159265358979323846
#endif
workaround typo in system libgd 2.3.0
2020-04-15 15:07:21 +08:00
/* workaround typo in system libgd 2.3.0 */
#if defined(GD_FLIP_HORINZONTAL) && !defined(GD_FLIP_HORIZONTAL)
#define GD_FLIP_HORIZONTAL GD_FLIP_HORINZONTAL
#endif
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#ifdef HAVE_GD_FREETYPE
Made imagegammacorrect() work on true-color images. Added support for new ImageStringFTEx function (due in GD 2.0.2).
2001-07-06 05:23:28 +08:00
static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int, int);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#endif
Add GD function stubs
2019-08-11 16:14:51 +08:00
#include "gd_arginfo.h"
Fixed bug #29349 (imagecreatefromstring() crashes with external GD library) Original Patch By: adconrad at debian dot org
2004-07-27 08:27:06 +08:00
trailing whitespace removal
2015-01-03 17:22:58 +08:00
/* as it is not really public, duplicate declaration here to avoid
- fix regression (imagerotate_overflow.phpt)
2013-03-22 15:28:11 +08:00
pointless warnings */
int overflow2(int a, int b);
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
/* Section Filters Declarations */
/* IMPORTANT NOTE FOR NEW FILTER
* Do not forget to update:
* IMAGE_FILTER_MAX: define the last filter index
typo fixes
2013-07-13 20:37:04 +08:00
* IMAGE_FILTER_MAX_ARGS: define the biggest amount of arguments
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
* image_filter array in PHP_FUNCTION(imagefilter)
* */
#define IMAGE_FILTER_NEGATE 0
#define IMAGE_FILTER_GRAYSCALE 1
#define IMAGE_FILTER_BRIGHTNESS 2
#define IMAGE_FILTER_CONTRAST 3
#define IMAGE_FILTER_COLORIZE 4
#define IMAGE_FILTER_EDGEDETECT 5
#define IMAGE_FILTER_EMBOSS 6
#define IMAGE_FILTER_GAUSSIAN_BLUR 7
#define IMAGE_FILTER_SELECTIVE_BLUR 8
#define IMAGE_FILTER_MEAN_REMOVAL 9
#define IMAGE_FILTER_SMOOTH 10
MFH: added pixelate filter.
2009-01-15 03:06:12 +08:00
#define IMAGE_FILTER_PIXELATE 11
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
#define IMAGE_FILTER_SCATTER 12
#define IMAGE_FILTER_MAX 12
MFH: bump up and use IMAGE_FILTER_MAX_ARGS instead of a magic number.
2009-01-20 00:35:58 +08:00
#define IMAGE_FILTER_MAX_ARGS 6
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_contrast(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_colorize(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_edgedetect(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_emboss(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_gaussian_blur(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_selective_blur(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_mean_removal(INTERNAL_FUNCTION_PARAMETERS);
static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS);
MFH: added pixelate filter.
2009-01-15 03:06:12 +08:00
static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS);
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS);
- [DOC] always enable imagefilter and imageconvolution, even when built against system's gd
2009-05-26 20:50:40 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
/* End Section filters declarations */
Use zpp string argument in imagecreatefromstring() Instead of accepting a zval and casting it.
2019-02-28 19:07:34 +08:00
static gdImagePtr _php_image_create_from_string(zend_string *Data, char *tn, gdImagePtr (*ioctx_func_p)());
Killed some compile warnings.
2001-04-07 02:01:52 +08:00
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)());
static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)());
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
static gdIOCtx *create_stream_context_from_zval(zval *to_zval);
static gdIOCtx *create_stream_context(php_stream *stream, int close_stream);
static gdIOCtx *create_output_context();
Add support for webp in imagecreatefromstring
2017-07-30 08:50:33 +08:00
static int _php_image_type(char data[12]);
Allow usage of GD contexts and not tempfiles in output functions
2001-02-01 23:40:35 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
/* output streaming (formerly gd_ctx.c) */
static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)());
/*********************************************************
*
* GD Object Representation
*
********************************************************/
zend_class_entry *gd_image_ce;
typedef struct _gd_ext_image_object {
gdImagePtr image;
zend_object std;
} php_gd_image_object;
static zend_object_handlers php_gd_image_object_handlers;
static zend_function *php_gd_image_object_get_constructor(zend_object *object)
{
zend_throw_error(NULL, "You cannot initialize a GdImage object except through helper functions");
return NULL;
}
/**
* Returns the underlying php_gd_image_object from a zend_object
*/
static zend_always_inline php_gd_image_object* php_gd_exgdimage_from_zobj_p(zend_object* obj)
{
return (php_gd_image_object *) ((char *) (obj) - XtOffsetOf(php_gd_image_object, std));
}
/**
* Converts an extension GdImage instance contained within a zval into the gdImagePtr
* for use with library APIs
*/
Export php_gd_libgdimageptr_from_zval_p() Some extension may need to retrieve the `gdImagePtr` from an `GdImage` object; thus, we export the respective function. To not being forced to include gd.h in php_gd.h, we use the opaque `struct gdImageStruct *` as return type. We also rename php_gd2.dll to php_gd.dll, since there's not really much point in giving the DLL a version number, since there is no php_gd.dll for years (if there ever has been). Renaming, on the other hand, matches the name on other systems (gd.so), and allows to actually use `ADD_EXTENSION_DEP()`.
2020-07-11 21:41:15 +08:00
PHP_GD_API gdImagePtr php_gd_libgdimageptr_from_zval_p(zval* zp)
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
{
return php_gd_exgdimage_from_zobj_p(Z_OBJ_P(zp))->image;
}
zend_object *php_gd_image_object_create(zend_class_entry *class_type)
{
size_t block_len = sizeof(php_gd_image_object) + zend_object_properties_size(class_type);
php_gd_image_object *intern = emalloc(block_len);
memset(intern, 0, block_len);
zend_object_std_init(&intern->std, class_type);
object_properties_init(&intern->std, class_type);
intern->std.handlers = &php_gd_image_object_handlers;
return &intern->std;
Code tweaks: Remove unneeded semicolons
2020-04-29 14:48:47 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
static void php_gd_image_object_free(zend_object *intern)
{
php_gd_image_object *img_obj_ptr = php_gd_exgdimage_from_zobj_p(intern);
gdImageDestroy(img_obj_ptr->image);
img_obj_ptr->image = NULL;
zend_object_std_dtor(intern);
Code tweaks: Remove unneeded semicolons
2020-04-29 14:48:47 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
/**
* Creates a new GdImage object wrapping the gdImagePtr and attaches it
* to the zval (usually return_value).
*
* This function must only be called once per valid gdImagePtr
*/
void php_gd_assign_libgdimageptr_as_extgdimage(zval *val, gdImagePtr image)
{
object_init_ex(val, gd_image_ce);
php_gd_exgdimage_from_zobj_p(Z_OBJ_P(val))->image = image;
}
static void php_gd_object_minit_helper()
{
zend_class_entry ce;
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
INIT_CLASS_ENTRY(ce, "GdImage", class_GdImage_methods);
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
gd_image_ce = zend_register_internal_class(&ce);
gd_image_ce->ce_flags |= ZEND_ACC_FINAL;
gd_image_ce->create_object = php_gd_image_object_create;
gd_image_ce->serialize = zend_class_serialize_deny;
gd_image_ce->unserialize = zend_class_unserialize_deny;
/* setting up the object handlers for the GdImage class */
memcpy(&php_gd_image_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
php_gd_image_object_handlers.clone_obj = NULL;
php_gd_image_object_handlers.free_obj = php_gd_image_object_free;
php_gd_image_object_handlers.get_constructor = php_gd_image_object_get_constructor;
php_gd_image_object_handlers.offset = XtOffsetOf(php_gd_image_object, std);
}
/*********************************************************
*
* Extension Implementation
*
********************************************************/
- Made PHP_VERSION and PHP_OS work again - More php3_ cleanup @- Restored the PHP_VERSION and PHP_OS constants (Zeev)
1999-12-18 04:55:31 +08:00
zend_module_entry gd_module_entry = {
ws fix.
2001-10-13 21:12:30 +08:00
STANDARD_MODULE_HEADER,
* zend_module_entry change: apino, debug and zts are moved first, see README.EXTENSIONS file for upgrade help. @Introduced extension version numbers (Stig)
2001-10-12 07:33:59 +08:00
"gd",
Generate functions entries from stubs for another set of extensions Closes GH-5351
2020-04-05 05:51:10 +08:00
ext_functions,
ws fix.
2001-10-13 21:12:30 +08:00
PHP_MINIT(gd),
Properly shut down font cache mutex Since the font cache mutex in set up in MINIT, we have to shut it down in MSHUTDOWN.
2019-06-21 19:50:19 +08:00
PHP_MSHUTDOWN(gd),
ws fix.
2001-10-13 21:12:30 +08:00
NULL,
Fixed leaks. Other leaks are originated in libgd.
2002-11-24 06:11:59 +08:00
PHP_RSHUTDOWN(gd),
ws fix.
2001-10-13 21:12:30 +08:00
PHP_MINFO(gd),
cleanup the mod version macros, round 2
2015-03-24 03:33:54 +08:00
PHP_GD_VERSION,
ws fix.
2001-10-13 21:12:30 +08:00
STANDARD_MODULE_PROPERTIES
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
};
Use #ifdef COMPILE_DL_EXTNAME solely.
2000-05-23 17:33:51 +08:00
#ifdef COMPILE_DL_GD
Replace the various get_module() functions with a uniform ZEND_GET_MODULE(name) macro.
2000-05-02 08:30:36 +08:00
ZEND_GET_MODULE(gd)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#endif
- MFH: add a weak/tolerant mode to the jpeg loader
2006-02-05 23:53:58 +08:00
/* {{{ PHP_INI_BEGIN */
PHP_INI_BEGIN()
Change default gd.jpeg_ignore_warning = 1 Ignoring these warnings apparently works fine (libgd does so in gdImageCreateJpeg()), but not ignoring them may cause imagecreatefromjpeg() to fail completely, so it seems reasonable to ignore warnings by default. Note that this change most likely doesn't constitute a BC break; we're simply being more resilient with regard to slightly broken JPEGs. See also the related [bug #72404](https://bugs.php.net/bug.php?id=72404).
2016-06-15 20:00:18 +08:00
PHP_INI_ENTRY("gd.jpeg_ignore_warning", "1", PHP_INI_ALL, NULL)
- MFH: add a weak/tolerant mode to the jpeg loader
2006-02-05 23:53:58 +08:00
PHP_INI_END()
/* }}} */
- ws
2009-05-26 21:57:07 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ php_free_gd_font */
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
static void php_free_gd_font(zend_resource *rsrc)
More cleanup...
1999-12-18 05:50:07 +08:00
{
WS & CS fixes
2003-03-20 09:12:57 +08:00
gdFontPtr fp = (gdFontPtr) rsrc->ptr;
More TSRMLS_FETCH annihilation
2001-07-31 13:44:11 +08:00
More cleanup...
1999-12-18 05:50:07 +08:00
if (fp->data) {
efree(fp->data);
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
More cleanup...
1999-12-18 05:50:07 +08:00
efree(fp);
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
More cleanup...
1999-12-18 05:50:07 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ php_gd_error_method */
Allow to use new GD-2.1.0 function from system library
2013-04-25 19:39:35 +08:00
void php_gd_error_method(int type, const char *format, va_list args)
{
Fix #70315: 500 Server Error but page is fully rendered That happens because the external libgd uses other error codes than PHP (and the bundled libgd), but the libgd error codes are simply forwarded to php_verror(). We fix that by properly mapping libgd errors to PHP errors.
2016-07-07 20:47:55 +08:00
switch (type) {
fix syslog interference
2016-10-13 20:38:51 +08:00
#ifndef PHP_WIN32
Fix #70315: 500 Server Error but page is fully rendered That happens because the external libgd uses other error codes than PHP (and the bundled libgd), but the libgd error codes are simply forwarded to php_verror(). We fix that by properly mapping libgd errors to PHP errors.
2016-07-07 20:47:55 +08:00
case GD_DEBUG:
case GD_INFO:
fix syslog interference
2016-10-13 20:38:51 +08:00
#endif
Fix #70315: 500 Server Error but page is fully rendered That happens because the external libgd uses other error codes than PHP (and the bundled libgd), but the libgd error codes are simply forwarded to php_verror(). We fix that by properly mapping libgd errors to PHP errors.
2016-07-07 20:47:55 +08:00
case GD_NOTICE:
type = E_NOTICE;
break;
case GD_WARNING:
type = E_WARNING;
break;
default:
type = E_ERROR;
}
remove TSRMLS_*
2016-11-22 06:53:37 +08:00
php_verror(NULL, "", type, format, args);
Allow to use new GD-2.1.0 function from system library
2013-04-25 19:39:35 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ PHP_MINIT_FUNCTION */
Symbol work.
1999-07-28 03:44:46 +08:00
PHP_MINIT_FUNCTION(gd)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
made gd working correct under win32 # fixes the issues when running php threadsafe
2000-11-29 23:25:42 +08:00
le_gd_font = zend_register_list_destructors_ex(php_free_gd_font, NULL, "gd font", module_number);
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_object_minit_helper();
- Fix windows mutex intialization, add HAVE_GD_FONTMUTEX and HAVE_LIBFREETYPE to config.w32 (Thanks to Frank for the report)
2007-04-06 23:38:35 +08:00
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#if defined(HAVE_GD_FREETYPE) && defined(HAVE_GD_BUNDLED)
- MFH: - remove double lock (tween colors cache is created in each thread, the cache mutex is already locked earlier) - #40858, other TS improvements for gd freetype cache management cache initialization and shutdown is now done in MINIT and MSHUTDOWN.
2007-04-04 08:47:55 +08:00
gdFontCacheMutexSetup();
#endif
Allow to use new GD-2.1.0 function from system library
2013-04-25 19:39:35 +08:00
gdSetErrorMethod(php_gd_error_method);
Unify error handling of bundled and external libgd There's no need anymore to call an own error handler directly. Instead we register our error handler and call libgd's error functions (which will forward). We do this regardless of compiling with the bundled or an external libgd.
2016-10-07 07:06:24 +08:00
- MFH: add a weak/tolerant mode to the jpeg loader
2006-02-05 23:53:58 +08:00
REGISTER_INI_ENTRIES();
- ws
2009-05-26 21:57:07 +08:00
Replace magic values with constants
2017-08-19 20:28:22 +08:00
REGISTER_LONG_CONSTANT("IMG_GIF", PHP_IMG_GIF, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_JPG", PHP_IMG_JPG, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_JPEG", PHP_IMG_JPEG, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_PNG", PHP_IMG_PNG, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_WBMP", PHP_IMG_WBMP, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_XPM", PHP_IMG_XPM, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_WEBP", PHP_IMG_WEBP, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_BMP", PHP_IMG_BMP, CONST_CS | CONST_PERSISTENT);
Support TGA reading We add PHP bindings for libgd's features to read TGA files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these. Since TGA has no easily recognizable file signature, we don't add TGA support for imagecreatefromstring() or getimagesize() and friends.
2019-06-21 05:40:51 +08:00
REGISTER_LONG_CONSTANT("IMG_TGA", PHP_IMG_TGA, CONST_CS | CONST_PERSISTENT);
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
2013-05-03 19:53:55 +08:00
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
/* special colours for gd */
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("IMG_COLOR_TILED", gdTiled, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_COLOR_STYLED", gdStyled, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_COLOR_BRUSHED", gdBrushed, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_COLOR_STYLEDBRUSHED", gdStyledBrushed, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_COLOR_TRANSPARENT", gdTransparent, CONST_CS | CONST_PERSISTENT);
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
2013-05-03 19:53:55 +08:00
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
/* for imagefilledarc */
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("IMG_ARC_ROUNDED", gdArc, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_ARC_PIE", gdPie, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_ARC_CHORD", gdChord, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_ARC_NOFILL", gdNoFill, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_ARC_EDGED", gdEdged, CONST_CS | CONST_PERSISTENT);
- ws
2009-05-26 21:57:07 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
/* GD2 image format types */
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("IMG_GD2_RAW", GD2_FMT_RAW, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_GD2_COMPRESSED", GD2_FMT_COMPRESSED, CONST_CS | CONST_PERSISTENT);
Improve some TypeError and ValueError messages Closes GH-5377
2020-04-13 16:41:23 +08:00
REGISTER_LONG_CONSTANT("IMG_FLIP_HORIZONTAL", GD_FLIP_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("IMG_FLIP_VERTICAL", GD_FLIP_VERTICAL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FLIP_BOTH", GD_FLIP_BOTH, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_REPLACE", gdEffectReplace, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_ALPHABLEND", gdEffectAlphaBlend, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_NORMAL", gdEffectNormal, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_EFFECT_OVERLAY", gdEffectOverlay, CONST_CS | CONST_PERSISTENT);
Add support for gdEffectMultiply gdLayerMultiply() has been introduced in libgd 2.1.1, and as such would have been already available for imagelayereffect() with a system libgd. We port the respective code to the bundled libgd, and also make IMG_EFFECT_MULTIPLY available to userland.
2016-10-03 01:06:59 +08:00
#ifdef gdEffectMultiply
REGISTER_LONG_CONSTANT("IMG_EFFECT_MULTIPLY", gdEffectMultiply, CONST_CS | CONST_PERSISTENT);
#endif
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("IMG_CROP_DEFAULT", GD_CROP_DEFAULT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_CROP_TRANSPARENT", GD_CROP_TRANSPARENT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_CROP_BLACK", GD_CROP_BLACK, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_CROP_WHITE", GD_CROP_WHITE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_CROP_SIDES", GD_CROP_SIDES, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_CROP_THRESHOLD", GD_CROP_THRESHOLD, CONST_CS | CONST_PERSISTENT);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
trailing whitespace removal
2015-01-03 17:22:58 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("IMG_BELL", GD_BELL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_BESSEL", GD_BESSEL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_BILINEAR_FIXED", GD_BILINEAR_FIXED, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_BICUBIC", GD_BICUBIC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_BICUBIC_FIXED", GD_BICUBIC_FIXED, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_BLACKMAN", GD_BLACKMAN, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_BOX", GD_BOX, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_BSPLINE", GD_BSPLINE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_CATMULLROM", GD_CATMULLROM, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_GAUSSIAN", GD_GAUSSIAN, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_GENERALIZED_CUBIC", GD_GENERALIZED_CUBIC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_HERMITE", GD_HERMITE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_HAMMING", GD_HAMMING, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_HANNING", GD_HANNING, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_MITCHELL", GD_MITCHELL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_POWER", GD_POWER, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_QUADRATIC", GD_QUADRATIC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_SINC", GD_SINC, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_NEAREST_NEIGHBOUR", GD_NEAREST_NEIGHBOUR, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_WEIGHTED4", GD_WEIGHTED4, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_TRIANGLE", GD_TRIANGLE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_AFFINE_TRANSLATE", GD_AFFINE_TRANSLATE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_AFFINE_SCALE", GD_AFFINE_SCALE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_AFFINE_ROTATE", GD_AFFINE_ROTATE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_AFFINE_SHEAR_HORIZONTAL", GD_AFFINE_SHEAR_HORIZONTAL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_AFFINE_SHEAR_VERTICAL", GD_AFFINE_SHEAR_VERTICAL, CONST_CS | CONST_PERSISTENT);
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_BUNDLED
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("GD_BUNDLED", 1, CONST_CS | CONST_PERSISTENT);
- enable filter constants
2009-05-26 21:35:59 +08:00
#else
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("GD_BUNDLED", 0, CONST_CS | CONST_PERSISTENT);
- enable filter constants
2009-05-26 21:35:59 +08:00
#endif
- MFH: @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, GD_RELEASE_VERSION GD_EXTRA_VERSION and GD_VERSION_STRING
2007-06-04 01:46:18 +08:00
WS & CS fixes
2003-03-20 09:12:57 +08:00
/* Section Filters */
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("IMG_FILTER_NEGATE", IMAGE_FILTER_NEGATE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_GRAYSCALE", IMAGE_FILTER_GRAYSCALE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_BRIGHTNESS", IMAGE_FILTER_BRIGHTNESS, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_CONTRAST", IMAGE_FILTER_CONTRAST, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_COLORIZE", IMAGE_FILTER_COLORIZE, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_EDGEDETECT", IMAGE_FILTER_EDGEDETECT, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_GAUSSIAN_BLUR", IMAGE_FILTER_GAUSSIAN_BLUR, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_SELECTIVE_BLUR", IMAGE_FILTER_SELECTIVE_BLUR, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_EMBOSS", IMAGE_FILTER_EMBOSS, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_MEAN_REMOVAL", IMAGE_FILTER_MEAN_REMOVAL, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_SMOOTH", IMAGE_FILTER_SMOOTH, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("IMG_FILTER_PIXELATE", IMAGE_FILTER_PIXELATE, CONST_CS | CONST_PERSISTENT);
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
REGISTER_LONG_CONSTANT("IMG_FILTER_SCATTER", IMAGE_FILTER_SCATTER, CONST_CS | CONST_PERSISTENT);
WS & CS fixes
2003-03-20 09:12:57 +08:00
/* End Section Filters */
- MFH: add filter option to imagepng - add constants PS: If someone can check why #include "png.h" fails, it will be cleaner
2006-01-27 21:36:30 +08:00
- MFH: @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, GD_RELEASE_VERSION GD_EXTRA_VERSION and GD_VERSION_STRING
2007-06-04 01:46:18 +08:00
#ifdef GD_VERSION_STRING
REGISTER_STRING_CONSTANT("GD_VERSION", GD_VERSION_STRING, CONST_CS | CONST_PERSISTENT);
#endif
#if defined(GD_MAJOR_VERSION) && defined(GD_MINOR_VERSION) && defined(GD_RELEASE_VERSION) && defined(GD_EXTRA_VERSION)
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("GD_MAJOR_VERSION", GD_MAJOR_VERSION, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("GD_MINOR_VERSION", GD_MINOR_VERSION, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("GD_RELEASE_VERSION", GD_RELEASE_VERSION, CONST_CS | CONST_PERSISTENT);
- MFH: @DOC add constants GD_MAJOR_VERSION, GD_MINOR_VERSION, GD_RELEASE_VERSION GD_EXTRA_VERSION and GD_VERSION_STRING
2007-06-04 01:46:18 +08:00
REGISTER_STRING_CONSTANT("GD_EXTRA_VERSION", GD_EXTRA_VERSION, CONST_CS | CONST_PERSISTENT);
#endif
- MFH: add filter option to imagepng - add constants PS: If someone can check why #include "png.h" fails, it will be cleaner
2006-01-27 21:36:30 +08:00
#ifdef HAVE_GD_PNG
- ws
2009-05-26 21:57:07 +08:00
/*
* cannot include #include "png.h"
* /usr/include/pngconf.h:310:2: error: #error png.h already includes setjmp.h with some additional fixup.
* as error, use the values for now...
*/
master renames phase 1
2014-08-26 01:24:55 +08:00
REGISTER_LONG_CONSTANT("PNG_NO_FILTER", 0x00, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PNG_FILTER_NONE", 0x08, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PNG_FILTER_SUB", 0x10, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PNG_FILTER_UP", 0x20, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PNG_FILTER_AVG", 0x40, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PNG_FILTER_PAETH", 0x80, CONST_CS | CONST_PERSISTENT);
REGISTER_LONG_CONSTANT("PNG_ALL_FILTERS", 0x08 | 0x10 | 0x20 | 0x40 | 0x80, CONST_CS | CONST_PERSISTENT);
- MFH: add filter option to imagepng - add constants PS: If someone can check why #include "png.h" fails, it will be cleaner
2006-01-27 21:36:30 +08:00
#endif
- ws
2009-05-26 21:57:07 +08:00
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
return SUCCESS;
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ PHP_MSHUTDOWN_FUNCTION */
Properly shut down font cache mutex Since the font cache mutex in set up in MINIT, we have to shut it down in MSHUTDOWN.
2019-06-21 19:50:19 +08:00
PHP_MSHUTDOWN_FUNCTION(gd)
{
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#if defined(HAVE_GD_FREETYPE) && defined(HAVE_GD_BUNDLED)
Properly shut down font cache mutex Since the font cache mutex in set up in MINIT, we have to shut it down in MSHUTDOWN.
2019-06-21 19:50:19 +08:00
gdFontCacheMutexShutdown();
#endif
Call zend_unregister_ini_entries() when unload extension loaded through dl() without MSHUTDOWN callback. Extensions with MSHUTDOWN should use UNREGISTER_INI_ENTRIES().
2019-12-09 20:05:24 +08:00
UNREGISTER_INI_ENTRIES();
Properly shut down font cache mutex Since the font cache mutex in set up in MINIT, we have to shut it down in MSHUTDOWN.
2019-06-21 19:50:19 +08:00
return SUCCESS;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ PHP_RSHUTDOWN_FUNCTION */
Fixed leaks. Other leaks are originated in libgd.
2002-11-24 06:11:59 +08:00
PHP_RSHUTDOWN_FUNCTION(gd)
{
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#ifdef HAVE_GD_FREETYPE
Synchronized bundled GD library with GD 2.0.17 . GD is now thread-safe thanks to wrappers around freetype library . Significant optimization to png writing code. . Miscellaneous fixes. Fixed memory leak inside php_imagettftext_common() Make ext/gd compile with GD 2.0.17+ (gdFreeFontCache() is not avaliable)
2003-12-26 06:12:12 +08:00
gdFontCacheShutdown();
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#endif
Fixed leaks. Other leaks are originated in libgd.
2002-11-24 06:11:59 +08:00
return SUCCESS;
}
/* }}} */
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_BUNDLED
add external 2.1 detection and fix gd_compat for 2.1+
2013-04-11 02:12:25 +08:00
#define PHP_GD_VERSION_STRING "bundled (2.1.0 compatible)"
Collate version handling and bump up version (noticed by Peter Neuman)
2003-04-06 04:43:53 +08:00
#else
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
2013-05-03 19:53:55 +08:00
# define PHP_GD_VERSION_STRING GD_VERSION_STRING
Collate version handling and bump up version (noticed by Peter Neuman)
2003-04-06 04:43:53 +08:00
#endif
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ PHP_MINFO_FUNCTION */
Symbol work.
1999-07-28 03:44:46 +08:00
PHP_MINFO_FUNCTION(gd)
A few other minor fixes
1999-05-09 21:57:09 +08:00
{
phpinfo() prettying I will get to the rest of the functions later tonight or tomorrow (i.e. from hyperwave to snmp)
2000-04-06 06:30:19 +08:00
php_info_print_table_start();
php_info_print_table_row(2, "GD Support", "enabled");
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
/* need to use a PHPAPI function here because it is external module in windows */
phpinfo() prettying I will get to the rest of the functions later tonight or tomorrow (i.e. from hyperwave to snmp)
2000-04-06 06:30:19 +08:00
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_BUNDLED
Collate version handling and bump up version (noticed by Peter Neuman)
2003-04-06 04:43:53 +08:00
php_info_print_table_row(2, "GD Version", PHP_GD_VERSION_STRING);
Fix bug #68656 Report gd library version
2014-12-26 15:33:21 +08:00
#else
php_info_print_table_row(2, "GD headers Version", PHP_GD_VERSION_STRING);
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_LIBVERSION
Fix bug #68656 Report gd library version
2014-12-26 15:33:21 +08:00
php_info_print_table_row(2, "GD library Version", gdVersionString());
#endif
#endif
Show some extra info for GD with phpinfo()
1999-11-30 07:21:52 +08:00
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#ifdef HAVE_GD_FREETYPE
Drop superfluous ENABLE_GD_TTF If we `HAVE_LIBFREETYPE`, we define `ENABLE_GD_TTF` if it is not defined. Therefore we can check for `HAVE_LIBFREETYPE` in the first place.
2019-07-21 23:28:49 +08:00
php_info_print_table_row(2, "FreeType Support", "enabled");
phpinfo() prettying I will get to the rest of the functions later tonight or tomorrow (i.e. from hyperwave to snmp)
2000-04-06 06:30:19 +08:00
php_info_print_table_row(2, "FreeType Linkage", "with freetype");
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#ifdef HAVE_GD_BUNDLED
Add an phpinfo entry showing which version of freetype is linked to gd.
2003-09-10 03:08:30 +08:00
{
char tmp[256];
- ws
2009-05-26 21:57:07 +08:00
FREETYPE_PATCH is not always defined. # will likely fix Sebastian's build :)
2003-09-15 15:27:18 +08:00
#ifdef FREETYPE_PATCH
Add an phpinfo entry showing which version of freetype is linked to gd.
2003-09-10 03:08:30 +08:00
snprintf(tmp, sizeof(tmp), "%d.%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR, FREETYPE_PATCH);
- MFH: fix build when use with a museum freetype version (1.x)
2007-05-07 22:54:36 +08:00
#elif defined(FREETYPE_MAJOR)
FREETYPE_PATCH is not always defined. # will likely fix Sebastian's build :)
2003-09-15 15:27:18 +08:00
snprintf(tmp, sizeof(tmp), "%d.%d", FREETYPE_MAJOR, FREETYPE_MINOR);
- MFH: fix build when use with a museum freetype version (1.x)
2007-05-07 22:54:36 +08:00
#else
snprintf(tmp, sizeof(tmp), "1.x");
FREETYPE_PATCH is not always defined. # will likely fix Sebastian's build :)
2003-09-15 15:27:18 +08:00
#endif
Add an phpinfo entry showing which version of freetype is linked to gd.
2003-09-10 03:08:30 +08:00
php_info_print_table_row(2, "FreeType Version", tmp);
}
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#endif
Show some extra info for GD with phpinfo()
1999-11-30 07:21:52 +08:00
#endif
Fixed bug: #12948, #12945
2001-08-25 04:05:58 +08:00
php_info_print_table_row(2, "GIF Read Support", "enabled");
php_info_print_table_row(2, "GIF Create Support", "enabled");
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
2013-05-03 19:53:55 +08:00
recommended changes
2000-04-08 02:50:08 +08:00
#ifdef HAVE_GD_JPG
- MFH: add png and jpeg version info
2008-11-05 04:25:45 +08:00
{
- GEPJ.. (thx to Derick for the head!)
2009-03-24 20:48:52 +08:00
php_info_print_table_row(2, "JPEG Support", "enabled");
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_BUNDLED
Allow to use new GD-2.1.0 function from system library
2013-04-25 19:39:35 +08:00
php_info_print_table_row(2, "libJPEG Version", gdJpegGetVersionString());
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#endif
- MFH: add png and jpeg version info
2008-11-05 04:25:45 +08:00
}
Add ImageTypes() function which returns a bitfield with the supported image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp @ Add ImageTypes() function which returns a bitfield with the supported @ image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
2000-07-15 05:51:31 +08:00
#endif
- fix build on linux (static) - add gd[Format]Version[Int|String] first methods to work around the png header issues
2008-11-06 18:14:37 +08:00
Add line of possible XBM support to the phpinfo()
2000-11-01 12:38:28 +08:00
#ifdef HAVE_GD_PNG
php_info_print_table_row(2, "PNG Support", "enabled");
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_BUNDLED
- fix build on linux (static) - add gd[Format]Version[Int|String] first methods to work around the png header issues
2008-11-06 18:14:37 +08:00
php_info_print_table_row(2, "libPNG Version", gdPngGetVersionString());
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#endif
Add line of possible XBM support to the phpinfo()
2000-11-01 12:38:28 +08:00
#endif
Add ImageTypes() function which returns a bitfield with the supported image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp @ Add ImageTypes() function which returns a bitfield with the supported @ image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
2000-07-15 05:51:31 +08:00
php_info_print_table_row(2, "WBMP Support", "enabled");
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_XPM
Show if XPM support is available & Set availability bit only when available.
2003-02-02 07:23:59 +08:00
php_info_print_table_row(2, "XPM Support", "enabled");
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_BUNDLED
exposing the libxpm version in phpinfo
2012-10-05 00:20:02 +08:00
{
char tmp[12];
snprintf(tmp, sizeof(tmp), "%d", XpmLibraryVersion());
php_info_print_table_row(2, "libXpm Version", tmp);
}
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#endif
Show if XPM support is available & Set availability bit only when available.
2003-02-02 07:23:59 +08:00
#endif
Add line of possible XBM support to the phpinfo()
2000-11-01 12:38:28 +08:00
php_info_print_table_row(2, "XBM Support", "enabled");
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef USE_GD_JISX0208
Made phpinfo() / gd_info() indicate availability of JIS feature
2003-04-19 15:44:16 +08:00
php_info_print_table_row(2, "JIS-mapped Japanese Font Support", "enabled");
add WebP support in phpinfo
2013-03-28 00:38:57 +08:00
#endif
#ifdef HAVE_GD_WEBP
php_info_print_table_row(2, "WebP Support", "enabled");
Add BMP support to PHP info
2019-06-13 19:03:58 +08:00
#endif
#ifdef HAVE_GD_BMP
php_info_print_table_row(2, "BMP Support", "enabled");
Support TGA reading We add PHP bindings for libgd's features to read TGA files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these. Since TGA has no easily recognizable file signature, we don't add TGA support for imagecreatefromstring() or getimagesize() and friends.
2019-06-21 05:40:51 +08:00
#endif
#ifdef HAVE_GD_TGA
php_info_print_table_row(2, "TGA Read Support", "enabled");
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#endif
phpinfo() prettying I will get to the rest of the functions later tonight or tomorrow (i.e. from hyperwave to snmp)
2000-04-06 06:30:19 +08:00
php_info_print_table_end();
Fixed bug#46847 (phpinfo() is missing some settings.)
2008-12-12 21:07:28 +08:00
DISPLAY_INI_ENTRIES();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ */
new function gd_info() returns an associative array of gd support options. # The index names are those from the minfo function. Therefore it is # easy to look into phpinfo() to see which index names are possible.
2002-11-12 19:49:11 +08:00
PHP_FUNCTION(gd_info)
{
MFH: New way for check void parameters
2008-03-11 06:15:36 +08:00
if (zend_parse_parameters_none() == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
new function gd_info() returns an associative array of gd support options. # The index names are those from the minfo function. Therefore it is # easy to look into phpinfo() to see which index names are possible.
2002-11-12 19:49:11 +08:00
}
Removed pointless checks of array_init() return value.
2003-01-18 05:37:56 +08:00
array_init(return_value);
Cleanup (1-st round)
2014-04-15 19:40:40 +08:00
add_assoc_string(return_value, "GD Version", PHP_GD_VERSION_STRING);
new function gd_info() returns an associative array of gd support options. # The index names are those from the minfo function. Therefore it is # easy to look into phpinfo() to see which index names are possible.
2002-11-12 19:49:11 +08:00
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#ifdef HAVE_GD_FREETYPE
Drop superfluous ENABLE_GD_TTF If we `HAVE_LIBFREETYPE`, we define `ENABLE_GD_TTF` if it is not defined. Therefore we can check for `HAVE_LIBFREETYPE` in the first place.
2019-07-21 23:28:49 +08:00
add_assoc_bool(return_value, "FreeType Support", 1);
Cleanup (1-st round)
2014-04-15 19:40:40 +08:00
add_assoc_string(return_value, "FreeType Linkage", "with freetype");
new function gd_info() returns an associative array of gd support options. # The index names are those from the minfo function. Therefore it is # easy to look into phpinfo() to see which index names are possible.
2002-11-12 19:49:11 +08:00
#else
add_assoc_bool(return_value, "FreeType Support", 0);
#endif
add_assoc_bool(return_value, "GIF Read Support", 1);
add_assoc_bool(return_value, "GIF Create Support", 1);
#ifdef HAVE_GD_JPG
- Missing changes related to #47757 for this branch
2009-03-26 08:43:45 +08:00
add_assoc_bool(return_value, "JPEG Support", 1);
new function gd_info() returns an associative array of gd support options. # The index names are those from the minfo function. Therefore it is # easy to look into phpinfo() to see which index names are possible.
2002-11-12 19:49:11 +08:00
#else
- Missing changes related to #47757 for this branch
2009-03-26 08:43:45 +08:00
add_assoc_bool(return_value, "JPEG Support", 0);
new function gd_info() returns an associative array of gd support options. # The index names are those from the minfo function. Therefore it is # easy to look into phpinfo() to see which index names are possible.
2002-11-12 19:49:11 +08:00
#endif
#ifdef HAVE_GD_PNG
add_assoc_bool(return_value, "PNG Support", 1);
#else
add_assoc_bool(return_value, "PNG Support", 0);
#endif
add_assoc_bool(return_value, "WBMP Support", 1);
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_XPM
Show if XPM support is available & Set availability bit only when available.
2003-02-02 07:23:59 +08:00
add_assoc_bool(return_value, "XPM Support", 1);
#else
add_assoc_bool(return_value, "XPM Support", 0);
#endif
new function gd_info() returns an associative array of gd support options. # The index names are those from the minfo function. Therefore it is # easy to look into phpinfo() to see which index names are possible.
2002-11-12 19:49:11 +08:00
add_assoc_bool(return_value, "XBM Support", 1);
Fix #70047: gd_info() doesn't report WebP support Despite being documented, the array returned by gd_info() doesn't have a 'WebP Support' key. This patch adds it.
2015-07-11 23:49:13 +08:00
#ifdef HAVE_GD_WEBP
add_assoc_bool(return_value, "WebP Support", 1);
#else
add_assoc_bool(return_value, "WebP Support", 0);
#endif
Implement #69606: Support BMPs (added in GD 2.1.0) We add PHP bindings for libgd's features to read and write BMP files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these.
2016-07-24 20:14:57 +08:00
#ifdef HAVE_GD_BMP
add_assoc_bool(return_value, "BMP Support", 1);
#else
add_assoc_bool(return_value, "BMP Support", 0);
#endif
Support TGA reading We add PHP bindings for libgd's features to read TGA files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these. Since TGA has no easily recognizable file signature, we don't add TGA support for imagecreatefromstring() or getimagesize() and friends.
2019-06-21 05:40:51 +08:00
#ifdef HAVE_GD_TGA
add_assoc_bool(return_value, "TGA Read Support", 1);
#else
add_assoc_bool(return_value, "TGA Read Support", 0);
#endif
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef USE_GD_JISX0208
Made phpinfo() / gd_info() indicate availability of JIS feature
2003-04-19 15:44:16 +08:00
add_assoc_bool(return_value, "JIS-mapped Japanese Font Support", 1);
#else
add_assoc_bool(return_value, "JIS-mapped Japanese Font Support", 0);
#endif
new function gd_info() returns an associative array of gd support options. # The index names are those from the minfo function. Therefore it is # easy to look into phpinfo() to see which index names are possible.
2002-11-12 19:49:11 +08:00
}
/* }}} */
A small fix to make the function imageloadfont portable.
2001-03-12 21:57:53 +08:00
#define FLIPWORD(a) (((a & 0xff000000) >> 24) | ((a & 0x00ff0000) >> 8) | ((a & 0x0000ff00) << 8) | ((a & 0x000000ff) << 24))
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Load a new font */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
PHP_FUNCTION(imageloadfont)
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
{
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *ind;
PHP7 API updates
2015-01-21 15:40:33 +08:00
zend_string *file;
's' works with size_t round 3
2014-08-28 01:25:28 +08:00
int hdr_size = sizeof(gdFont) - sizeof(char *);
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
int body_size, n = 0, b, i, body_size_check;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdFontPtr font;
change * formatting
2002-03-16 09:28:57 +08:00
php_stream *stream;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
PHP7 API updates
2015-01-21 15:40:33 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "P", &file) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 09:05:24 +08:00
stream = php_stream_open_wrapper(ZSTR_VAL(file), "rb", IGNORE_PATH | IGNORE_URL_WIN | REPORT_ERRORS, NULL);
New PHP streams...
2002-03-16 05:03:08 +08:00
if (stream == NULL) {
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_FALSE;
}
/* Only supports a architecture-dependent binary dump format
* at the moment.
* The file format is like this on machines with 32-byte integers:
*
* byte 0-3: (int) number of characters in the font
* byte 4-7: (int) value of first character in the font (often 32, space)
* byte 8-11: (int) pixel width of each character
* byte 12-15: (int) pixel height of each character
* bytes 16-: (char) array with character data, one byte per pixel
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
* in each character, for a total of
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
* (nchars*width*height) bytes.
*/
WS & CS fixes
2003-03-20 09:12:57 +08:00
font = (gdFontPtr) emalloc(sizeof(gdFont));
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
b = 0;
Report errors from stream read and write operations The php_stream_read() and php_stream_write() functions now return an ssize_t value, with negative results indicating failure. Functions like fread() and fwrite() will return false in that case. As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams should not be regarded as error conditions, and be reported as successful zero-length reads/writes instead. The handling of EINTR remains unclear and is internally inconsistent (e.g. some code-paths will automatically retry on EINTR, while some won't). I'm landing this now to make sure the stream wrapper ops API changes make it into 7.4 -- however, if the user-facing changes turn out to be problematic we have the option of clamping negative returns to zero in php_stream_read() and php_stream_write() to restore the old behavior in a relatively non-intrusive manner.
2019-07-18 21:25:59 +08:00
while (b < hdr_size && (n = php_stream_read(stream, (char*)&font[b], hdr_size - b)) > 0) {
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
b += n;
WS & CS fixes
2003-03-20 09:12:57 +08:00
}
Report errors from stream read and write operations The php_stream_read() and php_stream_write() functions now return an ssize_t value, with negative results indicating failure. Functions like fread() and fwrite() will return false in that case. As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams should not be regarded as error conditions, and be reported as successful zero-length reads/writes instead. The handling of EINTR remains unclear and is internally inconsistent (e.g. some code-paths will automatically retry on EINTR, while some won't). I'm landing this now to make sure the stream wrapper ops API changes make it into 7.4 -- however, if the user-facing changes turn out to be problematic we have the option of clamping negative returns to zero in php_stream_read() and php_stream_write() to restore the old behavior in a relatively non-intrusive manner.
2019-07-18 21:25:59 +08:00
if (n <= 0) {
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
efree(font);
New PHP streams...
2002-03-16 05:03:08 +08:00
if (php_stream_eof(stream)) {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "End of file while reading header");
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
} else {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "Error while reading header");
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Fix segfault reported by Rasmus.
2002-08-24 01:45:46 +08:00
php_stream_close(stream);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_FALSE;
}
New PHP streams...
2002-03-16 05:03:08 +08:00
i = php_stream_tell(stream);
php_stream_seek(stream, 0, SEEK_END);
body_size_check = php_stream_tell(stream) - hdr_size;
php_stream_seek(stream, i, SEEK_SET);
WS & CS fixes
2003-03-20 09:12:57 +08:00
imageloadfont: Perform overflow check before calculation Instead of afterwards...
2019-06-19 21:50:52 +08:00
if (overflow2(font->nchars, font->h) || overflow2(font->nchars * font->h, font->w )) {
php_error_docref(NULL, E_WARNING, "Error reading font, invalid font header");
efree(font);
php_stream_close(stream);
RETURN_FALSE;
}
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
body_size = font->w * font->h * font->nchars;
A small fix to make the function imageloadfont portable.
2001-03-12 21:57:53 +08:00
if (body_size != body_size_check) {
font->w = FLIPWORD(font->w);
font->h = FLIPWORD(font->h);
font->nchars = FLIPWORD(font->nchars);
body_size = font->w * font->h * font->nchars;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
A small fix to make the function imageloadfont portable.
2001-03-12 21:57:53 +08:00
if (body_size != body_size_check) {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "Error reading font");
A small fix to make the function imageloadfont portable.
2001-03-12 21:57:53 +08:00
efree(font);
Fixed stream leak on error.
2004-05-21 07:37:59 +08:00
php_stream_close(stream);
A small fix to make the function imageloadfont portable.
2001-03-12 21:57:53 +08:00
RETURN_FALSE;
}
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
font->data = emalloc(body_size);
b = 0;
Report errors from stream read and write operations The php_stream_read() and php_stream_write() functions now return an ssize_t value, with negative results indicating failure. Functions like fread() and fwrite() will return false in that case. As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams should not be regarded as error conditions, and be reported as successful zero-length reads/writes instead. The handling of EINTR remains unclear and is internally inconsistent (e.g. some code-paths will automatically retry on EINTR, while some won't). I'm landing this now to make sure the stream wrapper ops API changes make it into 7.4 -- however, if the user-facing changes turn out to be problematic we have the option of clamping negative returns to zero in php_stream_read() and php_stream_write() to restore the old behavior in a relatively non-intrusive manner.
2019-07-18 21:25:59 +08:00
while (b < body_size && (n = php_stream_read(stream, &font->data[b], body_size - b)) > 0) {
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
b += n;
WS & CS fixes
2003-03-20 09:12:57 +08:00
}
Report errors from stream read and write operations The php_stream_read() and php_stream_write() functions now return an ssize_t value, with negative results indicating failure. Functions like fread() and fwrite() will return false in that case. As a special case, EWOULDBLOCK and EAGAIN on non-blocking streams should not be regarded as error conditions, and be reported as successful zero-length reads/writes instead. The handling of EINTR remains unclear and is internally inconsistent (e.g. some code-paths will automatically retry on EINTR, while some won't). I'm landing this now to make sure the stream wrapper ops API changes make it into 7.4 -- however, if the user-facing changes turn out to be problematic we have the option of clamping negative returns to zero in php_stream_read() and php_stream_write() to restore the old behavior in a relatively non-intrusive manner.
2019-07-18 21:25:59 +08:00
if (n <= 0) {
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
efree(font->data);
efree(font);
New PHP streams...
2002-03-16 05:03:08 +08:00
if (php_stream_eof(stream)) {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "End of file while reading body");
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
} else {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "Error while reading body");
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
stream closing bug here too
2002-08-24 01:53:03 +08:00
php_stream_close(stream);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_FALSE;
}
New PHP streams...
2002-03-16 05:03:08 +08:00
php_stream_close(stream);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
ind = zend_list_insert(font, le_gd_font);
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
/* Adding 5 to the font index so we will never have font indices
* that overlap with the old fonts (with indices 1-5). The first
* list index given out is always 1.
*/
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(Z_RES_HANDLE_P(ind) + 5);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Set the line drawing styles for use with imageline and IMG_COLOR_STYLED. */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagesetstyle)
{
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *IM, *styles, *item;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
int *stylearr;
int index = 0;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
uint32_t num_styles;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oa", &IM, gd_image_ce, &styles) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
num_styles = zend_hash_num_elements(Z_ARRVAL_P(styles));
if (num_styles == 0) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(2, "cannot be empty");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
}
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
/* copy the style values in the stylearr */
Fix #72709: imagesetstyle() causes OOB read for empty $styles Calling imagesetstyle() with an empty $styles array caused gdImageSetStyle() to be called with `noOfPixels==0`, what could have lead to OOB reads. Actually, this issue will be fixed in libgd, but to avoid issues when older libgd is in use, we simply disallow passing an empty $styles array to imagesetstyle(), what wouldn't serve a useful purpose anyway.
2016-08-03 00:41:20 +08:00
stylearr = safe_emalloc(sizeof(int), num_styles, 0);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(styles), item) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
stylearr[index++] = zval_get_long(item);
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
} ZEND_HASH_FOREACH_END();
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImageSetStyle(im, stylearr, index);
efree(stylearr);
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new true color image */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagecreatetruecolor)
{
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x_size, y_size;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll", &x_size, &y_size) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
Warnings to Errors imagecreate(truecolor) We also add a test helper which we will be using for other GD functions as well.
2019-09-04 07:55:31 +08:00
if (x_size <= 0 || x_size >= INT_MAX) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(1, "must be greater than 0");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
Warnings to Errors imagecreate(truecolor) We also add a test helper which we will be using for other GD functions as well.
2019-09-04 07:55:31 +08:00
}
if (y_size <= 0 || y_size >= INT_MAX) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(2, "must be greater than 0");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
Fix segfaults in imagecreate/imagecreatetruecolor
2003-04-04 03:18:57 +08:00
}
Last bit of CS fixes.
2003-12-29 05:08:46 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
im = gdImageCreateTrueColor(x_size, y_size);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
MFH: fix several integer overflows in GD
2007-06-06 17:45:43 +08:00
if (!im) {
RETURN_FALSE;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ return true if the image uses truecolor */
Fixed build with GD 1.8.4
2002-12-11 03:45:58 +08:00
PHP_FUNCTION(imageistruecolor)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
Fixed build with GD 1.8.4
2002-12-11 03:45:58 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &IM, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Fixed build with GD 1.8.4
2002-12-11 03:45:58 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Fixed build with GD 1.8.4
2002-12-11 03:45:58 +08:00
RETURN_BOOL(im->trueColor);
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Convert a true color image to a palette based image with a number of colors, optionally using dithering. */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagetruecolortopalette)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
zend_bool dither;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long ncolors;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Obl", &IM, gd_image_ce, &dither, &ncolors) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Fix bug#72697 - select_colors write out-of-bounds (cherry picked from commit b6f13a5ef9d6280cf984826a5de012a32c396cd4) Conflicts: ext/gd/gd.c
2016-08-16 20:37:39 +08:00
if (ncolors <= 0 || ZEND_LONG_INT_OVFL(ncolors)) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(3, "must be greater than 0 and less than %d", INT_MAX);
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
MFH: fix #34996 (ImageTrueColorToPalette() crashes when ncolors is zero)
2005-10-27 05:38:20 +08:00
}
Warnings to Errors imagetruecolortopalette
2019-09-04 07:42:28 +08:00
Change gdImageTrueColorToPalette() to return success/failure We're porting the relevant changes from <https://github.com/libgd/libgd/commit/34a00a40>. We also check the return value in the PHP binding, and throw E_WARNING if the conversion failed.
2016-10-03 17:38:22 +08:00
if (gdImageTrueColorToPalette(im, dither, (int)ncolors)) {
RETURN_TRUE;
} else {
php_error_docref(NULL, E_WARNING, "Couldn't convert to palette");
RETURN_FALSE;
}
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Convert a palette based image to a true color image. */
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
PHP_FUNCTION(imagepalettetotruecolor)
{
zval *IM;
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &IM, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
if (gdImagePaletteToTrueColor(im) == 0) {
FALSE on error
2013-03-27 12:13:30 +08:00
RETURN_FALSE;
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Makes the colors of the palette version of an image more closely match the true color version */
(PHP imagecolormatch) makes a palette image match the colours in the true-color version. (PHP imagelayereffect) extended alpha-channel mixing effects for the bundled GD library @Added ImageColorMatch() and ImageLayerEffect() functions @which work with the bundled GD library (ttoohey)
2002-08-22 15:28:26 +08:00
PHP_FUNCTION(imagecolormatch)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM1, *IM2;
(PHP imagecolormatch) makes a palette image match the colours in the true-color version. (PHP imagelayereffect) extended alpha-channel mixing effects for the bundled GD library @Added ImageColorMatch() and ImageLayerEffect() functions @which work with the bundled GD library (ttoohey)
2002-08-22 15:28:26 +08:00
gdImagePtr im1, im2;
int result;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &IM1, gd_image_ce, &IM2, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
(PHP imagecolormatch) makes a palette image match the colours in the true-color version. (PHP imagelayereffect) extended alpha-channel mixing effects for the bundled GD library @Added ImageColorMatch() and ImageLayerEffect() functions @which work with the bundled GD library (ttoohey)
2002-08-22 15:28:26 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im1 = php_gd_libgdimageptr_from_zval_p(IM1);
im2 = php_gd_libgdimageptr_from_zval_p(IM2);
(PHP imagecolormatch) makes a palette image match the colours in the true-color version. (PHP imagelayereffect) extended alpha-channel mixing effects for the bundled GD library @Added ImageColorMatch() and ImageLayerEffect() functions @which work with the bundled GD library (ttoohey)
2002-08-22 15:28:26 +08:00
result = gdImageColorMatch(im1, im2);
WS & CS fixes
2003-03-20 09:12:57 +08:00
switch (result) {
case -1:
Promote warnings to exceptions in ext/gd Closes GH-6023
2020-08-20 05:27:53 +08:00
zend_argument_value_error(1, "must be TrueColor");
RETURN_THROWS();
WS & CS fixes
2003-03-20 09:12:57 +08:00
break;
case -2:
Promote warnings to exceptions in ext/gd Closes GH-6023
2020-08-20 05:27:53 +08:00
zend_argument_value_error(2, "must be Palette");
RETURN_THROWS();
WS & CS fixes
2003-03-20 09:12:57 +08:00
break;
case -3:
Promote warnings to exceptions in ext/gd Closes GH-6023
2020-08-20 05:27:53 +08:00
zend_argument_value_error(2, "must be the same size as argument #1 ($im1)");
RETURN_THROWS();
WS & CS fixes
2003-03-20 09:12:57 +08:00
break;
- MFH: fix segfault/leak in imagecolormatch - MFH: test for imagecolormatch
2005-12-26 03:39:53 +08:00
case -4:
Promote warnings to exceptions in ext/gd Closes GH-6023
2020-08-20 05:27:53 +08:00
zend_argument_value_error(2, "must have at least one color");
RETURN_THROWS();
- MFH: fix segfault/leak in imagecolormatch - MFH: test for imagecolormatch
2005-12-26 03:39:53 +08:00
break;
(PHP imagecolormatch) makes a palette image match the colours in the true-color version. (PHP imagelayereffect) extended alpha-channel mixing effects for the bundled GD library @Added ImageColorMatch() and ImageLayerEffect() functions @which work with the bundled GD library (ttoohey)
2002-08-22 15:28:26 +08:00
}
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Set line thickness for drawing lines, ellipses, rectangles, polygons etc. */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagesetthickness)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long thick;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &IM, gd_image_ce, &thick) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageSetThickness(im, thick);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw an ellipse */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagefilledellipse)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long cx, cy, w, h, color;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olllll", &IM, gd_image_ce, &cx, &cy, &w, &h, &color) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageFilledEllipse(im, cx, cy, w, h, color);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a filled partial ellipse */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagefilledarc)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long cx, cy, w, h, ST, E, col, style;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
Whitespace
2001-08-12 00:39:07 +08:00
int e, st;
trailing whitespace removal
2015-01-03 17:22:58 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ollllllll", &IM, gd_image_ce, &cx, &cy, &w, &h, &ST, &E, &col, &style) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
e = E;
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (e < 0) {
e %= 360;
}
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
st = ST;
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (st < 0) {
st %= 360;
}
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageFilledArc(im, cx, cy, w, h, st, e, col, style);
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
RETURN_TRUE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Turn alpha blending mode on or off for the given image */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagealphablending)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
zend_bool blend;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ob", &IM, gd_image_ce, &blend) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageAlphaBlending(im, blend);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Include alpha channel to a saved image */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
PHP_FUNCTION(imagesavealpha)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
zend_bool save;
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ob", &IM, gd_image_ce, &save) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageSaveAlpha(im, save);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
RETURN_TRUE;
}
- #36686, do not be quiet with the extern GD
2006-03-11 02:07:27 +08:00
/* }}} */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Set the alpha blending flag to use the bundled libgd layering effects */
(PHP imagecolormatch) makes a palette image match the colours in the true-color version. (PHP imagelayereffect) extended alpha-channel mixing effects for the bundled GD library @Added ImageColorMatch() and ImageLayerEffect() functions @which work with the bundled GD library (ttoohey)
2002-08-22 15:28:26 +08:00
PHP_FUNCTION(imagelayereffect)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long effect;
(PHP imagecolormatch) makes a palette image match the colours in the true-color version. (PHP imagelayereffect) extended alpha-channel mixing effects for the bundled GD library @Added ImageColorMatch() and ImageLayerEffect() functions @which work with the bundled GD library (ttoohey)
2002-08-22 15:28:26 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &IM, gd_image_ce, &effect) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
(PHP imagecolormatch) makes a palette image match the colours in the true-color version. (PHP imagelayereffect) extended alpha-channel mixing effects for the bundled GD library @Added ImageColorMatch() and ImageLayerEffect() functions @which work with the bundled GD library (ttoohey)
2002-08-22 15:28:26 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageAlphaBlending(im, effect);
(PHP imagecolormatch) makes a palette image match the colours in the true-color version. (PHP imagelayereffect) extended alpha-channel mixing effects for the bundled GD library @Added ImageColorMatch() and ImageLayerEffect() functions @which work with the bundled GD library (ttoohey)
2002-08-22 15:28:26 +08:00
RETURN_TRUE;
}
/* }}} */
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
#define CHECK_RGBA_RANGE(component, name, argument_number) \
Extend color component range checks We also check for alpha components to be within range, and we add yet missing range checks for other functions as well.
2019-08-11 21:00:23 +08:00
if (component < 0 || component > gd##name##Max) { \
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(argument_number, "must be between 0 and %d (inclusive)", gd##name##Max); \
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS(); \
imagecolorallocate(): Check that RGB components are in-range Instead of letting them bleed over into other components.
2019-06-20 16:09:54 +08:00
}
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Allocate a color with an alpha level. Works for true color and palette based images */
Feature Request #21784 Added: imagecolorallocatealpha (pollita@php.net,jasper@pointless.net)
2003-01-26 09:15:02 +08:00
PHP_FUNCTION(imagecolorallocatealpha)
{
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long red, green, blue, alpha;
Feature Request #21784 Added: imagecolorallocatealpha (pollita@php.net,jasper@pointless.net)
2003-01-26 09:15:02 +08:00
gdImagePtr im;
- Returns FALSE on error, it is how it must work
2006-01-17 23:23:29 +08:00
int ct = (-1);
Feature Request #21784 Added: imagecolorallocatealpha (pollita@php.net,jasper@pointless.net)
2003-01-26 09:15:02 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ollll", &IM, gd_image_ce, &red, &green, &blue, &alpha) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Feature Request #21784 Added: imagecolorallocatealpha (pollita@php.net,jasper@pointless.net)
2003-01-26 09:15:02 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
CHECK_RGBA_RANGE(alpha, Alpha, 5);
imagecolorallocate(): Check that RGB components are in-range Instead of letting them bleed over into other components.
2019-06-20 16:09:54 +08:00
- Returns FALSE on error, it is how it must work
2006-01-17 23:23:29 +08:00
ct = gdImageColorAllocateAlpha(im, red, green, blue, alpha);
if (ct < 0) {
RETURN_FALSE;
}
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG((zend_long)ct);
Feature Request #21784 Added: imagecolorallocatealpha (pollita@php.net,jasper@pointless.net)
2003-01-26 09:15:02 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Resolve/Allocate a colour with an alpha level. Works for true colour and palette based images */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagecolorresolvealpha)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long red, green, blue, alpha;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ollll", &IM, gd_image_ce, &red, &green, &blue, &alpha) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
CHECK_RGBA_RANGE(alpha, Alpha, 5);
Extend color component range checks We also check for alpha components to be within range, and we add yet missing range checks for other functions as well.
2019-08-11 21:00:23 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageColorResolveAlpha(im, red, green, blue, alpha));
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Find the closest matching colour with alpha transparency */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagecolorclosestalpha)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long red, green, blue, alpha;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ollll", &IM, gd_image_ce, &red, &green, &blue, &alpha) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
CHECK_RGBA_RANGE(alpha, Alpha, 5);
Extend color component range checks We also check for alpha components to be within range, and we add yet missing range checks for other functions as well.
2019-08-11 21:00:23 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageColorClosestAlpha(im, red, green, blue, alpha));
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Find exact match for colour with transparency */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagecolorexactalpha)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long red, green, blue, alpha;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im;
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ollll", &IM, gd_image_ce, &red, &green, &blue, &alpha) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
CHECK_RGBA_RANGE(alpha, Alpha, 5);
Extend color component range checks We also check for alpha components to be within range, and we add yet missing range checks for other functions as well.
2019-08-11 21:00:23 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageColorExactAlpha(im, red, green, blue, alpha));
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Copy and resize part of an image using resampling to help ensure clarity */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagecopyresampled)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *SIM, *DIM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long SX, SY, SW, SH, DX, DY, DW, DH;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im_dst, im_src;
int srcH, srcW, dstH, dstW, srcY, srcX, dstY, dstX;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OOllllllll", &DIM, gd_image_ce, &SIM, gd_image_ce, &DX, &DY, &SX, &SY, &DW, &DH, &SW, &SH) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
im_dst = php_gd_libgdimageptr_from_zval_p(DIM);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
srcX = SX;
srcY = SY;
srcH = SH;
srcW = SW;
dstX = DX;
dstY = DY;
dstH = DH;
dstW = DW;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImageCopyResampled(im_dst, im_src, dstX, dstY, srcX, srcY, dstW, dstH, srcW, srcH);
Added a patch by Pierre-Alain Joye <paj@pearfr.org>, which implements the imagerotate() that allows rotation of images in gd.
2002-10-29 09:15:44 +08:00
WS & CS fixes
2003-03-20 09:12:57 +08:00
RETURN_TRUE;
Added a patch by Pierre-Alain Joye <paj@pearfr.org>, which implements the imagerotate() that allows rotation of images in gd.
2002-10-29 09:15:44 +08:00
}
/* }}} */
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
#ifdef PHP_WIN32
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Grab a window or its client area using a windows handle (HWND property in COM instance) */
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
PHP_FUNCTION(imagegrabwindow)
{
HWND window;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long client_area = 0;
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
RECT rc = {0};
int Width, Height;
HDC hdc;
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long lwindow_handle;
fix unitialized val usage
2015-02-05 01:03:06 +08:00
gdImagePtr im = NULL;
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|l", &lwindow_handle, &client_area) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
}
window = (HWND) lwindow_handle;
if (!IsWindow(window)) {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_NOTICE, "Invalid window handle");
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
RETURN_FALSE;
}
hdc = GetDC(0);
if (client_area) {
GetClientRect(window, &rc);
Width = rc.right;
Height = rc.bottom;
} else {
GetWindowRect(window, &rc);
Width = rc.right - rc.left;
Height = rc.bottom - rc.top;
}
Width = (Width/4)*4;
memDC = CreateCompatibleDC(hdc);
memBM = CreateCompatibleBitmap(hdc, Width, Height);
hOld = (HBITMAP) SelectObject (memDC, memBM);
Get rid of these slow calls to LoadLibrary()/GetProcAddress() calls on Windows, we require Windows Vista as bare minimum for PHP anyway, so it does not make any sense to do this slow emulation anyway. GD: - PrintWindow() is available as of Windows XP, it requires linking to User32.lib, which config.w32 for ext/gd already. CLI: - The borrowed functions from PostgreSQL to set the titles of the console window uses SetConsoleTitle() and GetConsoleTitle(), both are available as of Windows 2000 from Kernel32.lib which we already are linking against. Standard: - The disk space utility functions uses GetDiskFreeSpaceExA() which is available as of Windows XP, again links to Kernel32.lib. - The symlink() PHP function uses CreateSymbolicLinkA() which is available from Windows Vista, again from Kernel32.lib. - php_get_windows_name() in info.c uses GetNativeSystemInfo() which is available as of Windows XP and GetProductInfo() which is available as of Windows Vista, both are again from Kernel32.lib. Notes: - ext/interbase & ext/pdo_firebird uses GetProcAddress(), I'm not entirely sure how to handle this one. - ext/sqlite3, this is apart of the bundled libsqlite3, I don't really wanna play around with our bundled libs and make it a bigger issue for those who maintain and upgrade them. - ext/readline, the call to GetProcAddress() here does not do any system calls, so it is left as is. - win32/ioutil.c uses GetProcAddress(), but the function it attempts to load (PathCchCanonicalizeEx()) is only available from Windows 8 and greater (Pathcch.lib linkage). - win32/time.c uses GetSystemTimePreciseAsFileTime() which is available from Windows 8 and greater to get the current system date and time which the highest possible precision and falls back to GetSystemTimeAsFileTime() (available as of Windows 2000), again Kernel32.lib, the GetSystemTimePreciseAsFileTime() is left in a GetProcAddress().
2016-08-11 08:09:50 +08:00
PrintWindow(window, memDC, (UINT) client_area);
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
im = gdImageCreateTrueColor(Width, Height);
if (im) {
int x,y;
for (y=0; y <= Height; y++) {
for (x=0; x <= Width; x++) {
int c = GetPixel(memDC, x,y);
gdImageSetPixel(im, x, y, gdTrueColor(GetRValue(c), GetGValue(c), GetBValue(c)));
}
}
}
SelectObject(memDC,hOld);
DeleteObject(memBM);
DeleteDC(memDC);
ReleaseDC( 0, hdc );
if (!im) {
RETURN_FALSE;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im);
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Grab a screenshot */
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
PHP_FUNCTION(imagegrabscreen)
{
HWND window = GetDesktopWindow();
RECT rc = {0};
int Width, Height;
HDC hdc;
HDC memDC;
HBITMAP memBM;
HBITMAP hOld;
gdImagePtr im;
hdc = GetDC(0);
- New parameter parsing API
2008-06-22 06:07:53 +08:00
if (zend_parse_parameters_none() == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- New parameter parsing API
2008-06-22 06:07:53 +08:00
}
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
if (!hdc) {
RETURN_FALSE;
}
GetWindowRect(window, &rc);
Width = rc.right - rc.left;
Height = rc.bottom - rc.top;
Width = (Width/4)*4;
memDC = CreateCompatibleDC(hdc);
memBM = CreateCompatibleBitmap(hdc, Width, Height);
hOld = (HBITMAP) SelectObject (memDC, memBM);
BitBlt( memDC, 0, 0, Width, Height , hdc, rc.left, rc.top , SRCCOPY );
im = gdImageCreateTrueColor(Width, Height);
if (im) {
int x,y;
for (y=0; y <= Height; y++) {
for (x=0; x <= Width; x++) {
int c = GetPixel(memDC, x,y);
gdImageSetPixel(im, x, y, gdTrueColor(GetRValue(c), GetGValue(c), GetBValue(c)));
}
}
}
SelectObject(memDC,hOld);
DeleteObject(memBM);
DeleteDC(memDC);
ReleaseDC( 0, hdc );
if (!im) {
RETURN_FALSE;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im);
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
}
/* }}} */
- fix compile warning
2007-04-24 20:51:22 +08:00
#endif /* PHP_WIN32 */
- MFH: add imagegrabwindow and imagegrabscreen (win32 only) [DOC] capture a window using its handle or a full screen
2007-04-17 23:31:45 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Rotate an image using a custom angle */
Added a patch by Pierre-Alain Joye <paj@pearfr.org>, which implements the imagerotate() that allows rotation of images in gd.
2002-10-29 09:15:44 +08:00
PHP_FUNCTION(imagerotate)
{
- allow to keep or ignore the transparent color in imagerotate (thx Ken Coar to report this "bug") - be sure to restore alphablending in imagefill - use zend_parse_parameter in imagerotate
2005-03-28 07:43:52 +08:00
zval *SIM;
Added a patch by Pierre-Alain Joye <paj@pearfr.org>, which implements the imagerotate() that allows rotation of images in gd.
2002-10-29 09:15:44 +08:00
gdImagePtr im_dst, im_src;
double degrees;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long color;
zend_long ignoretransparent = 0;
Added a patch by Pierre-Alain Joye <paj@pearfr.org>, which implements the imagerotate() that allows rotation of images in gd.
2002-10-29 09:15:44 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Odl|l", &SIM, gd_image_ce, &degrees, &color, &ignoretransparent) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
}
Added a patch by Pierre-Alain Joye <paj@pearfr.org>, which implements the imagerotate() that allows rotation of images in gd.
2002-10-29 09:15:44 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
- fix regression bug24155.phpt and bug39366.phpt
2013-03-22 16:21:11 +08:00
im_dst = gdImageRotateInterpolated(im_src, (const float)degrees, color);
Added a patch by Pierre-Alain Joye <paj@pearfr.org>, which implements the imagerotate() that allows rotation of images in gd.
2002-10-29 09:15:44 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (im_dst == NULL) {
Added a patch by Pierre-Alain Joye <paj@pearfr.org>, which implements the imagerotate() that allows rotation of images in gd.
2002-10-29 09:15:44 +08:00
RETURN_FALSE;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im_dst);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
}
- Make functions not exist when they are not available. This means you can now safely do function_exists() on all gd functions.
2002-06-25 03:31:44 +08:00
/* }}} */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Set the tile image to $tile when filling $image with the "IMG_COLOR_TILED" color */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagesettile)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM, *TILE;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im, tile;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &IM, gd_image_ce, &TILE, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
tile = php_gd_libgdimageptr_from_zval_p(TILE);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
Whitespace
2001-08-12 00:39:07 +08:00
gdImageSetTile(im, tile);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Set the brush image to $brush when filling $image with the "IMG_COLOR_BRUSHED" color */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagesetbrush)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM, *TILE;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im, tile;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &IM, gd_image_ce, &TILE, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
tile = php_gd_libgdimageptr_from_zval_p(TILE);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
Whitespace
2001-08-12 00:39:07 +08:00
gdImageSetBrush(im, tile);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecreate)
{
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x_size, y_size;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "ll", &x_size, &y_size) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Warnings to Errors imagecreate(truecolor) We also add a test helper which we will be using for other GD functions as well.
2019-09-04 07:55:31 +08:00
if (x_size <= 0 || x_size >= INT_MAX) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(1, "must be greater than 0");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
Warnings to Errors imagecreate(truecolor) We also add a test helper which we will be using for other GD functions as well.
2019-09-04 07:55:31 +08:00
}
if (y_size <= 0 || y_size >= INT_MAX) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(2, "must be greater than 0");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
Fix segfaults in imagecreate/imagecreatetruecolor
2003-04-04 03:18:57 +08:00
}
- New parameter parsing API
2008-06-22 06:07:53 +08:00
im = gdImageCreate(x_size, y_size);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
MFH: fix several integer overflows in GD
2007-06-06 17:45:43 +08:00
if (!im) {
RETURN_FALSE;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Return the types of images supported in a bitfield - 1=GIF, 2=JPEG, 4=PNG, 8=WBMP, 16=XPM */
Add ImageTypes() function which returns a bitfield with the supported image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp @ Add ImageTypes() function which returns a bitfield with the supported @ image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
2000-07-15 05:51:31 +08:00
PHP_FUNCTION(imagetypes)
{
Replace magic values with constants
2017-08-19 20:28:22 +08:00
int ret = 0;
ret = PHP_IMG_GIF;
Add ImageTypes() function which returns a bitfield with the supported image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp @ Add ImageTypes() function which returns a bitfield with the supported @ image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
2000-07-15 05:51:31 +08:00
#ifdef HAVE_GD_JPG
Replace magic values with constants
2017-08-19 20:28:22 +08:00
ret |= PHP_IMG_JPG;
Add ImageTypes() function which returns a bitfield with the supported image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp @ Add ImageTypes() function which returns a bitfield with the supported @ image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
2000-07-15 05:51:31 +08:00
#endif
#ifdef HAVE_GD_PNG
Replace magic values with constants
2017-08-19 20:28:22 +08:00
ret |= PHP_IMG_PNG;
Add ImageTypes() function which returns a bitfield with the supported image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp @ Add ImageTypes() function which returns a bitfield with the supported @ image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
2000-07-15 05:51:31 +08:00
#endif
Replace magic values with constants
2017-08-19 20:28:22 +08:00
ret |= PHP_IMG_WBMP;
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_XPM
Replace magic values with constants
2017-08-19 20:28:22 +08:00
ret |= PHP_IMG_XPM;
Add ImageTypes() function which returns a bitfield with the supported image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp @ Add ImageTypes() function which returns a bitfield with the supported @ image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
2000-07-15 05:51:31 +08:00
#endif
Fix bug #72596: imagetypes function won't advertise WEBP support We add the constant IMG_WEBP and make sure that WebP support is properly reported by imagetypes().
2016-07-14 22:43:13 +08:00
#ifdef HAVE_GD_WEBP
Replace magic values with constants
2017-08-19 20:28:22 +08:00
ret |= PHP_IMG_WEBP;
Fix bug #72596: imagetypes function won't advertise WEBP support We add the constant IMG_WEBP and make sure that WebP support is properly reported by imagetypes().
2016-07-14 22:43:13 +08:00
#endif
Implement #69606: Support BMPs (added in GD 2.1.0) We add PHP bindings for libgd's features to read and write BMP files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these.
2016-07-24 20:14:57 +08:00
#ifdef HAVE_GD_BMP
Replace magic values with constants
2017-08-19 20:28:22 +08:00
ret |= PHP_IMG_BMP;
Implement #69606: Support BMPs (added in GD 2.1.0) We add PHP bindings for libgd's features to read and write BMP files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these.
2016-07-24 20:14:57 +08:00
#endif
Support TGA reading We add PHP bindings for libgd's features to read TGA files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these. Since TGA has no easily recognizable file signature, we don't add TGA support for imagecreatefromstring() or getimagesize() and friends.
2019-06-21 05:40:51 +08:00
#ifdef HAVE_GD_TGA
ret |= PHP_IMG_TGA;
#endif
WS & CS fixes
2003-03-20 09:12:57 +08:00
MFH: New way for check void parameters
2008-03-11 06:15:36 +08:00
if (zend_parse_parameters_none() == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Track down a few more functions that don't check for 0 args and use faster mechanism
2001-08-13 15:55:39 +08:00
}
We don't consistently check for args passed to functions that don't take any args. In some cases we probably want to skip the check for performance reasons, but in other cases where performance is unlikely to be a factor, not throwing a warning on the wrong number of args passed to a function is at best inconsistent, and at worst it could hide a bug. So, add a few such checks. There are still lots of cases out there.
2001-08-13 14:43:47 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(ret);
Add ImageTypes() function which returns a bitfield with the supported image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp @ Add ImageTypes() function which returns a bitfield with the supported @ image formats. 1=gif, 2=jpeg, 4=png and 8=wbmp (Rasmus)
2000-07-15 05:51:31 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
Add PNG support. Tested with gd 1.7.3.
1999-10-17 22:57:49 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ _php_ctx_getmbi */
Allow to use new GD-2.1.0 function from system library
2013-04-25 19:39:35 +08:00
* Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
2013-05-03 18:40:45 +08:00
static int _php_ctx_getmbi(gdIOCtx *ctx)
Allow to use new GD-2.1.0 function from system library
2013-04-25 19:39:35 +08:00
{
int i, mbi = 0;
do {
i = (ctx->getC)(ctx);
if (i < 0) {
* Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
2013-05-03 18:40:45 +08:00
return -1;
Allow to use new GD-2.1.0 function from system library
2013-04-25 19:39:35 +08:00
}
mbi = (mbi << 7) | (i & 0x7f);
} while (i & 0x80);
* Remove overflow2, getmbi and skipheaders from gd_compat.h * Add missing return in _php_ctx_getmbi * Reintroduce imagecreatefromxbm by checking for gdCreateImageFromXbm
2013-05-03 18:40:45 +08:00
return mbi;
Allow to use new GD-2.1.0 function from system library
2013-04-25 19:39:35 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ _php_image_type */
php_sig_gd2 is only needed for GD extension.
2001-08-08 00:35:35 +08:00
static const char php_sig_gd2[3] = {'g', 'd', '2'};
Add support for webp in imagecreatefromstring
2017-07-30 08:50:33 +08:00
static int _php_image_type (char data[12])
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
{
Fixed bug #21518. Fixed memory in leak ImageCreateFromString(). Fixed a bug that prevented proper identification of WBMP images and thus prevented ImageCreateFromString() from working on those images.
2003-01-09 02:11:40 +08:00
/* Based on ext/standard/image.c */
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (data == NULL) {
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
return -1;
WS & CS fixes
2003-03-20 09:12:57 +08:00
}
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
Add support for webp in imagecreatefromstring
2017-07-30 08:50:33 +08:00
if (!memcmp(data, php_sig_gd2, sizeof(php_sig_gd2))) {
@- Added support for GD2 image type for ImageCreateFromString() (Jani)
2001-08-08 00:15:45 +08:00
return PHP_GDIMG_TYPE_GD2;
Add support for webp in imagecreatefromstring
2017-07-30 08:50:33 +08:00
} else if (!memcmp(data, php_sig_jpg, sizeof(php_sig_jpg))) {
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
return PHP_GDIMG_TYPE_JPG;
Add support for webp in imagecreatefromstring
2017-07-30 08:50:33 +08:00
} else if (!memcmp(data, php_sig_png, sizeof(php_sig_png))) {
return PHP_GDIMG_TYPE_PNG;
} else if (!memcmp(data, php_sig_gif, sizeof(php_sig_gif))) {
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
return PHP_GDIMG_TYPE_GIF;
Implement #69606: Support BMPs (added in GD 2.1.0) We add PHP bindings for libgd's features to read and write BMP files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these.
2016-07-24 20:14:57 +08:00
} else if (!memcmp(data, php_sig_bmp, sizeof(php_sig_bmp))) {
return PHP_GDIMG_TYPE_BMP;
Add support for webp in imagecreatefromstring
2017-07-30 08:50:33 +08:00
} else if(!memcmp(data, php_sig_riff, sizeof(php_sig_riff)) && !memcmp(data + sizeof(php_sig_riff) + sizeof(uint32_t), php_sig_webp, sizeof(php_sig_webp))) {
return PHP_GDIMG_TYPE_WEBP;
WS & CS fixes
2003-03-20 09:12:57 +08:00
}
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
else {
gdIOCtx *io_ctx;
Fixed bug #29349 (imagecreatefromstring() crashes with external GD library) Original Patch By: adconrad at debian dot org
2004-07-27 08:27:06 +08:00
io_ctx = gdNewDynamicCtxEx(8, data, 0);
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
if (io_ctx) {
Allow to use new GD-2.1.0 function from system library
2013-04-25 19:39:35 +08:00
if (_php_ctx_getmbi(io_ctx) == 0 && _php_ctx_getmbi(io_ctx) >= 0) {
Update bundled gd library with relevant changes from gd-2.0.4 I still need to add a configure check for the gdIOCtx struct changes so building against older external gd libs will work again.
2002-10-30 07:08:01 +08:00
io_ctx->gd_free(io_ctx);
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
return PHP_GDIMG_TYPE_WBM;
This patch allows compilation of gd against non-bundled gd library older then 2.0.4.
2002-10-30 09:05:16 +08:00
} else {
Update bundled gd library with relevant changes from gd-2.0.4 I still need to add a configure check for the gdIOCtx struct changes so building against older external gd libs will work again.
2002-10-30 07:08:01 +08:00
io_ctx->gd_free(io_ctx);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
}
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
}
}
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
return -1;
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ _php_image_create_from_string */
Use zpp string argument in imagecreatefromstring() Instead of accepting a zval and casting it.
2019-02-28 19:07:34 +08:00
gdImagePtr _php_image_create_from_string(zend_string *data, char *tn, gdImagePtr (*ioctx_func_p)())
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
{
gdImagePtr im;
gdIOCtx *io_ctx;
ws fix
2002-09-13 05:42:33 +08:00
Use zpp string argument in imagecreatefromstring() Instead of accepting a zval and casting it.
2019-02-28 19:07:34 +08:00
io_ctx = gdNewDynamicCtxEx(ZSTR_LEN(data), ZSTR_VAL(data), 0);
ws fix
2002-09-13 05:42:33 +08:00
if (!io_ctx) {
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
return NULL;
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
}
ws fix
2002-09-13 05:42:33 +08:00
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
im = (*ioctx_func_p)(io_ctx);
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
if (!im) {
Promote warnings to exceptions in ext/gd Closes GH-6023
2020-08-20 05:27:53 +08:00
php_error_docref(NULL, E_WARNING, "Passed data is not in \"%s\" format", tn);
- MFH:#39780, PNG image with CRC/data error raises fatal error
2006-12-10 09:38:02 +08:00
io_ctx->gd_free(io_ctx);
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
return NULL;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Fixed bug #21518. Fixed memory in leak ImageCreateFromString(). Fixed a bug that prevented proper identification of WBMP images and thus prevented ImageCreateFromString() from working on those images.
2003-01-09 02:11:40 +08:00
io_ctx->gd_free(io_ctx);
WS & CS fixes
2003-03-20 09:12:57 +08:00
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
return im;
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from the image stream in the string */
Fix GD build, and clean it tup
2001-07-31 01:29:57 +08:00
PHP_FUNCTION(imagecreatefromstring)
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
{
Use zpp string argument in imagecreatefromstring() Instead of accepting a zval and casting it.
2019-02-28 19:07:34 +08:00
zend_string *data;
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
gdImagePtr im;
int imtype;
Add support for webp in imagecreatefromstring
2017-07-30 08:50:33 +08:00
char sig[12];
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
Use zpp string argument in imagecreatefromstring() Instead of accepting a zval and casting it.
2019-02-28 19:07:34 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "S", &data) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Use zpp string argument in imagecreatefromstring() Instead of accepting a zval and casting it.
2019-02-28 19:07:34 +08:00
if (ZSTR_LEN(data) < sizeof(sig)) {
Promote warnings to exceptions in ext/gd Closes GH-6023
2020-08-20 05:27:53 +08:00
zend_argument_value_error(1, "cannot be empty");
RETURN_THROWS();
- MFH: - fix leaks and wrong error when invalid/empty string are given to imagecreatefromstring - add test for imagecreatefromstring - add test for palettecopy
2005-12-18 01:46:59 +08:00
}
Use zpp string argument in imagecreatefromstring() Instead of accepting a zval and casting it.
2019-02-28 19:07:34 +08:00
memcpy(sig, ZSTR_VAL(data), sizeof(sig));
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
WS & CS fixes
2003-03-20 09:12:57 +08:00
imtype = _php_image_type(sig);
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
switch (imtype) {
case PHP_GDIMG_TYPE_JPG:
#ifdef HAVE_GD_JPG
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
im = _php_image_create_from_string(data, "JPEG", gdImageCreateFromJpegCtx);
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
#else
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "No JPEG support in this PHP build");
- ImageCreateFromString(): Fixed segfault that occured if an image was tried to be generate while there was no support for such an image type.
2000-11-05 04:43:53 +08:00
RETURN_FALSE;
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
#endif
break;
case PHP_GDIMG_TYPE_PNG:
#ifdef HAVE_GD_PNG
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
im = _php_image_create_from_string(data, "PNG", gdImageCreateFromPngCtx);
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
#else
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "No PNG support in this PHP build");
- ImageCreateFromString(): Fixed segfault that occured if an image was tried to be generate while there was no support for such an image type.
2000-11-05 04:43:53 +08:00
RETURN_FALSE;
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
#endif
break;
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
case PHP_GDIMG_TYPE_GIF:
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
im = _php_image_create_from_string(data, "GIF", gdImageCreateFromGifCtx);
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
break;
case PHP_GDIMG_TYPE_WBM:
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
im = _php_image_create_from_string(data, "WBMP", gdImageCreateFromWBMPCtx);
@- Added support for GD2 image type for ImageCreateFromString() (Jani)
2001-08-08 00:15:45 +08:00
break;
case PHP_GDIMG_TYPE_GD2:
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
im = _php_image_create_from_string(data, "GD2", gdImageCreateFromGd2Ctx);
@- Added support for GD2 image type for ImageCreateFromString() (Jani)
2001-08-08 00:15:45 +08:00
break;
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
Implement #69606: Support BMPs (added in GD 2.1.0) We add PHP bindings for libgd's features to read and write BMP files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these.
2016-07-24 20:14:57 +08:00
case PHP_GDIMG_TYPE_BMP:
im = _php_image_create_from_string(data, "BMP", gdImageCreateFromBmpCtx);
break;
Add support for webp in imagecreatefromstring
2017-07-30 08:50:33 +08:00
case PHP_GDIMG_TYPE_WEBP:
#ifdef HAVE_GD_WEBP
im = _php_image_create_from_string(data, "WEBP", gdImageCreateFromWebpCtx);
break;
#else
php_error_docref(NULL, E_WARNING, "No WEBP support in this PHP build");
RETURN_FALSE;
#endif
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
default:
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "Data is not in a recognized format");
ws fix
2002-09-13 05:42:33 +08:00
RETURN_FALSE;
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
}
ws fix
2002-09-13 05:42:33 +08:00
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
if (!im) {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "Couldn't create GD Image Stream out of Data");
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
RETURN_FALSE;
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
}
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im);
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
}
- Fixing Mathieu's indentation problems # It does not build, undefined references to getmbi and skipheader
2000-11-04 04:31:36 +08:00
/* }}} */
- Introduced ImageCreateFromString() function, works for GIF/JPEG/PNG and WBMP .. (Note: This built with the latest snapshot I grabbed tonight; Derick seemed to have trouble though..) @-Introduced ImageCreateFromString(), creates an image @ stream out of eg a MySQL blob. (Mathieu)
2000-11-04 03:53:42 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ _php_image_create_from */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
static void _php_image_create_from(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, gdImagePtr (*func_p)(), gdImagePtr (*ioctx_func_p)())
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
{
- MFH: Added new parameter parsing API (part II)
2008-08-05 02:23:33 +08:00
char *file;
first show to make 's' work with size_t
2014-08-27 21:31:48 +08:00
size_t file_len;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long srcx, srcy, width, height;
New PHP streams...
2002-03-16 05:03:08 +08:00
gdImagePtr im = NULL;
change * formatting
2002-03-16 09:28:57 +08:00
php_stream *stream;
New PHP streams...
2002-03-16 05:03:08 +08:00
FILE * fp = NULL;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
#ifdef HAVE_GD_JPG
- MFH: add a weak/tolerant mode to the jpeg loader
2006-02-05 23:53:58 +08:00
long ignore_warning;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
#endif
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
2013-05-03 19:53:55 +08:00
- MFH: Added new parameter parsing API (part II)
2008-08-05 02:23:33 +08:00
if (image_type == PHP_GDIMG_TYPE_GD2PART) {
Merge branch 'PHP-5.6' * PHP-5.6: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/document.c ext/fileinfo/libmagic/softmagic.c ext/gd/gd.c ext/hash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/phar/phar_internal.h ext/standard/http_fopen_wrapper.c ext/standard/link.c ext/standard/streamsfuncs.c ext/xmlwriter/php_xmlwriter.c ext/zlib/zlib.c
2015-04-14 16:20:31 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "pllll", &file, &file_len, &srcx, &srcy, &width, &height) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- MFH: Added new parameter parsing API (part II)
2008-08-05 02:23:33 +08:00
}
Warnings to errors for imagecreatefromgd2part We also delete tests which were duplicates of a completely unrelated test.
2019-09-04 07:56:40 +08:00
if (width < 1) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(4, "must be greater than or equal to 1");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- #39286, misleading error message when nvalid dimensions are given
2006-12-10 10:55:30 +08:00
}
Warnings to errors for imagecreatefromgd2part We also delete tests which were duplicates of a completely unrelated test.
2019-09-04 07:56:40 +08:00
if (height < 1) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(5, "must be greater than or equal to 1");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
Warnings to errors for imagecreatefromgd2part We also delete tests which were duplicates of a completely unrelated test.
2019-09-04 07:56:40 +08:00
}
- MFH: Added new parameter parsing API (part II)
2008-08-05 02:23:33 +08:00
} else {
Merge branch 'PHP-5.6' * PHP-5.6: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/document.c ext/fileinfo/libmagic/softmagic.c ext/gd/gd.c ext/hash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/phar/phar_internal.h ext/standard/http_fopen_wrapper.c ext/standard/link.c ext/standard/streamsfuncs.c ext/xmlwriter/php_xmlwriter.c ext/zlib/zlib.c
2015-04-14 16:20:31 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "p", &file, &file_len) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- MFH: Added new parameter parsing API (part II)
2008-08-05 02:23:33 +08:00
}
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL Regression introduced in 8a90aad (drop of USE_GD_IOCTX) Secure with php_stream_can_cast to avoid segfault in php_stream_cast. (encountered when imagecreatefromxpm with URL)
2013-06-21 20:11:04 +08:00
Removed safe_mode * Removed ini options, safe_mode* * Removed --enable-safe-mode --with-exec-dir configure options on Unix * Updated extensions, SAPI's and core * php_get_current_user() is now declared in main.c, thrus no need to include safe_mode.h anymore
2010-04-27 07:53:30 +08:00
stream = php_stream_open_wrapper(file, "rb", REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL);
New PHP streams...
2002-03-16 05:03:08 +08:00
if (stream == NULL) {
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
RETURN_FALSE;
}
- Fixed typo in _php_image_output (s/fp/tmp/) causing segfault. - Fixed bug when calling imagejpeg() with 3 arguments, the second one empty, introduced yesterday. - Nuked even more code.
2000-06-08 07:04:39 +08:00
New PHP streams...
2002-03-16 05:03:08 +08:00
/* try and avoid allocating a FILE* if the stream is not naturally a FILE* */
if (php_stream_is(stream, PHP_STREAM_IS_STDIO)) {
*** empty log message ***
2002-03-22 06:35:02 +08:00
if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO, (void**)&fp, REPORT_ERRORS)) {
goto out_err;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
} else if (ioctx_func_p) {
New PHP streams...
2002-03-16 05:03:08 +08:00
/* we can create an io context */
Add URL support for GD
2000-09-26 17:08:02 +08:00
gdIOCtx* io_ctx;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zend_string *buff;
char *pstr;
Add URL support for GD
2000-09-26 17:08:02 +08:00
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
buff = php_stream_copy_to_mem(stream, PHP_STREAM_COPY_ALL, 0);
Add URL support for GD
2000-09-26 17:08:02 +08:00
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
if (!buff) {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING,"Cannot read image data");
New PHP streams...
2002-03-16 05:03:08 +08:00
goto out_err;
Allow usage of GD contexts and not tempfiles in output functions
2001-02-01 23:40:35 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
/* needs to be malloc (persistent) - GD will free() it later */
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 09:05:24 +08:00
pstr = pestrndup(ZSTR_VAL(buff), ZSTR_LEN(buff), 1);
io_ctx = gdNewDynamicCtxEx(ZSTR_LEN(buff), pstr, 0);
CS fix
2003-03-20 09:17:05 +08:00
if (!io_ctx) {
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
pefree(pstr, 1);
Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.
2018-05-28 21:27:12 +08:00
zend_string_release_ex(buff, 0);
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING,"Cannot allocate GD IO context");
New PHP streams...
2002-03-16 05:03:08 +08:00
goto out_err;
Add URL support for GD
2000-09-26 17:08:02 +08:00
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
if (image_type == PHP_GDIMG_TYPE_GD2PART) {
- MFH: Added new parameter parsing API (part II)
2008-08-05 02:23:33 +08:00
im = (*ioctx_func_p)(io_ctx, srcx, srcy, width, height);
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
} else {
im = (*ioctx_func_p)(io_ctx);
}
Update bundled gd library with relevant changes from gd-2.0.4 I still need to add a configure check for the gdIOCtx struct changes so building against older external gd libs will work again.
2002-10-30 07:08:01 +08:00
io_ctx->gd_free(io_ctx);
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
pefree(pstr, 1);
Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.
2018-05-28 21:27:12 +08:00
zend_string_release_ex(buff, 0);
New PHP streams...
2002-03-16 05:03:08 +08:00
}
Fixed Bug #65060 imagecreatefrom... crashes with user streams Fixed Bug #65084 imagecreatefromjpeg fails with URL Regression introduced in 8a90aad (drop of USE_GD_IOCTX) Secure with php_stream_can_cast to avoid segfault in php_stream_cast. (encountered when imagecreatefromxpm with URL)
2013-06-21 20:11:04 +08:00
else if (php_stream_can_cast(stream, PHP_STREAM_AS_STDIO)) {
New PHP streams...
2002-03-16 05:03:08 +08:00
/* try and force the stream to be FILE* */
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (FAILURE == php_stream_cast(stream, PHP_STREAM_AS_STDIO | PHP_STREAM_CAST_TRY_HARD, (void **) &fp, REPORT_ERRORS)) {
New PHP streams...
2002-03-16 05:03:08 +08:00
goto out_err;
WS & CS fixes
2003-03-20 09:12:57 +08:00
}
New PHP streams...
2002-03-16 05:03:08 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (!im && fp) {
Made imagecreatefromxpm() work once again.
2002-12-05 04:58:04 +08:00
switch (image_type) {
case PHP_GDIMG_TYPE_GD2PART:
- MFH: Added new parameter parsing API (part II)
2008-08-05 02:23:33 +08:00
im = (*func_p)(fp, srcx, srcy, width, height);
Made imagecreatefromxpm() work once again.
2002-12-05 04:58:04 +08:00
break;
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_XPM
Made imagecreatefromxpm() work once again.
2002-12-05 04:58:04 +08:00
case PHP_GDIMG_TYPE_XPM:
- Fix build (thanks Sebastian)
2008-08-05 07:48:09 +08:00
im = gdImageCreateFromXpm(file);
Made imagecreatefromxpm() work once again.
2002-12-05 04:58:04 +08:00
break;
Fix build
2002-12-05 07:21:30 +08:00
#endif
- MFH: add a weak/tolerant mode to the jpeg loader
2006-02-05 23:53:58 +08:00
#ifdef HAVE_GD_JPG
case PHP_GDIMG_TYPE_JPG:
ignore_warning = INI_INT("gd.jpeg_ignore_warning");
We need both gdImageCreateFromJpeg* and gdImageCreateFromJpeg*Ex The new (Ex) functions are used with the new ignore_warning parameter The standard functions are used in _php_image_create_from_string, sent as a function pointer, and call without this optional parameter.
2013-04-24 22:07:50 +08:00
im = gdImageCreateFromJpegEx(fp, ignore_warning);
- MFH: add a weak/tolerant mode to the jpeg loader
2006-02-05 23:53:58 +08:00
break;
#endif
Made imagecreatefromxpm() work once again.
2002-12-05 04:58:04 +08:00
default:
im = (*func_p)(fp);
break;
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
}
Add URL support for GD
2000-09-26 17:08:02 +08:00
fflush(fp);
}
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
Reduce compiler noise by removing unused variables and labels
2013-08-15 12:06:59 +08:00
/* register_im: */
New PHP streams...
2002-03-16 05:03:08 +08:00
if (im) {
- Don't forget to close the stream.
2002-06-16 01:46:44 +08:00
php_stream_close(stream);
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im);
New PHP streams...
2002-03-16 05:03:08 +08:00
return;
createfrom* fixes
2000-04-21 10:23:16 +08:00
}
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
Promote warnings to exceptions in ext/gd Closes GH-6023
2020-08-20 05:27:53 +08:00
php_error_docref(NULL, E_WARNING, "\"%s\" is not a valid %s file", file, tn);
New PHP streams...
2002-03-16 05:03:08 +08:00
out_err:
php_stream_close(stream);
RETURN_FALSE;
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from GIF file or URL */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
PHP_FUNCTION(imagecreatefromgif)
{
Whitespace
2001-08-12 00:39:07 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageCreateFromGif, gdImageCreateFromGifCtx);
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
}
/* }}} */
- Make functions not exist when they are not available. This means you can now safely do function_exists() on all gd functions.
2002-06-25 03:31:44 +08:00
#ifdef HAVE_GD_JPG
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from JPEG file or URL */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
PHP_FUNCTION(imagecreatefromjpeg)
{
Whitespace
2001-08-12 00:39:07 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "JPEG", gdImageCreateFromJpeg, gdImageCreateFromJpegCtx);
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
}
/* }}} */
- Make functions not exist when they are not available. This means you can now safely do function_exists() on all gd functions.
2002-06-25 03:31:44 +08:00
#endif /* HAVE_GD_JPG */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
- Make functions not exist when they are not available. This means you can now safely do function_exists() on all gd functions.
2002-06-25 03:31:44 +08:00
#ifdef HAVE_GD_PNG
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from PNG file or URL */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
PHP_FUNCTION(imagecreatefrompng)
{
Whitespace
2001-08-12 00:39:07 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "PNG", gdImageCreateFromPng, gdImageCreateFromPngCtx);
Add PNG support. Tested with gd 1.7.3.
1999-10-17 22:57:49 +08:00
}
/* }}} */
- Make functions not exist when they are not available. This means you can now safely do function_exists() on all gd functions.
2002-06-25 03:31:44 +08:00
#endif /* HAVE_GD_PNG */
Add PNG support. Tested with gd 1.7.3.
1999-10-17 22:57:49 +08:00
- initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g)
2010-10-05 06:30:35 +08:00
#ifdef HAVE_GD_WEBP
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from WEBP file or URL */
- initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g)
2010-10-05 06:30:35 +08:00
PHP_FUNCTION(imagecreatefromwebp)
{
Use same logic to load WebP image that other formats
2013-06-24 17:10:52 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageCreateFromWebp, gdImageCreateFromWebpCtx);
- initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g)
2010-10-05 06:30:35 +08:00
}
/* }}} */
fix comment
2015-07-19 00:28:42 +08:00
#endif /* HAVE_GD_WEBP */
- initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g)
2010-10-05 06:30:35 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from XBM file or URL */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
PHP_FUNCTION(imagecreatefromxbm)
More cleanup...
1999-12-18 05:50:07 +08:00
{
Whitespace
2001-08-12 00:39:07 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XBM, "XBM", gdImageCreateFromXbm, NULL);
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
}
/* }}} */
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_XPM
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from XPM file or URL */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
PHP_FUNCTION(imagecreatefromxpm)
{
Whitespace
2001-08-12 00:39:07 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_XPM, "XPM", gdImageCreateFromXpm, NULL);
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
}
/* }}} */
Made imagecreatefromxpm() work once again.
2002-12-05 04:58:04 +08:00
#endif
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from WBMP file or URL */
- Added imagecreatefromwbmp(). - Fixed missing parenthesis when calling function get_active_function_name. @- Added function imagecreatefromwbmp(). (Jouni)
2000-06-25 09:44:15 +08:00
PHP_FUNCTION(imagecreatefromwbmp)
{
Whitespace
2001-08-12 00:39:07 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WBM, "WBMP", gdImageCreateFromWBMP, gdImageCreateFromWBMPCtx);
- Added imagecreatefromwbmp(). - Fixed missing parenthesis when calling function get_active_function_name. @- Added function imagecreatefromwbmp(). (Jouni)
2000-06-25 09:44:15 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from GD file or URL */
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
PHP_FUNCTION(imagecreatefromgd)
{
Whitespace
2001-08-12 00:39:07 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD, "GD", gdImageCreateFromGd, gdImageCreateFromGdCtx);
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from GD2 file or URL */
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
PHP_FUNCTION(imagecreatefromgd2)
{
Whitespace
2001-08-12 00:39:07 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD2, "GD2", gdImageCreateFromGd2, gdImageCreateFromGd2Ctx);
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from a given part of GD2 file or URL */
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
PHP_FUNCTION(imagecreatefromgd2part)
{
Whitespace
2001-08-12 00:39:07 +08:00
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD2PART, "GD2", gdImageCreateFromGd2Part, gdImageCreateFromGd2PartCtx);
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
}
/* }}} */
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_BMP
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from BMP file or URL */
Implement #69606: Support BMPs (added in GD 2.1.0) We add PHP bindings for libgd's features to read and write BMP files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these.
2016-07-24 20:14:57 +08:00
PHP_FUNCTION(imagecreatefrombmp)
{
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_BMP, "BMP", gdImageCreateFromBmp, gdImageCreateFromBmpCtx);
}
/* }}} */
#endif
Fix [-Wundef] warning in GD extension
2020-05-20 23:35:42 +08:00
#ifdef HAVE_GD_TGA
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Create a new image from TGA file or URL */
Support TGA reading We add PHP bindings for libgd's features to read TGA files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these. Since TGA has no easily recognizable file signature, we don't add TGA support for imagecreatefromstring() or getimagesize() and friends.
2019-06-21 05:40:51 +08:00
PHP_FUNCTION(imagecreatefromtga)
{
_php_image_create_from(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_TGA, "TGA", gdImageCreateFromTga, gdImageCreateFromTgaCtx);
}
/* }}} */
#endif
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ _php_image_output */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
static void _php_image_output(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)())
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *imgind;
char *file = NULL;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long quality = 0, type = 0;
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
gdImagePtr im;
- Fixed typo in _php_image_output (s/fp/tmp/) causing segfault. - Fixed bug when calling imagejpeg() with 3 arguments, the second one empty, introduced yesterday. - Nuked even more code.
2000-06-08 07:04:39 +08:00
char *fn = NULL;
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
FILE *fp;
's' works with size_t round 3
2014-08-28 01:25:28 +08:00
size_t file_len = 0;
int argc = ZEND_NUM_ARGS();
Remove unused variables
2019-03-08 20:23:07 +08:00
int q = -1, t = 1;
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
Syncronize bundled GD library with latest GD (2.0.11).
2003-01-18 02:34:07 +08:00
/* The quality parameter for gd2 stands for chunk size */
- Commited a patch that adds support for converting Images to WBMP format. (Thanx to Denis Gasparin <denis@editnet.it>) @- Added support for converting images from JPG/PNG on the fly with the GD @ extension, which is usefull for creating dynamic WAP-sites (Derick)
2001-01-24 17:24:26 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(argc, "O|pll", &imgind, gd_image_ce, &file, &file_len, &quality, &type) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
}
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(imgind);
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
- Fixed typo in _php_image_output (s/fp/tmp/) causing segfault. - Fixed bug when calling imagejpeg() with 3 arguments, the second one empty, introduced yesterday. - Nuked even more code.
2000-06-08 07:04:39 +08:00
if (argc > 1) {
- New parameter parsing API
2008-06-22 06:07:53 +08:00
fn = file;
Fix #73157: imagegd2() ignores 3rd param if 4 are given We must initialize `q` for *more* than three parameters, too.
2016-09-24 05:23:45 +08:00
if (argc >= 3) {
- New parameter parsing API
2008-06-22 06:07:53 +08:00
q = quality;
Fix #73157: imagegd2() ignores 3rd param if 4 are given We must initialize `q` for *more* than three parameters, too.
2016-09-24 05:23:45 +08:00
if (argc == 4) {
t = type;
}
Syncronize bundled GD library with latest GD (2.0.11).
2003-01-18 02:34:07 +08:00
}
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
}
- New parameter parsing API
2008-06-22 06:07:53 +08:00
if (argc >= 2 && file_len) {
MFH: - Added missing safe-mode checks # Added by replacing the existing open_basedir checks with a macro # Also, the filename passed might be null, etc. so it's not very good # idea to pass to php_error_docref() (catch by Ilia)
2005-11-02 01:05:09 +08:00
PHP_GD_CHECK_OPEN_BASEDIR(fn, "Invalid filename");
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
- Change macros from V_ to VCWD_ because of AIX name clash
2001-04-30 20:45:02 +08:00
fp = VCWD_FOPEN(fn, "wb");
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
if (!fp) {
Promote warnings to exceptions in ext/gd Closes GH-6023
2020-08-20 05:27:53 +08:00
php_error_docref(NULL, E_WARNING, "Unable to open \"%s\" for writing", fn);
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
RETURN_FALSE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
CS fix
2003-03-20 09:17:05 +08:00
switch (image_type) {
Fix imagegd crashes when used with truecolor image (from jpeg,png, or imagecreatetruecolor) may we add parameters to imagegd to let user specify the palette size and dither (set to 256 and true) ?
2002-12-04 10:37:21 +08:00
case PHP_GDIMG_TYPE_GD:
(*func_p)(im, fp);
break;
MFH: fix #41442 (imagegd2() under output control)
2007-05-22 18:22:49 +08:00
case PHP_GDIMG_TYPE_GD2:
if (q == -1) {
q = 128;
}
(*func_p)(im, fp, q, t);
break;
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
EMPTY_SWITCH_DEFAULT_CASE()
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
}
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
fflush(fp);
fclose(fp);
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
} else {
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
int b;
FILE *tmp;
char buf[4096];
Use zend_string* instead of char* for opened_patch handling. Avoid reallocations and improve string reuse.
2015-03-04 07:05:28 +08:00
zend_string *path;
- Fixed typo in _php_image_output (s/fp/tmp/) causing segfault. - Fixed bug when calling imagejpeg() with 3 arguments, the second one empty, introduced yesterday. - Nuked even more code.
2000-06-08 07:04:39 +08:00
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
tmp = php_open_temporary_file(NULL, NULL, &path);
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
if (tmp == NULL) {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "Unable to open temporary file");
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
RETURN_FALSE;
}
- Commited a patch that adds support for converting Images to WBMP format. (Thanx to Denis Gasparin <denis@editnet.it>) @- Added support for converting images from JPG/PNG on the fly with the GD @ extension, which is usefull for creating dynamic WAP-sites (Derick)
2001-01-24 17:24:26 +08:00
WS & CS fixes
2003-03-20 09:12:57 +08:00
switch (image_type) {
WS fixes.
2002-12-05 00:29:48 +08:00
case PHP_GDIMG_TYPE_GD:
(*func_p)(im, tmp);
break;
MFH: fix #41442 (imagegd2() under output control)
2007-05-22 18:22:49 +08:00
case PHP_GDIMG_TYPE_GD2:
if (q == -1) {
q = 128;
}
(*func_p)(im, tmp, q, t);
break;
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
EMPTY_SWITCH_DEFAULT_CASE()
@- Fixed some modules to allow using output-buffering. (Thies) i nuked all unneded calls to php_header() - i'm not too sure how we do handle HEAD Requests as they were only detected via php_header(). but calling php_header from a module makes output-buffering unusable. NOTICE: there is some EBSDIC stuff in gd.c - i think it's obsolete.
2001-02-15 22:49:01 +08:00
}
fseek(tmp, 0, SEEK_SET);
while ((b = fread(buf, 1, sizeof(buf), tmp)) > 0) {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_write(buf, b);
@- Fixed some modules to allow using output-buffering. (Thies) i nuked all unneded calls to php_header() - i'm not too sure how we do handle HEAD Requests as they were only detected via php_header(). but calling php_header from a module makes output-buffering unusable. NOTICE: there is some EBSDIC stuff in gd.c - i think it's obsolete.
2001-02-15 22:49:01 +08:00
}
ws fix
2002-09-13 05:42:33 +08:00
fclose(tmp);
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 09:05:24 +08:00
VCWD_UNLINK((const char *)ZSTR_VAL(path)); /* make sure that the temporary file is removed */
Use zend_string_release_ex() instread of zend_string_release() in places, where we sure about string persistence.
2018-05-28 21:27:12 +08:00
zend_string_release_ex(path, 0);
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
}
ws fix
2002-09-13 05:42:33 +08:00
RETURN_TRUE;
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Output XBM image to browser or file */
Add ImageXBM
2003-06-16 04:00:08 +08:00
PHP_FUNCTION(imagexbm)
{
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
zval *imgind;
char *file = NULL;
size_t file_len = 0;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
zend_long foreground_color;
zend_bool foreground_color_is_null = 1;
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
gdImagePtr im;
int i;
gdIOCtx *ctx = NULL;
php_stream *stream;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Op!|l!", &imgind, gd_image_ce, &file, &file_len, &foreground_color, &foreground_color_is_null) == FAILURE) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
RETURN_THROWS();
}
im = php_gd_libgdimageptr_from_zval_p(imgind);
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (file != NULL) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
stream = php_stream_open_wrapper(file, "wb", REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL);
if (stream == NULL) {
RETURN_FALSE;
}
ctx = create_stream_context(stream, 1);
} else {
ctx = create_output_context();
}
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (foreground_color_is_null) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
for (i=0; i < gdImageColorsTotal(im); i++) {
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (!gdImageRed(im, i) && !gdImageGreen(im, i) && !gdImageBlue(im, i)) {
break;
}
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
}
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
foreground_color = i;
}
gdImageXbmCtx(im, file ? file : "", (int) foreground_color, ctx);
ctx->gd_free(ctx);
RETURN_TRUE;
Add ImageXBM
2003-06-16 04:00:08 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Output GIF image to browser or file */
- Fixed typo in _php_image_output (s/fp/tmp/) causing segfault. - Fixed bug when calling imagejpeg() with 3 arguments, the second one empty, introduced yesterday. - Nuked even more code.
2000-06-08 07:04:39 +08:00
PHP_FUNCTION(imagegif)
{
Allow usage of GD contexts and not tempfiles in output functions
2001-02-01 23:40:35 +08:00
_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GIF, "GIF", gdImageGifCtx);
- Fixed typo in _php_image_output (s/fp/tmp/) causing segfault. - Fixed bug when calling imagejpeg() with 3 arguments, the second one empty, introduced yesterday. - Nuked even more code.
2000-06-08 07:04:39 +08:00
}
/* }}} */
- Make functions not exist when they are not available. This means you can now safely do function_exists() on all gd functions.
2002-06-25 03:31:44 +08:00
#ifdef HAVE_GD_PNG
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Output PNG image to browser or file */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
PHP_FUNCTION(imagepng)
{
lucky that the name is not used, fix name of encoder
2013-04-11 12:42:38 +08:00
_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_PNG, "PNG", gdImagePngCtxEx);
Add PNG support. Tested with gd 1.7.3.
1999-10-17 22:57:49 +08:00
}
/* }}} */
- Make functions not exist when they are not available. This means you can now safely do function_exists() on all gd functions.
2002-06-25 03:31:44 +08:00
#endif /* HAVE_GD_PNG */
Add PNG support. Tested with gd 1.7.3.
1999-10-17 22:57:49 +08:00
- initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g)
2010-10-05 06:30:35 +08:00
#ifdef HAVE_GD_WEBP
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Output WEBP image to browser or file */
- initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g)
2010-10-05 06:30:35 +08:00
PHP_FUNCTION(imagewebp)
{
lucky that the name is not used, fix name of encoder
2013-04-11 12:42:38 +08:00
_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_WEBP, "WEBP", gdImageWebpCtx);
- initial webp support, rely on libpx, final version will be either w/o dep or using libwebp (to be released by g)
2010-10-05 06:30:35 +08:00
}
/* }}} */
#endif /* HAVE_GD_WEBP */
- Make functions not exist when they are not available. This means you can now safely do function_exists() on all gd functions.
2002-06-25 03:31:44 +08:00
#ifdef HAVE_GD_JPG
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Output JPEG image to browser or file */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
PHP_FUNCTION(imagejpeg)
gd-jpeg support @Add GD-JPEG Support (Rasmus)
2000-03-13 13:58:50 +08:00
{
lucky that the name is not used, fix name of encoder
2013-04-11 12:42:38 +08:00
_php_image_output_ctx(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_JPG, "JPEG", gdImageJpegCtx);
gd-jpeg support @Add GD-JPEG Support (Rasmus)
2000-03-13 13:58:50 +08:00
}
/* }}} */
- Make functions not exist when they are not available. This means you can now safely do function_exists() on all gd functions.
2002-06-25 03:31:44 +08:00
#endif /* HAVE_GD_JPG */
gd-jpeg support @Add GD-JPEG Support (Rasmus)
2000-03-13 13:58:50 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Output WBMP image to browser or file */
- Added functions imagewbmp(), imagecreatefromxbm(). - Nuked a lot of duplicate code. @- Added function imagecreatefromxbm(). (Jouni) @- Added function imagewbmp(). (Jouni, based on patch from Rune Nordbøe Skillingstad) # Note: calling imagejpeg() with 3 arguments, the second one empty, # is currently broken. Fill fix tomorrow evening unless someone beats me. # Must have some sleep now, brains stopped working...
2000-06-07 08:37:49 +08:00
PHP_FUNCTION(imagewbmp)
gd-jpeg support @Add GD-JPEG Support (Rasmus)
2000-03-13 13:58:50 +08:00
{
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
zval *imgind;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
zend_long foreground_color;
zend_long foreground_color_is_null = 1;
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
gdImagePtr im;
int i;
gdIOCtx *ctx = NULL;
zval *to_zval = NULL;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|z!l!", &imgind, gd_image_ce, &to_zval, &foreground_color) == FAILURE) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
RETURN_THROWS();
}
im = php_gd_libgdimageptr_from_zval_p(imgind);
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (to_zval != NULL) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
ctx = create_stream_context_from_zval(to_zval);
if (!ctx) {
RETURN_FALSE;
}
} else {
ctx = create_output_context();
}
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (foreground_color_is_null) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
for (i=0; i < gdImageColorsTotal(im); i++) {
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (!gdImageRed(im, i) && !gdImageGreen(im, i) && !gdImageBlue(im, i)) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
break;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
}
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
}
foreground_color = i;
}
gdImageWBMPCtx(im, foreground_color, ctx);
ctx->gd_free(ctx);
RETURN_TRUE;
gd-jpeg support @Add GD-JPEG Support (Rasmus)
2000-03-13 13:58:50 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Output GD image to browser or file */
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
PHP_FUNCTION(imagegd)
{
_php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD, "GD", gdImageGd);
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Output GD2 image to browser or file */
Added missing GD/GD2 image handling functions.
2001-05-29 15:46:07 +08:00
PHP_FUNCTION(imagegd2)
{
_php_image_output(INTERNAL_FUNCTION_PARAM_PASSTHRU, PHP_GDIMG_TYPE_GD2, "GD2", gdImageGd2);
}
/* }}} */
Implement #69606: Support BMPs (added in GD 2.1.0) We add PHP bindings for libgd's features to read and write BMP files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these.
2016-07-24 20:14:57 +08:00
#ifdef HAVE_GD_BMP
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Output BMP image to browser or file */
Implement #69606: Support BMPs (added in GD 2.1.0) We add PHP bindings for libgd's features to read and write BMP files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these.
2016-07-24 20:14:57 +08:00
PHP_FUNCTION(imagebmp)
{
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
zval *imgind;
zend_bool compressed = 1;
gdImagePtr im;
gdIOCtx *ctx = NULL;
zval *to_zval = NULL;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|z!b", &imgind, gd_image_ce, &to_zval, &compressed) == FAILURE) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
RETURN_THROWS();
}
im = php_gd_libgdimageptr_from_zval_p(imgind);
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (to_zval != NULL) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
ctx = create_stream_context_from_zval(to_zval);
if (!ctx) {
RETURN_FALSE;
}
} else {
ctx = create_output_context();
}
gdImageBmpCtx(im, ctx, (int) compressed);
ctx->gd_free(ctx);
RETURN_TRUE;
Implement #69606: Support BMPs (added in GD 2.1.0) We add PHP bindings for libgd's features to read and write BMP files, which are available as of libgd 2.1.0. As PHP's bundled libgd doesn't yet include the respective features of the external libgd, we add these.
2016-07-24 20:14:57 +08:00
}
/* }}} */
#endif
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Destroy an image - No effect as of PHP 8.0 */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagedestroy)
{
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
/* This function used to free the resource, as resources are no longer used, it does nothing */
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &IM, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Allocate a color for an image */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolorallocate)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long red, green, blue;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
- return false on error
2006-01-17 23:44:12 +08:00
int ct = (-1);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olll", &IM, gd_image_ce, &red, &green, &blue) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
imagecolorallocate(): Check that RGB components are in-range Instead of letting them bleed over into other components.
2019-06-20 16:09:54 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
ct = gdImageColorAllocate(im, red, green, blue);
- return false on error
2006-01-17 23:44:12 +08:00
if (ct < 0) {
RETURN_FALSE;
}
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(ct);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Copy the palette from the src image onto the dst image */
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
PHP_FUNCTION(imagepalettecopy)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *dstim, *srcim;
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
gdImagePtr dst, src;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OO", &dstim, gd_image_ce, &srcim, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
src = php_gd_libgdimageptr_from_zval_p(srcim);
dst = php_gd_libgdimageptr_from_zval_p(dstim);
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
gdImagePaletteCopy(dst, src);
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get the index of the color of a pixel */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolorat)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x, y;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Implement FAST_ZPP support for imagecolorat() and imagesetpixel() These functions may be used in tight loops to do image manipulation in userland. Using FAST_ZPP is supposed to bring considerable performance improvements in this case; we've been able to measure up to 25%.
2016-09-03 01:06:26 +08:00
ZEND_PARSE_PARAMETERS_START(3, 3)
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce)
Implement FAST_ZPP support for imagecolorat() and imagesetpixel() These functions may be used in tight loops to do image manipulation in userland. Using FAST_ZPP is supposed to bring considerable performance improvements in this case; we've been able to measure up to 25%.
2016-09-03 01:06:26 +08:00
Z_PARAM_LONG(x)
Z_PARAM_LONG(y)
ZEND_PARSE_PARAMETERS_END();
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
CS fix
2003-03-20 09:17:05 +08:00
if (gdImageTrueColor(im)) {
- New parameter parsing API
2008-06-22 06:07:53 +08:00
if (im->tpixels && gdImageBoundsSafe(im, x, y)) {
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageTrueColorPixel(im, x, y));
# More low-oxygen plane hacking Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor images. @- Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor @ images. (Rasmus)
2001-11-10 23:06:09 +08:00
} else {
Added ZEND_ATTRIBUTE_FORMAT to some middind functions. "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.
2016-06-21 21:00:37 +08:00
php_error_docref(NULL, E_NOTICE, "" ZEND_LONG_FMT "," ZEND_LONG_FMT " is out of bounds", x, y);
# More low-oxygen plane hacking Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor images. @- Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor @ images. (Rasmus)
2001-11-10 23:06:09 +08:00
RETURN_FALSE;
}
} else {
- New parameter parsing API
2008-06-22 06:07:53 +08:00
if (im->pixels && gdImageBoundsSafe(im, x, y)) {
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(im->pixels[y][x]);
# More low-oxygen plane hacking Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor images. @- Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor @ images. (Rasmus)
2001-11-10 23:06:09 +08:00
} else {
Added ZEND_ATTRIBUTE_FORMAT to some middind functions. "%p" replaced by ZEND_LONG_FMT to avoid compilation warnings. Fixed most incorrect use cases of format specifiers.
2016-06-21 21:00:37 +08:00
php_error_docref(NULL, E_NOTICE, "" ZEND_LONG_FMT "," ZEND_LONG_FMT " is out of bounds", x, y);
# More low-oxygen plane hacking Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor images. @- Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor @ images. (Rasmus)
2001-11-10 23:06:09 +08:00
RETURN_FALSE;
}
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get the index of the closest color to the specified color */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolorclosest)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long red, green, blue;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olll", &IM, gd_image_ce, &red, &green, &blue) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
Extend color component range checks We also check for alpha components to be within range, and we add yet missing range checks for other functions as well.
2019-08-11 21:00:23 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageColorClosest(im, red, green, blue));
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get the index of the color which has the hue, white and blackness nearest to the given color */
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
PHP_FUNCTION(imagecolorclosesthwb)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long red, green, blue;
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
gdImagePtr im;
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olll", &IM, gd_image_ce, &red, &green, &blue) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
Extend color component range checks We also check for alpha components to be within range, and we add yet missing range checks for other functions as well.
2019-08-11 21:00:23 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageColorClosestHWB(im, red, green, blue));
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ De-allocate a color for an image */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolordeallocate)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long index;
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
int col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &IM, gd_image_ce, &index) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Applied imagedeallocate() fix
2002-11-23 07:25:14 +08:00
/* We can return right away for a truecolor image as deallocating colours is meaningless here */
if (gdImageTrueColor(im)) {
RETURN_TRUE;
}
- New parameter parsing API
2008-06-22 06:07:53 +08:00
col = index;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
if (col >= 0 && col < gdImageColorsTotal(im)) {
gdImageColorDeallocate(im, col);
RETURN_TRUE;
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
} else {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(2, "must be between 0 and %d", gdImageColorsTotal(im));
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
}
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get the index of the specified color or its closest possible alternative */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolorresolve)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long red, green, blue;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olll", &IM, gd_image_ce, &red, &green, &blue) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
Extend color component range checks We also check for alpha components to be within range, and we add yet missing range checks for other functions as well.
2019-08-11 21:00:23 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageColorResolve(im, red, green, blue));
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get the index of the specified color */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolorexact)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long red, green, blue;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olll", &IM, gd_image_ce, &red, &green, &blue) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
Extend color component range checks We also check for alpha components to be within range, and we add yet missing range checks for other functions as well.
2019-08-11 21:00:23 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageColorExact(im, red, green, blue));
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Set the color for the specified palette index */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolorset)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long color, red, green, blue, alpha = 0;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
int col;
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ollll|l", &IM, gd_image_ce, &color, &red, &green, &blue, &alpha) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
CHECK_RGBA_RANGE(red, Red, 2);
CHECK_RGBA_RANGE(green, Green, 3);
CHECK_RGBA_RANGE(blue, Blue, 4);
Extend color component range checks We also check for alpha components to be within range, and we add yet missing range checks for other functions as well.
2019-08-11 21:00:23 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
col = color;
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
if (col >= 0 && col < gdImageColorsTotal(im)) {
- New parameter parsing API
2008-06-22 06:07:53 +08:00
im->red[col] = red;
im->green[col] = green;
im->blue[col] = blue;
- #51793, Add alpha argument to imagecolorset
2010-05-18 20:38:57 +08:00
im->alpha[col] = alpha;
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
} else {
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_FALSE;
}
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get the colors for an index */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolorsforindex)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long index;
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
int col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &IM, gd_image_ce, &index) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- New parameter parsing API
2008-06-22 06:07:53 +08:00
col = index;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
# More low-oxygen plane hacking Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor images. @- Fix ImageColorsForIndex() and ImageColorAt() to work for TrueColor @ images. (Rasmus)
2001-11-10 23:06:09 +08:00
if ((col >= 0 && gdImageTrueColor(im)) || (!gdImageTrueColor(im) && col >= 0 && col < gdImageColorsTotal(im))) {
Removed pointless checks of array_init() return value.
2003-01-18 05:37:56 +08:00
array_init(return_value);
master renames phase 1
2014-08-26 01:24:55 +08:00
add_assoc_long(return_value,"red", gdImageRed(im,col));
add_assoc_long(return_value,"green", gdImageGreen(im,col));
add_assoc_long(return_value,"blue", gdImageBlue(im,col));
add_assoc_long(return_value,"alpha", gdImageAlpha(im,col));
Remove GD 1.0 support, still need to adjust the configure scripts to correctly check for a newer version
2008-07-18 09:51:49 +08:00
} else {
Promote warnings to exceptions in ext/gd Closes GH-6023
2020-08-20 05:27:53 +08:00
zend_argument_value_error(2, "is out of range");
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Apply a gamma correction to a GD image */
@-Port imagegammacorrect from PHP3 to PHP4. (Sterling) #Also two little stylistic changes in gd.c
2000-05-14 23:25:13 +08:00
PHP_FUNCTION(imagegammacorrect)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
@-Port imagegammacorrect from PHP3 to PHP4. (Sterling) #Also two little stylistic changes in gd.c
2000-05-14 23:25:13 +08:00
gdImagePtr im;
int i;
Refactor imagegammacorrect() We apply the law `(b**r)**s == b**(r*s)` which holds for all non-negative b and positive r,s, so a single pow() suffices. Furthermore, we precompute the gamma, so the refactored code is simpler and faster.
2016-09-25 15:47:23 +08:00
double input, output, gamma;
@-Port imagegammacorrect from PHP3 to PHP4. (Sterling) #Also two little stylistic changes in gd.c
2000-05-14 23:25:13 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Odd", &IM, gd_image_ce, &input, &output) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
@-Port imagegammacorrect from PHP3 to PHP4. (Sterling) #Also two little stylistic changes in gd.c
2000-05-14 23:25:13 +08:00
}
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
if (input <= 0.0) {
zend_argument_value_error(2, "must be greater than 0");
RETURN_THROWS();
}
if (output <= 0.0) {
zend_argument_value_error(3, "must be greater than 0");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
Fix bug #72730 - imagegammacorrect allows arbitrary write access (cherry picked from commit 047fe0ed03093a496691d376fcf51a7e2f1d04b0) Conflicts: ext/gd/gd.c
2016-08-10 15:14:58 +08:00
}
Refactor imagegammacorrect() We apply the law `(b**r)**s == b**(r*s)` which holds for all non-negative b and positive r,s, so a single pow() suffices. Furthermore, we precompute the gamma, so the refactored code is simpler and faster.
2016-09-25 15:47:23 +08:00
gamma = input / output;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
@-Port imagegammacorrect from PHP3 to PHP4. (Sterling) #Also two little stylistic changes in gd.c
2000-05-14 23:25:13 +08:00
Made imagegammacorrect() work on true-color images. Added support for new ImageStringFTEx function (due in GD 2.0.2).
2001-07-06 05:23:28 +08:00
if (gdImageTrueColor(im)) {
int x, y, c;
for (y = 0; y < gdImageSY(im); y++) {
for (x = 0; x < gdImageSX(im); x++) {
c = gdImageGetPixel(im, x, y);
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
gdImageSetPixel(im, x, y,
Fixed bug #61221 - imagegammacorrect function loses alpha channel When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost.
2015-06-06 20:57:38 +08:00
gdTrueColorAlpha(
Refactor imagegammacorrect() We apply the law `(b**r)**s == b**(r*s)` which holds for all non-negative b and positive r,s, so a single pow() suffices. Furthermore, we precompute the gamma, so the refactored code is simpler and faster.
2016-09-25 15:47:23 +08:00
(int) ((pow((gdTrueColorGetRed(c) / 255.0), gamma) * 255) + .5),
(int) ((pow((gdTrueColorGetGreen(c) / 255.0), gamma) * 255) + .5),
(int) ((pow((gdTrueColorGetBlue(c) / 255.0), gamma) * 255) + .5),
Fixed bug #61221 - imagegammacorrect function loses alpha channel When applying imagegammacorrect() the alpha channel is now fully retained, instead of being completely lost.
2015-06-06 20:57:38 +08:00
gdTrueColorGetAlpha(c)
WS & CS fixes
2003-03-20 09:12:57 +08:00
)
);
Made imagegammacorrect() work on true-color images. Added support for new ImageStringFTEx function (due in GD 2.0.2).
2001-07-06 05:23:28 +08:00
}
}
RETURN_TRUE;
}
Remove GD 1.0 support, still need to adjust the configure scripts to correctly check for a newer version
2008-07-18 09:51:49 +08:00
@-Port imagegammacorrect from PHP3 to PHP4. (Sterling) #Also two little stylistic changes in gd.c
2000-05-14 23:25:13 +08:00
for (i = 0; i < gdImageColorsTotal(im); i++) {
Refactor imagegammacorrect() We apply the law `(b**r)**s == b**(r*s)` which holds for all non-negative b and positive r,s, so a single pow() suffices. Furthermore, we precompute the gamma, so the refactored code is simpler and faster.
2016-09-25 15:47:23 +08:00
im->red[i] = (int)((pow((im->red[i] / 255.0), gamma) * 255) + .5);
im->green[i] = (int)((pow((im->green[i] / 255.0), gamma) * 255) + .5);
im->blue[i] = (int)((pow((im->blue[i] / 255.0), gamma) * 255) + .5);
@-Port imagegammacorrect from PHP3 to PHP4. (Sterling) #Also two little stylistic changes in gd.c
2000-05-14 23:25:13 +08:00
}
RETURN_TRUE;
}
added a missing proto
2000-05-24 06:28:07 +08:00
/* }}} */
@-Port imagegammacorrect from PHP3 to PHP4. (Sterling) #Also two little stylistic changes in gd.c
2000-05-14 23:25:13 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Set a single pixel */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagesetpixel)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x, y, col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Implement FAST_ZPP support for imagecolorat() and imagesetpixel() These functions may be used in tight loops to do image manipulation in userland. Using FAST_ZPP is supposed to bring considerable performance improvements in this case; we've been able to measure up to 25%.
2016-09-03 01:06:26 +08:00
ZEND_PARSE_PARAMETERS_START(4, 4)
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
Z_PARAM_OBJECT_OF_CLASS(IM, gd_image_ce)
Implement FAST_ZPP support for imagecolorat() and imagesetpixel() These functions may be used in tight loops to do image manipulation in userland. Using FAST_ZPP is supposed to bring considerable performance improvements in this case; we've been able to measure up to 25%.
2016-09-03 01:06:26 +08:00
Z_PARAM_LONG(x)
Z_PARAM_LONG(y)
Z_PARAM_LONG(col)
ZEND_PARSE_PARAMETERS_END();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageSetPixel(im, x, y, col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a line */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imageline)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x1, y1, x2, y2, col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olllll", &IM, gd_image_ce, &x1, &y1, &x2, &y2, &col) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Switch to libgd anti-aliased drawing API Instead of rolling our own in the bundled libgd, we use libgd's anti-aliased drawing API. This way imageantialias() is also available, when built against a system libgd.
2016-10-02 18:47:22 +08:00
if (im->AA) {
gdImageSetAntiAliased(im, col);
col = gdAntiAliased;
WS & CS fixes
2003-03-20 09:12:57 +08:00
}
Switch to libgd anti-aliased drawing API Instead of rolling our own in the bundled libgd, we use libgd's anti-aliased drawing API. This way imageantialias() is also available, when built against a system libgd.
2016-10-02 18:47:22 +08:00
gdImageLine(im, x1, y1, x2, y2, col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a dashed line */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagedashedline)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x1, y1, x2, y2, col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olllll", &IM, gd_image_ce, &x1, &y1, &x2, &y2, &col) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageDashedLine(im, x1, y1, x2, y2, col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a rectangle */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagerectangle)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x1, y1, x2, y2, col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olllll", &IM, gd_image_ce, &x1, &y1, &x2, &y2, &col) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageRectangle(im, x1, y1, x2, y2, col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a filled rectangle */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagefilledrectangle)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x1, y1, x2, y2, col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olllll", &IM, gd_image_ce, &x1, &y1, &x2, &y2, &col) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageFilledRectangle(im, x1, y1, x2, y2, col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a partial ellipse */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagearc)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long cx, cy, w, h, ST, E, col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Whitespace
2001-08-12 00:39:07 +08:00
int e, st;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olllllll", &IM, gd_image_ce, &cx, &cy, &w, &h, &ST, &E, &col) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
e = E;
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (e < 0) {
e %= 360;
}
Last bit of CS fixes.
2003-12-29 05:08:46 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
st = ST;
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (st < 0) {
st %= 360;
}
Last bit of CS fixes.
2003-12-29 05:08:46 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageArc(im, cx, cy, w, h, st, e, col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw an ellipse */
forgot to move imeageellipse out of #ifdef HAVE_LIBGD20
2002-07-28 18:00:37 +08:00
PHP_FUNCTION(imageellipse)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long cx, cy, w, h, color;
forgot to move imeageellipse out of #ifdef HAVE_LIBGD20
2002-07-28 18:00:37 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olllll", &IM, gd_image_ce, &cx, &cy, &w, &h, &color) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
forgot to move imeageellipse out of #ifdef HAVE_LIBGD20
2002-07-28 18:00:37 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
forgot to move imeageellipse out of #ifdef HAVE_LIBGD20
2002-07-28 18:00:37 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageEllipse(im, cx, cy, w, h, color);
forgot to move imeageellipse out of #ifdef HAVE_LIBGD20
2002-07-28 18:00:37 +08:00
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Flood fill to specific color */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagefilltoborder)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x, y, border, col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ollll", &IM, gd_image_ce, &x, &y, &border, &col) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageFillToBorder(im, x, y, border, col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Flood fill */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagefill)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long x, y, col;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olll", &IM, gd_image_ce, &x, &y, &col) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageFill(im, x, y, col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Find out the number of colors in an image's palette */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolorstotal)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
- ws
2009-05-26 21:57:07 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &IM, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageColorsTotal(im));
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Define a color as transparent */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imagecolortransparent)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long COL = 0;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
zend_bool COL_IS_NULL = 1;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|l!", &IM, gd_image_ce, &COL, &COL_IS_NULL) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (!COL_IS_NULL) {
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageColorTransparent(im, COL);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageGetTransparent(im));
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Enable or disable interlace */
Fix bug #1807 (requires libzend update)
1999-07-24 00:03:18 +08:00
PHP_FUNCTION(imageinterlace)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long INT = 0;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
zend_bool INT_IS_NULL = 1;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|l!", &IM, gd_image_ce, &INT, &INT_IS_NULL) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (!INT_IS_NULL) {
- New parameter parsing API
2008-06-22 06:07:53 +08:00
gdImageInterlace(im, INT);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageGetInterlaced(im));
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* {{{ php_imagepolygon
Implement request #33066: Add GD Image Function gdImageOpenPolygon() gdImageOpenPolygon() has been introduced with líbgd 2.0.29, so we finally add a PHP binding for it, and port the respective libgd functionality to PHP's bundled libgd.
2016-10-03 02:27:58 +08:00
arg = -1 open polygon
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
arg = 0 normal polygon
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
arg = 1 filled polygon */
/* im, points, num_points, col */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
static void php_imagepolygon(INTERNAL_FUNCTION_PARAMETERS, int filled)
Removed some ws and couple of useless comments.
2001-06-07 21:17:02 +08:00
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM, *POINTS;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long NPOINTS, COL;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
zend_bool COL_IS_NULL = 1;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *var = NULL;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
gdPointPtr points;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
int npoints, col, nelem, i;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oal|l!", &IM, gd_image_ce, &POINTS, &NPOINTS, &COL, &COL_IS_NULL) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (COL_IS_NULL) {
Make the $num_points parameter of php_imagepolygon optional That parameter is mostly useless in practise, and likely has been directly ported from the underlying `gdImagePolygon()` and friends, which require that parameter since the number of elements of the point array would otherwise be unknown. Typical usages of `imagepolygon()`, `imageopenpolygon()` and `imagefilledpolygon()` pass `count($points)/2` or hard-code this value as literal. Since explicitly specifying this parameter is annoying and error-prone, we offer the possibility to omit it, in which case the `$points` array must have an even number of elements, and the number of points is calculated as `count($points)/2`.
2019-11-14 16:46:43 +08:00
COL = NPOINTS;
NPOINTS = zend_hash_num_elements(Z_ARRVAL_P(POINTS));
if (NPOINTS % 2 != 0) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(2, "must have an even number of elements");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
Make the $num_points parameter of php_imagepolygon optional That parameter is mostly useless in practise, and likely has been directly ported from the underlying `gdImagePolygon()` and friends, which require that parameter since the number of elements of the point array would otherwise be unknown. Typical usages of `imagepolygon()`, `imageopenpolygon()` and `imagefilledpolygon()` pass `count($points)/2` or hard-code this value as literal. Since explicitly specifying this parameter is annoying and error-prone, we offer the possibility to omit it, in which case the `$points` array must have an even number of elements, and the number of points is calculated as `count($points)/2`.
2019-11-14 16:46:43 +08:00
}
NPOINTS /= 2;
}
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
npoints = NPOINTS;
col = COL;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
nelem = zend_hash_num_elements(Z_ARRVAL_P(POINTS));
Fix #55005: imagepolygon num_points requirement We actually have to check `$num_points` instead of `2*count($points)`, because the latter may be greater than the former, but not all elements of `$points` are guaranteed to be used. This allowed to pass arrays with excess elements to draw polygons with less than three vertices. While the current implementation of `gdImagePolygon()` and friends would allow us to draw monogons and digons, we don't allow that anymore, because the respective drawing primitives work slightly different (e.g. drawing lines support anti-aliasing, but drawing general polygons does not). To minimize the BC break, we do not fix this longstanding issue for PHP 7, but target PHP 8 only.
2019-11-02 20:53:09 +08:00
if (npoints < 3) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(3, "must be greater than or equal to 3");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
imagepolygon() and imagefilledpolygon() does not allow negative number of points causing invalid allocation
2010-01-14 19:11:56 +08:00
}
Warnings become errors for imagepolygon et al
2019-09-04 07:46:41 +08:00
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
if (nelem < npoints * 2) {
Prefer ValueError over Error in GD Cf. <https://github.com/php/php-src/pull/4682>.
2019-09-10 18:36:57 +08:00
zend_value_error("Trying to use %d points in array with only %d points", npoints, nelem/2);
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
emalloc -> safe_emalloc
2003-08-12 08:58:52 +08:00
points = (gdPointPtr) safe_emalloc(npoints, sizeof(gdPoint), 0);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
for (i = 0; i < npoints; i++) {
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
if ((var = zend_hash_index_find(Z_ARRVAL_P(POINTS), (i * 2))) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
points[i].x = zval_get_long(var);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
if ((var = zend_hash_index_find(Z_ARRVAL_P(POINTS), (i * 2) + 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
points[i].y = zval_get_long(var);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
}
Switch to libgd anti-aliased drawing API Instead of rolling our own in the bundled libgd, we use libgd's anti-aliased drawing API. This way imageantialias() is also available, when built against a system libgd.
2016-10-02 18:47:22 +08:00
if (im->AA) {
gdImageSetAntiAliased(im, col);
col = gdAntiAliased;
}
Implement request #33066: Add GD Image Function gdImageOpenPolygon() gdImageOpenPolygon() has been introduced with líbgd 2.0.29, so we finally add a PHP binding for it, and port the respective libgd functionality to PHP's bundled libgd.
2016-10-03 02:27:58 +08:00
switch (filled) {
case -1:
gdImageOpenPolygon(im, points, npoints, col);
break;
case 0:
gdImagePolygon(im, points, npoints, col);
break;
case 1:
gdImageFilledPolygon(im, points, npoints, col);
break;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Dynamically allocate points for ImagePolygon (Marc Pohl) @Dynamically allocate points for ImagePolygon (Marc Pohl)
2000-05-02 02:56:58 +08:00
efree(points);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a polygon */
- run ext sources through conv_proto - add necessary phpext_*_ptr
1999-05-21 18:06:25 +08:00
PHP_FUNCTION(imagepolygon)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
More cleanup...
1999-12-18 05:50:07 +08:00
php_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a polygon */
Implement request #33066: Add GD Image Function gdImageOpenPolygon() gdImageOpenPolygon() has been introduced with líbgd 2.0.29, so we finally add a PHP binding for it, and port the respective libgd functionality to PHP's bundled libgd.
2016-10-03 02:27:58 +08:00
PHP_FUNCTION(imageopenpolygon)
{
php_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, -1);
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a filled polygon */
- run ext sources through conv_proto - add necessary phpext_*_ptr
1999-05-21 18:06:25 +08:00
PHP_FUNCTION(imagefilledpolygon)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
More cleanup...
1999-12-18 05:50:07 +08:00
php_imagepolygon(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ php_find_gd_font */
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
static gdFontPtr php_find_gd_font(int size)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
gdFontPtr font;
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
switch (size) {
ws fix
2002-09-13 05:42:33 +08:00
case 1:
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
font = gdFontTiny;
break;
ws fix
2002-09-13 05:42:33 +08:00
case 2:
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
font = gdFontSmall;
break;
ws fix
2002-09-13 05:42:33 +08:00
case 3:
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
font = gdFontMediumBold;
break;
ws fix
2002-09-13 05:42:33 +08:00
case 4:
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
font = gdFontLarge;
break;
ws fix
2002-09-13 05:42:33 +08:00
case 5:
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
font = gdFontGiant;
break;
default: {
zval *zv = zend_hash_index_find(&EG(regular_list), size - 5);
if (!zv || (Z_RES_P(zv))->type != le_gd_font) {
if (size < 1) {
font = gdFontTiny;
} else {
font = gdFontGiant;
}
} else {
font = (gdFontPtr)Z_RES_P(zv)->ptr;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
}
break;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
return font;
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* {{{ php_imagefontsize
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
* arg = 0 ImageFontWidth
* arg = 1 ImageFontHeight
*/
More cleanup...
1999-12-18 05:50:07 +08:00
static void php_imagefontsize(INTERNAL_FUNCTION_PARAMETERS, int arg)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long SIZE;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdFontPtr font;
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &SIZE) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
font = php_find_gd_font(SIZE);
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(arg ? font->h : font->w);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get font width */
- run ext sources through conv_proto - add necessary phpext_*_ptr
1999-05-21 18:06:25 +08:00
PHP_FUNCTION(imagefontwidth)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
More cleanup...
1999-12-18 05:50:07 +08:00
php_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get font height */
- run ext sources through conv_proto - add necessary phpext_*_ptr
1999-05-21 18:06:25 +08:00
PHP_FUNCTION(imagefontheight)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
More cleanup...
1999-12-18 05:50:07 +08:00
php_imagefontsize(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* {{{ php_gdimagecharup
* workaround for a bug in gd 1.2 */
Killed a compile warning.
2001-08-22 16:34:04 +08:00
static void php_gdimagecharup(gdImagePtr im, gdFontPtr f, int x, int y, int c, int color)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
int cx, cy, px, py, fline;
cx = 0;
cy = 0;
WS & CS fixes
2003-03-20 09:12:57 +08:00
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
if ((c < f->offset) || (c >= (f->offset + f->nchars))) {
return;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
fline = (c - f->offset) * f->h * f->w;
for (py = y; (py > (y - f->w)); py--) {
for (px = x; (px < (x + f->h)); px++) {
if (f->data[fline + cy * f->w + cx]) {
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
gdImageSetPixel(im, px, py, color);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
cy++;
}
cy = 0;
cx++;
}
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* {{{ php_imagechar
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
* arg = 0 ImageChar
* arg = 1 ImageCharUp
* arg = 2 ImageString
* arg = 3 ImageStringUp
*/
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
static void php_imagechar(INTERNAL_FUNCTION_PARAMETERS, int mode)
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long SIZE, X, Y, COL;
- New parameter parsing API
2008-06-22 06:07:53 +08:00
char *C;
first show to make 's' work with size_t
2014-08-27 21:31:48 +08:00
size_t C_len;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
int ch = 0, col, x, y, size, i, l = 0;
Change string->str where possible; string is basic a C++ class, so gdb can't look inside variables named 'string'.
2000-02-09 06:21:43 +08:00
unsigned char *str = NULL;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdFontPtr font;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olllsl", &IM, gd_image_ce, &SIZE, &X, &Y, &C, &C_len, &COL) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
col = COL;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
if (mode < 2) {
- New parameter parsing API
2008-06-22 06:07:53 +08:00
ch = (int)((unsigned char)*C);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
} else {
- New parameter parsing API
2008-06-22 06:07:53 +08:00
str = (unsigned char *) estrndup(C, C_len);
- fix compiler warnings
2006-08-08 19:56:36 +08:00
l = strlen((char *)str);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
- New parameter parsing API
2008-06-22 06:07:53 +08:00
y = Y;
x = X;
size = SIZE;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
font = php_find_gd_font(size);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
CS fix
2003-03-20 09:17:05 +08:00
switch (mode) {
ws fix
2002-09-13 05:42:33 +08:00
case 0:
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImageChar(im, font, x, y, ch, col);
break;
ws fix
2002-09-13 05:42:33 +08:00
case 1:
More cleanup...
1999-12-18 05:50:07 +08:00
php_gdimagecharup(im, font, x, y, ch, col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
break;
ws fix
2002-09-13 05:42:33 +08:00
case 2:
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
for (i = 0; (i < l); i++) {
WS & CS fixes
2003-03-20 09:12:57 +08:00
gdImageChar(im, font, x, y, (int) ((unsigned char) str[i]), col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
x += font->w;
}
break;
ws fix
2002-09-13 05:42:33 +08:00
case 3: {
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
for (i = 0; (i < l); i++) {
WS & CS fixes
2003-03-20 09:12:57 +08:00
/* php_gdimagecharup(im, font, x, y, (int) str[i], col); */
gdImageCharUp(im, font, x, y, (int) str[i], col);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
y -= font->w;
}
break;
}
}
Change string->str where possible; string is basic a C++ class, so gdb can't look inside variables named 'string'.
2000-02-09 06:21:43 +08:00
if (str) {
efree(str);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
RETURN_TRUE;
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
}
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a character */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
PHP_FUNCTION(imagechar)
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
{
More cleanup...
1999-12-18 05:50:07 +08:00
php_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 0);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a character rotated 90 degrees counter-clockwise */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
PHP_FUNCTION(imagecharup)
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
{
More cleanup...
1999-12-18 05:50:07 +08:00
php_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 1);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a string horizontally */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
PHP_FUNCTION(imagestring)
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
{
More cleanup...
1999-12-18 05:50:07 +08:00
php_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 2);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Draw a string vertically - rotated 90 degrees counter-clockwise */
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
PHP_FUNCTION(imagestringup)
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
{
More cleanup...
1999-12-18 05:50:07 +08:00
php_imagechar(INTERNAL_FUNCTION_PARAM_PASSTHRU, 3);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Copy part of an image */
- run ext sources through conv_proto - add necessary phpext_*_ptr
1999-05-21 18:06:25 +08:00
PHP_FUNCTION(imagecopy)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *SIM, *DIM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long SX, SY, SW, SH, DX, DY;
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
gdImagePtr im_dst, im_src;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
int srcH, srcW, srcY, srcX, dstY, dstX;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OOllllll", &DIM, gd_image_ce, &SIM, gd_image_ce, &DX, &DY, &SX, &SY, &SW, &SH) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_dst = php_gd_libgdimageptr_from_zval_p(DIM);
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
srcX = SX;
srcY = SY;
srcH = SH;
srcW = SW;
dstX = DX;
dstY = DY;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImageCopy(im_dst, im_src, dstX, dstY, srcX, srcY, srcW, srcH);
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Merge one part of an image with another */
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
PHP_FUNCTION(imagecopymerge)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *SIM, *DIM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long SX, SY, SW, SH, DX, DY, PCT;
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
gdImagePtr im_dst, im_src;
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
int srcH, srcW, srcY, srcX, dstY, dstX, pct;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OOlllllll", &DIM, gd_image_ce, &SIM, gd_image_ce, &DX, &DY, &SX, &SY, &SW, &SH, &PCT) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
im_dst = php_gd_libgdimageptr_from_zval_p(DIM);
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
srcX = SX;
srcY = SY;
srcH = SH;
srcW = SW;
dstX = DX;
dstY = DY;
pct = PCT;
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
gdImageCopyMerge(im_dst, im_src, dstX, dstY, srcX, srcY, srcW, srcH, pct);
RETURN_TRUE;
}
Proto.
2000-06-25 11:06:38 +08:00
/* }}} */
@- Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions. (Sterling) -Added the ImageCopyMerge, ImagePaletteCopy and ImageColorClosestHWB functions
2000-06-25 10:55:31 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Merge one part of an image with another */
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
PHP_FUNCTION(imagecopymergegray)
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *SIM, *DIM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long SX, SY, SW, SH, DX, DY, PCT;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImagePtr im_dst, im_src;
int srcH, srcW, srcY, srcX, dstY, dstX, pct;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OOlllllll", &DIM, gd_image_ce, &SIM, gd_image_ce, &DX, &DY, &SX, &SY, &SW, &SH, &PCT) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
im_dst = php_gd_libgdimageptr_from_zval_p(DIM);
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
srcX = SX;
srcY = SY;
srcH = SH;
srcW = SW;
dstX = DX;
dstY = DY;
pct = PCT;
Added GD 2.0.1 support.
2001-04-13 20:00:12 +08:00
gdImageCopyMergeGray(im_dst, im_src, dstX, dstY, srcX, srcY, srcW, srcH, pct);
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Copy and resize part of an image */
- run ext sources through conv_proto - add necessary phpext_*_ptr
1999-05-21 18:06:25 +08:00
PHP_FUNCTION(imagecopyresized)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *SIM, *DIM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long SX, SY, SW, SH, DX, DY, DW, DH;
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
gdImagePtr im_dst, im_src;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
int srcH, srcW, dstH, dstW, srcY, srcX, dstY, dstX;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "OOllllllll", &DIM, gd_image_ce, &SIM, gd_image_ce, &DX, &DY, &SX, &SY, &DW, &DH, &SW, &SH) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
}
- Use *_ex-API and *_RESOURCE-macros (partial). # Yell if this breaks all the hell loose. Otherwise I'll continue with the # wonderful experience of learning PHP4/Zend-APIS.
2000-02-29 00:52:03 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
im_dst = php_gd_libgdimageptr_from_zval_p(DIM);
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
- New parameter parsing API
2008-06-22 06:07:53 +08:00
srcX = SX;
srcY = SY;
srcH = SH;
srcW = SW;
dstX = DX;
dstY = DY;
dstH = DH;
dstW = DW;
Last bit of CS fixes.
2003-12-29 05:08:46 +08:00
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
if (dstW <= 0) {
zend_argument_value_error(3, "must be greater than 0");
RETURN_THROWS();
}
if (dstH <= 0) {
zend_argument_value_error(4, "must be greater than 0");
RETURN_THROWS();
}
if (srcW <= 0) {
zend_argument_value_error(5, "must be greater than 0");
RETURN_THROWS();
}
if (srcH <= 0) {
zend_argument_value_error(6, "must be greater than 0");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
Fix segfault in imagecopyresized().
2003-04-04 08:16:47 +08:00
}
Fixed Bug #7939 + some cleaning.
2000-11-23 22:56:09 +08:00
gdImageCopyResized(im_dst, im_src, dstX, dstY, srcX, srcY, dstW, dstH, srcW, srcH);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_TRUE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get image width */
Symbol work.
1999-07-28 03:44:46 +08:00
PHP_FUNCTION(imagesx)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &IM, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageSX(im));
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get image height */
Symbol work.
1999-07-28 03:44:46 +08:00
PHP_FUNCTION(imagesy)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
- New parameter parsing API
2008-06-22 06:07:53 +08:00
zval *IM;
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &IM, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
master renames phase 1
2014-08-26 01:24:55 +08:00
RETURN_LONG(gdImageSY(im));
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Set the clipping rectangle. */
Implement #52857: Access to gdImageSetClip() and gdImageGetClip() We add the necessary PHP bindings for both functions which are available as of GD_2_0_12 (released 2006-04-05). The API of imagegetclip() is modelled according to imageftbbox().
2016-07-23 22:14:36 +08:00
PHP_FUNCTION(imagesetclip)
{
zval *im_zval;
gdImagePtr im;
zend_long x1, y1, x2, y2;
Trailing whitespaces Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2017-12-31 12:35:25 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ollll", &im_zval, gd_image_ce, &x1, &y1, &x2, &y2) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Implement #52857: Access to gdImageSetClip() and gdImageGetClip() We add the necessary PHP bindings for both functions which are available as of GD_2_0_12 (released 2006-04-05). The API of imagegetclip() is modelled according to imageftbbox().
2016-07-23 22:14:36 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(im_zval);
Implement #52857: Access to gdImageSetClip() and gdImageGetClip() We add the necessary PHP bindings for both functions which are available as of GD_2_0_12 (released 2006-04-05). The API of imagegetclip() is modelled according to imageftbbox().
2016-07-23 22:14:36 +08:00
gdImageSetClip(im, x1, y1, x2, y2);
RETURN_TRUE;
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get the clipping rectangle. */
Implement #52857: Access to gdImageSetClip() and gdImageGetClip() We add the necessary PHP bindings for both functions which are available as of GD_2_0_12 (released 2006-04-05). The API of imagegetclip() is modelled according to imageftbbox().
2016-07-23 22:14:36 +08:00
PHP_FUNCTION(imagegetclip)
{
zval *im_zval;
gdImagePtr im;
int x1, y1, x2, y2;
Trailing whitespaces Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2017-12-31 12:35:25 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &im_zval, gd_image_ce) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Implement #52857: Access to gdImageSetClip() and gdImageGetClip() We add the necessary PHP bindings for both functions which are available as of GD_2_0_12 (released 2006-04-05). The API of imagegetclip() is modelled according to imageftbbox().
2016-07-23 22:14:36 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(im_zval);
Implement #52857: Access to gdImageSetClip() and gdImageGetClip() We add the necessary PHP bindings for both functions which are available as of GD_2_0_12 (released 2006-04-05). The API of imagegetclip() is modelled according to imageftbbox().
2016-07-23 22:14:36 +08:00
gdImageGetClip(im, &x1, &y1, &x2, &y2);
Trailing whitespaces Signed-off-by: Gabriel Caruso <carusogabriel34@gmail.com>
2017-12-31 12:35:25 +08:00
Implement #52857: Access to gdImageSetClip() and gdImageGetClip() We add the necessary PHP bindings for both functions which are available as of GD_2_0_12 (released 2006-04-05). The API of imagegetclip() is modelled according to imageftbbox().
2016-07-23 22:14:36 +08:00
array_init(return_value);
add_next_index_long(return_value, x1);
add_next_index_long(return_value, y1);
add_next_index_long(return_value, x2);
add_next_index_long(return_value, y2);
}
/* }}} */
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
#define TTFTEXT_DRAW 0
#define TTFTEXT_BBOX 1
Made imagegammacorrect() work on true-color images. Added support for new ImageStringFTEx function (due in GD 2.0.2).
2001-07-06 05:23:28 +08:00
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#ifdef HAVE_GD_FREETYPE
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Give the bounding box of a text using fonts via freetype2 */
Made imagegammacorrect() work on true-color images. Added support for new ImageStringFTEx function (due in GD 2.0.2).
2001-07-06 05:23:28 +08:00
PHP_FUNCTION(imageftbbox)
{
php_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_BBOX, 1);
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Write text to the image using fonts via freetype2 */
Made imagegammacorrect() work on true-color images. Added support for new ImageStringFTEx function (due in GD 2.0.2).
2001-07-06 05:23:28 +08:00
PHP_FUNCTION(imagefttext)
{
php_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_DRAW, 1);
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Give the bounding box of a text using TrueType fonts */
- run ext sources through conv_proto - add necessary phpext_*_ptr
1999-05-21 18:06:25 +08:00
PHP_FUNCTION(imagettfbbox)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
Made imagegammacorrect() work on true-color images. Added support for new ImageStringFTEx function (due in GD 2.0.2).
2001-07-06 05:23:28 +08:00
php_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_BBOX, 0);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Write text to the image using a TrueType font */
- run ext sources through conv_proto - add necessary phpext_*_ptr
1999-05-21 18:06:25 +08:00
PHP_FUNCTION(imagettftext)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
Made imagegammacorrect() work on true-color images. Added support for new ImageStringFTEx function (due in GD 2.0.2).
2001-07-06 05:23:28 +08:00
php_imagettftext_common(INTERNAL_FUNCTION_PARAM_PASSTHRU, TTFTEXT_DRAW, 0);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ php_imagettftext_common */
Fixed bug: #13172
2001-09-07 07:10:37 +08:00
static void php_imagettftext_common(INTERNAL_FUNCTION_PARAMETERS, int mode, int extended)
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
{
- Added some sanity checks by changing to the parameter parsing API
2005-01-18 01:07:28 +08:00
zval *IM, *EXT = NULL;
@ Fix a couple of warnings in the gd and ldap modules num_links is a long there
2000-05-24 16:58:40 +08:00
gdImagePtr im=NULL;
Merge branch 'PHP-5.6' into PHP-7.0
2016-09-20 07:25:08 +08:00
zend_long col = -1, x = 0, y = 0;
first show to make 's' work with size_t
2014-08-27 21:31:48 +08:00
size_t str_len, fontname_len;
int i, brect[8];
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
double ptsize, angle;
fix wrong type and useless assignments
2010-01-16 01:09:14 +08:00
char *str = NULL, *fontname = NULL;
Fixed bug #21533 (a rare condition where error can remain undefined and result in undefined behavior when it is used without being initialized).
2003-01-25 03:23:53 +08:00
char *error = NULL;
- Added some sanity checks by changing to the parameter parsing API
2005-01-18 01:07:28 +08:00
int argc = ZEND_NUM_ARGS();
Synchronized bundled GD library with GD 2.0.17 . GD is now thread-safe thanks to wrappers around freetype library . Significant optimization to png writing code. . Miscellaneous fixes. Fixed memory leak inside php_imagettftext_common() Make ext/gd compile with GD 2.0.17+ (gdFreeFontCache() is not avaliable)
2003-12-26 06:12:12 +08:00
gdFTStringExtra strex = {0};
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
if (mode == TTFTEXT_BBOX) {
- Added some sanity checks by changing to the parameter parsing API
2005-01-18 01:07:28 +08:00
if (argc < 4 || argc > ((extended) ? 5 : 4)) {
Fix GD build, and clean it tup
2001-07-31 01:29:57 +08:00
ZEND_WRONG_PARAM_COUNT();
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
} else if (zend_parse_parameters(argc, "ddss|a", &ptsize, &angle, &fontname, &fontname_len, &str, &str_len, &EXT) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
} else {
- Added some sanity checks by changing to the parameter parsing API
2005-01-18 01:07:28 +08:00
if (argc < 8 || argc > ((extended) ? 9 : 8)) {
Fix GD build, and clean it tup
2001-07-31 01:29:57 +08:00
ZEND_WRONG_PARAM_COUNT();
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
} else if (zend_parse_parameters(argc, "Oddlllss|a", &IM, gd_image_ce, &ptsize, &angle, &x, &y, &col, &fontname, &fontname_len, &str, &str_len, &EXT) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
- Added some sanity checks by changing to the parameter parsing API
2005-01-18 01:07:28 +08:00
/* convert angle to radians */
angle = angle * (M_PI/180);
Made imagegammacorrect() work on true-color images. Added support for new ImageStringFTEx function (due in GD 2.0.2).
2001-07-06 05:23:28 +08:00
- Added some sanity checks by changing to the parameter parsing API
2005-01-18 01:07:28 +08:00
if (extended && EXT) { /* parse extended info */
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *item;
zend_string *key;
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
ws fix
2005-01-15 12:34:30 +08:00
/* walk the assoc array */
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
ZEND_HASH_FOREACH_STR_KEY_VAL(Z_ARRVAL_P(EXT), key, item) {
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
if (key == NULL) {
ws fix
2005-01-15 12:34:30 +08:00
continue;
}
Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes).
2015-06-30 09:05:24 +08:00
if (strcmp("linespacing", ZSTR_VAL(key)) == 0) {
ws fix
2005-01-15 12:34:30 +08:00
strex.flags |= gdFTEX_LINESPACE;
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
strex.linespacing = zval_get_double(item);
ws fix
2005-01-15 12:34:30 +08:00
}
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
} ZEND_HASH_FOREACH_END();
ws fix
2005-01-15 12:34:30 +08:00
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
fix font handling in vdir mode
2001-07-20 19:25:13 +08:00
#ifdef VIRTUAL_DIR
Synchronized bundled GD library with GD 2.0.17 . GD is now thread-safe thanks to wrappers around freetype library . Significant optimization to png writing code. . Miscellaneous fixes. Fixed memory leak inside php_imagettftext_common() Make ext/gd compile with GD 2.0.17+ (gdFreeFontCache() is not avaliable)
2003-12-26 06:12:12 +08:00
{
char tmp_font_path[MAXPATHLEN];
- Added some sanity checks by changing to the parameter parsing API
2005-01-18 01:07:28 +08:00
fix wrong type and useless assignments
2010-01-16 01:09:14 +08:00
if (!VCWD_REALPATH(fontname, tmp_font_path)) {
- Added some sanity checks by changing to the parameter parsing API
2005-01-18 01:07:28 +08:00
fontname = NULL;
Synchronized bundled GD library with GD 2.0.17 . GD is now thread-safe thanks to wrappers around freetype library . Significant optimization to png writing code. . Miscellaneous fixes. Fixed memory leak inside php_imagettftext_common() Make ext/gd compile with GD 2.0.17+ (gdFreeFontCache() is not avaliable)
2003-12-26 06:12:12 +08:00
}
fix font handling in vdir mode
2001-07-20 19:25:13 +08:00
}
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
2013-05-03 19:53:55 +08:00
#endif /* VIRTUAL_DIR */
fix font handling in vdir mode
2001-07-20 19:25:13 +08:00
fix wrong type and useless assignments
2010-01-16 01:09:14 +08:00
PHP_GD_CHECK_OPEN_BASEDIR(fontname, "Invalid font filename");
trailing whitespace removal
2015-01-03 17:22:58 +08:00
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (extended) {
fix wrong type and useless assignments
2010-01-16 01:09:14 +08:00
error = gdImageStringFTEx(im, brect, col, fontname, ptsize, angle, x, y, str, &strex);
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
} else {
Required GD >= 2.1.0 or GD bundled, this allows us to remove most of the #ifdef
2013-05-03 19:53:55 +08:00
error = gdImageStringFT(im, brect, col, fontname, ptsize, angle, x, y, str);
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
}
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
if (error) {
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
php_error_docref(NULL, E_WARNING, "%s", error);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
RETURN_FALSE;
}
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Removed pointless checks of array_init() return value.
2003-01-18 05:37:56 +08:00
array_init(return_value);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
/* return array with the text's bounding box */
for (i = 0; i < 8; i++) {
master renames phase 1
2014-08-26 01:24:55 +08:00
add_next_index_long(return_value, brect[i]);
updated GD from php3 repository, using it as a test extension for the new directory structure
1999-04-16 20:15:38 +08:00
}
}
vim-6 does folding - clean up a bunch of missing folding tags plus some misguided RINIT and RSHUTDOWN calls in a few fringe extensions
2001-06-05 21:12:10 +08:00
/* }}} */
cleanup gd build with system libgd - drop need to use libpng with system libgd - drop need to use libjpeg with system libgd - drop need to use libXpm with system libgd - drop need to use libfreetype with system libgd - improve configure comments
2019-07-22 17:47:38 +08:00
#endif /* HAVE_GD_FREETYPE */
Ported T1lib support from PHP3. @- Ported T1lib support from PHP3. (Jouni) # That's almost a lie... needs still some work.
2000-02-25 14:43:51 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
/* Section Filters */
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
#define PHP_GD_SINGLE_RES \
- MFH: Added new parameter parsing API (part II)
2008-08-05 02:23:33 +08:00
zval *SIM; \
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
gdImagePtr im_src; \
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(1, "O", &SIM, gd_image_ce) == FAILURE) { \
Use RETURN_THROWS() in various places
2020-01-04 03:44:29 +08:00
RETURN_THROWS(); \
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
} \
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
static void php_image_filter_negate(INTERNAL_FUNCTION_PARAMETERS)
{
PHP_GD_SINGLE_RES
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (gdImageNegate(im_src) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_grayscale(INTERNAL_FUNCTION_PARAMETERS)
{
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
PHP_GD_SINGLE_RES
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (gdImageGrayScale(im_src) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_brightness(INTERNAL_FUNCTION_PARAMETERS)
{
zval *SIM;
gdImagePtr im_src;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long brightness, tmp;
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oll", &SIM, gd_image_ce, &tmp, &brightness) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
}
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (gdImageBrightness(im_src, (int)brightness) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_contrast(INTERNAL_FUNCTION_PARAMETERS)
{
zval *SIM;
gdImagePtr im_src;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long contrast, tmp;
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oll", &SIM, gd_image_ce, &tmp, &contrast) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
}
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
WS & CS fixes
2003-03-20 09:12:57 +08:00
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
if (gdImageContrast(im_src, (int)contrast) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_colorize(INTERNAL_FUNCTION_PARAMETERS)
{
zval *SIM;
gdImagePtr im_src;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long r,g,b,tmp;
zend_long a = 0;
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ollll|l", &SIM, gd_image_ce, &tmp, &r, &g, &b, &a) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
}
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
WS & CS fixes
2003-03-20 09:12:57 +08:00
- [DOC] add alpha support for imagefilter's IMG_FILTER_COLORIZE
2007-09-12 05:03:48 +08:00
if (gdImageColor(im_src, (int) r, (int) g, (int) b, (int) a) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_edgedetect(INTERNAL_FUNCTION_PARAMETERS)
{
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
PHP_GD_SINGLE_RES
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (gdImageEdgeDetectQuick(im_src) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_emboss(INTERNAL_FUNCTION_PARAMETERS)
{
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
PHP_GD_SINGLE_RES
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (gdImageEmboss(im_src) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_gaussian_blur(INTERNAL_FUNCTION_PARAMETERS)
{
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
PHP_GD_SINGLE_RES
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (gdImageGaussianBlur(im_src) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_selective_blur(INTERNAL_FUNCTION_PARAMETERS)
{
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
PHP_GD_SINGLE_RES
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (gdImageSelectiveBlur(im_src) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_mean_removal(INTERNAL_FUNCTION_PARAMETERS)
{
Fixed bug #28267 (php_image_filter_contrast calls gdImageBrightness).
2004-05-10 01:39:20 +08:00
PHP_GD_SINGLE_RES
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (gdImageMeanRemoval(im_src) == 1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
static void php_image_filter_smooth(INTERNAL_FUNCTION_PARAMETERS)
{
zval *SIM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long tmp;
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
gdImagePtr im_src;
double weight;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Old", &SIM, gd_image_ce, &tmp, &weight) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
}
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
WS & CS fixes
2003-03-20 09:12:57 +08:00
Conversion fixes
2002-11-29 06:48:20 +08:00
if (gdImageSmooth(im_src, (float)weight)==1) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_TRUE;
}
WS & CS fixes
2003-03-20 09:12:57 +08:00
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
RETURN_FALSE;
}
MFH: added pixelate filter.
2009-01-15 03:06:12 +08:00
static void php_image_filter_pixelate(INTERNAL_FUNCTION_PARAMETERS)
{
zval *IM;
gdImagePtr im;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long tmp, blocksize;
MFH: Change optional parameter for IMG_FILTER_PIXELATE to be a boolean Added missing NEWS log entry for the new pixelation filter
2009-01-15 15:57:11 +08:00
zend_bool mode = 0;
MFH: added pixelate filter.
2009-01-15 03:06:12 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oll|b", &IM, gd_image_ce, &tmp, &blocksize, &mode) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
MFH: added pixelate filter.
2009-01-15 03:06:12 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
MFH: added pixelate filter.
2009-01-15 03:06:12 +08:00
if (gdImagePixelate(im, (int) blocksize, (const unsigned int) mode)) {
RETURN_TRUE;
}
RETURN_FALSE;
}
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
static void php_image_filter_scatter(INTERNAL_FUNCTION_PARAMETERS)
{
zval *IM;
zval *hash_colors = NULL;
gdImagePtr im;
zend_long tmp;
zend_long scatter_sub, scatter_plus;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Olll|a", &IM, gd_image_ce, &tmp, &scatter_sub, &scatter_plus, &hash_colors) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
if (hash_colors) {
uint32_t i = 0;
uint32_t num_colors = zend_hash_num_elements(Z_ARRVAL_P(hash_colors));
zval *color;
int *colors;
if (num_colors == 0) {
RETURN_BOOL(gdImageScatter(im, (int)scatter_sub, (int)scatter_plus));
}
colors = emalloc(num_colors * sizeof(int));
Use ZEND_HASH_FOREACH APIs in a few more places
2019-07-16 18:07:09 +08:00
ZEND_HASH_FOREACH_VAL(Z_ARRVAL_P(hash_colors), color) {
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
*(colors + i++) = (int) zval_get_long(color);
Use ZEND_HASH_FOREACH APIs in a few more places
2019-07-16 18:07:09 +08:00
} ZEND_HASH_FOREACH_END();
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
RETVAL_BOOL(gdImageScatterColor(im, (int)scatter_sub, (int)scatter_plus, colors, num_colors));
efree(colors);
} else {
Add do...while(0) for RETURN_* and ZVAL_* APIs Closes GH-4255.
2019-06-12 18:49:33 +08:00
RETURN_BOOL(gdImageScatter(im, (int) scatter_sub, (int) scatter_plus));
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
}
}
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Applies Filter an image using a custom angle */
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
PHP_FUNCTION(imagefilter)
{
zval *tmp;
typedef void (*image_filter)(INTERNAL_FUNCTION_PARAMETERS);
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long filtertype;
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
image_filter filters[] =
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
{
php_image_filter_negate ,
php_image_filter_grayscale,
php_image_filter_brightness,
php_image_filter_contrast,
php_image_filter_colorize,
php_image_filter_edgedetect,
php_image_filter_emboss,
php_image_filter_gaussian_blur,
php_image_filter_selective_blur,
php_image_filter_mean_removal,
MFH: added pixelate filter.
2009-01-15 03:06:12 +08:00
php_image_filter_smooth,
Implemented the gdScatter filter I wrote almost 10 years ago This filter is available as of libgd 2.1.0 which is our bare minimum for external compilation of ext/gd. The scatter filter works by iterating over all pixels in the image and shifting them randomly based on two modifier (`plus` and `sub`) values: dest_x = (int)(x + ((rand() % (plus - sub)) + sub)); dest_y = (int)(y + ((rand() % (plus - sub)) + sub)); Additionally the scatter filter also supports by only shifting pixels where the current pixel being iterated is one or more colors, allowing the scatter filter to only effect solid colors in part of an image. Note, due to the nature of randomness and implementation, pixels who were shifted ahead of iteration will be shifted once more and therefore the bottom right of an image may contain a slight scatter effect due to this.
2019-05-10 07:23:40 +08:00
php_image_filter_pixelate,
php_image_filter_scatter
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
};
MFH: bump up and use IMAGE_FILTER_MAX_ARGS instead of a magic number.
2009-01-20 00:35:58 +08:00
if (ZEND_NUM_ARGS() < 2 || ZEND_NUM_ARGS() > IMAGE_FILTER_MAX_ARGS) {
MFH: Fix double "wrong param count" messages
2006-11-03 23:13:17 +08:00
WRONG_PARAM_COUNT;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
} else if (zend_parse_parameters(2, "Ol", &tmp, gd_image_ce, &filtertype) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
add imagesavealpha wrapper (Jukka Holappa <jukkaho@mail.student.oulu.fi>, 2 Pierre-Alain Joye)
2003-02-27 07:22:09 +08:00
}
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
WS & CS fixes
2003-03-20 09:12:57 +08:00
if (filtertype >= 0 && filtertype <= IMAGE_FILTER_MAX) {
Added imagefilter() function by Pierre-Alain Joye (paj@pearfr.org). This function allows negate, grayscale, brightness, contrast, colorize, selective blur, Gaussian blur, edge detect, smooth, sharpen and emboss filters to be applied on an image.
2002-11-14 04:02:58 +08:00
filters[filtertype](INTERNAL_FUNCTION_PARAM_PASSTHRU);
}
}
/* }}} */
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Apply a 3x3 convolution matrix, using coefficient div and offset */
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
PHP_FUNCTION(imageconvolution)
{
zval *SIM, *hash_matrix;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *var = NULL, *var2 = NULL;
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
gdImagePtr im_src = NULL;
- fix #34980, divisor and offset never passed correctly (s/float/double/)
2005-10-26 07:00:19 +08:00
double div, offset;
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
int nelem, i, j, res;
- Fixed bug #32735 (Compile error in GD extension).
2005-04-17 18:17:03 +08:00
float matrix[3][3] = {{0,0,0}, {0,0,0}, {0,0,0}};
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oadd", &SIM, gd_image_ce, &hash_matrix, &div, &offset) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im_src = php_gd_libgdimageptr_from_zval_p(SIM);
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
nelem = zend_hash_num_elements(Z_ARRVAL_P(hash_matrix));
if (nelem != 3) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(2, "must be a 3x3 array");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
}
for (i=0; i<3; i++) {
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
if ((var = zend_hash_index_find(Z_ARRVAL_P(hash_matrix), (i))) != NULL && Z_TYPE_P(var) == IS_ARRAY) {
if (zend_hash_num_elements(Z_ARRVAL_P(var)) != 3 ) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(2, "must be a 3x3 array, matrix[%d] only has %d elements", i, zend_hash_num_elements(Z_ARRVAL_P(var)));
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
}
for (j=0; j<3; j++) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
if ((var2 = zend_hash_index_find(Z_ARRVAL_P(var), j)) != NULL) {
matrix[i][j] = (float) zval_get_double(var2);
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
} else {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(2, "must be a 3x3 array, matrix[%d][%d] cannot be found (missing integer key)", i, j);
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
}
}
}
}
- add image flip API support
2013-02-27 17:39:25 +08:00
res = gdImageConvolution(im_src, matrix, (float)div, (float)offset);
- export imageconvolution to userland, making people happy to do not use the predefined ones :)
2005-04-16 20:12:24 +08:00
if (res) {
RETURN_TRUE;
} else {
RETURN_FALSE;
}
}
/* }}} */
Fixed build with non-bundled GD. Hidden the anti-alias functions when non-bundled GD is used and made imagecreatefromxpm() unavailable because of a bug in the external GD library.
2002-12-12 06:25:23 +08:00
/* End section: Filters */
Add imageantialias(im, flag) Add AA support for bundled imageline
2002-12-12 04:44:44 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Flip an image (in place) horizontally, vertically or both directions. */
- add image flip API support
2013-02-27 17:39:25 +08:00
PHP_FUNCTION(imageflip)
{
zval *IM;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long mode;
- add image flip API support
2013-02-27 17:39:25 +08:00
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol", &IM, gd_image_ce, &mode) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- add image flip API support
2013-02-27 17:39:25 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- add image flip API support
2013-02-27 17:39:25 +08:00
switch (mode) {
case GD_FLIP_VERTICAL:
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
gdImageFlipVertical(im);
- add image flip API support
2013-02-27 17:39:25 +08:00
break;
Improve some TypeError and ValueError messages Closes GH-5377
2020-04-13 16:41:23 +08:00
case GD_FLIP_HORIZONTAL:
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
gdImageFlipHorizontal(im);
- add image flip API support
2013-02-27 17:39:25 +08:00
break;
case GD_FLIP_BOTH:
gdImageFlipBoth(im);
break;
default:
Improve some TypeError and ValueError messages Closes GH-5377
2020-04-13 16:41:23 +08:00
zend_argument_value_error(2, "must be either IMG_FLIP_VERTICAL, IMG_FLIP_HORIZONTAL, or IMG_FLIP_BOTH");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add image flip API support
2013-02-27 17:39:25 +08:00
}
RETURN_TRUE;
}
/* }}} */
gd: provide imageflip with system libgd when available
2013-04-24 20:32:03 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Should antialiased functions used or not*/
gd: provide imageflip with system libgd when available
2013-04-24 20:32:03 +08:00
PHP_FUNCTION(imageantialias)
{
zval *IM;
zend_bool alias;
gdImagePtr im;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ob", &IM, gd_image_ce, &alias) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
}
Fix #77943: imageantialias($image, false); does not work Firstly, we must not call `gdImageSetAntiAliased()` (which sets the color to anti-alias), but rather modify the `gdImage.AA` flag. Furthermore, we have to actually use the supplied boolean value. We also make sure that we don't attempt to enable anti-aliasing for palette images.
2019-04-29 22:14:26 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Fix #77943: imageantialias($image, false); does not work Firstly, we must not call `gdImageSetAntiAliased()` (which sets the color to anti-alias), but rather modify the `gdImage.AA` flag. Furthermore, we have to actually use the supplied boolean value. We also make sure that we don't attempt to enable anti-aliasing for palette images.
2019-04-29 22:14:26 +08:00
if (im->trueColor) {
im->AA = alias;
}
gd: provide imageflip with system libgd when available
2013-04-24 20:32:03 +08:00
RETURN_TRUE;
}
/* }}} */
- add image crop support
2013-03-01 00:24:23 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Crop an image using the given coordinates and size, x, y, width and height. */
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
PHP_FUNCTION(imagecrop)
{
zval *IM;
gdImagePtr im;
gdImagePtr im_crop;
gdRect rect;
- (s)rgb distance works way better for now, re enable threshold
2013-03-03 12:30:12 +08:00
zval *z_rect;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *tmp;
- add image crop support
2013-03-01 00:24:23 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oa", &IM, gd_image_ce, &z_rect) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "x", sizeof("x") -1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
rect.x = zval_get_long(tmp);
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(2, "must have an \"x\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
}
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "y", sizeof("y") - 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
rect.y = zval_get_long(tmp);
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(2, "must have a \"y\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
}
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "width", sizeof("width") - 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
rect.width = zval_get_long(tmp);
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(2, "must have a \"width\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
}
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "height", sizeof("height") - 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
rect.height = zval_get_long(tmp);
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(2, "must have a \"height\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
}
im_crop = gdImageCrop(im, &rect);
if (im_crop == NULL) {
RETURN_FALSE;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im_crop);
- disable threshold for now, will enable it again using CIEDE2000
2013-03-01 15:10:49 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Crop an image automatically using one of the available modes. */
- add image crop support
2013-03-01 00:24:23 +08:00
PHP_FUNCTION(imagecropauto)
{
zval *IM;
Resolve imagecropauto() default $mode quirk The `$mode` parameter of `imagecropauto()` defaults to `-1`. However, `-1` is changed to `GD_CROP_DEFAULT` right away, so basically the default is `GD_CROP_DEFAULT`, which is rather confusing and unnecessary. Therefore, we change the default to `IMG_CROP_DEFAULT`, but still allow an explicit `-1` to be passed for BC reasons, in which case we trigger a deprecation notice, so we can rid the `-1` support eventually.
2018-12-13 00:25:37 +08:00
zend_long mode = GD_CROP_DEFAULT;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long color = -1;
- clean and enable threshold
2013-03-01 02:22:06 +08:00
double threshold = 0.5f;
- add image crop support
2013-03-01 00:24:23 +08:00
gdImagePtr im;
gdImagePtr im_crop;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|ldl", &IM, gd_image_ce, &mode, &threshold, &color) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- add image crop support
2013-03-01 00:24:23 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- add image crop support
2013-03-01 00:24:23 +08:00
switch (mode) {
case GD_CROP_DEFAULT:
case GD_CROP_TRANSPARENT:
case GD_CROP_BLACK:
case GD_CROP_WHITE:
case GD_CROP_SIDES:
im_crop = gdImageCropAuto(im, mode);
break;
- (s)rgb distance works way better for now, re enable threshold
2013-03-03 12:30:12 +08:00
- clean and enable threshold
2013-03-01 02:22:06 +08:00
case GD_CROP_THRESHOLD:
fix #72494, improve input color check and prevent issues when old gd are used, done before gd call
2016-07-19 19:23:51 +08:00
if (color < 0 || (!gdImageTrueColor(im) && color >= gdImageColorsTotal(im))) {
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(4, "must be greater than or equal to 0 when using the threshold mode");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- clean and enable threshold
2013-03-01 02:22:06 +08:00
}
im_crop = gdImageCropThreshold(im, color, (float) threshold);
break;
- (s)rgb distance works way better for now, re enable threshold
2013-03-03 12:30:12 +08:00
- add image crop support
2013-03-01 00:24:23 +08:00
default:
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
zend_argument_value_error(2, "must be a valid mode");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add image crop support
2013-03-01 00:24:23 +08:00
}
Warnings to errors in imagecrop(auto)
2019-09-04 07:53:16 +08:00
- add image crop support
2013-03-01 00:24:23 +08:00
if (im_crop == NULL) {
RETURN_FALSE;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im_crop);
- add image crop support
2013-03-01 00:24:23 +08:00
}
/* }}} */
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Scale an image using the given new width and height. */
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
PHP_FUNCTION(imagescale)
{
zval *IM;
gdImagePtr im;
Fixed Bug #66893i imagescale ignore method argument We also have our goto fail; bug. Upstream fix for libgd https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0
2014-03-12 22:33:41 +08:00
gdImagePtr im_scaled = NULL;
Fixed Bug #66890 imagescale segfault zend_parse_parameters "l" expect long, not int
2014-03-12 20:44:58 +08:00
int new_width, new_height;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long tmp_w, tmp_h=-1, tmp_m = GD_BILINEAR_FIXED;
Fix #73272: imagescale() affects imagesetinterpolation() We must not permanently change the interpolation method, but rather have to restore the old method after we're done with scaling the image.
2016-10-09 20:59:37 +08:00
gdInterpolationMethod method, old_method;
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Ol|ll", &IM, gd_image_ce, &tmp_w, &tmp_h, &tmp_m) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
Fixed Bug #66890 imagescale segfault zend_parse_parameters "l" expect long, not int
2014-03-12 20:44:58 +08:00
method = tmp_m;
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
Preserve aspect ratio for width or height
2018-12-30 02:41:57 +08:00
if (tmp_h < 0 || tmp_w < 0) {
Fixed Bug #65171 imagescale() fails Third param (height) is set as optional, but default value = -1 is incorrect Compute correct height to preserve ratio.
2014-10-16 01:13:25 +08:00
/* preserve ratio */
long src_x, src_y;
src_x = gdImageSX(im);
src_y = gdImageSY(im);
Preserve aspect ratio for width or height
2018-12-30 02:41:57 +08:00
if (src_x && tmp_h < 0) {
Fixed Bug #65171 imagescale() fails Third param (height) is set as optional, but default value = -1 is incorrect Compute correct height to preserve ratio.
2014-10-16 01:13:25 +08:00
tmp_h = tmp_w * src_y / src_x;
}
Preserve aspect ratio for width or height
2018-12-30 02:41:57 +08:00
if (src_y && tmp_w < 0) {
tmp_w = tmp_h * src_x / src_y;
}
Fixed Bug #65171 imagescale() fails Third param (height) is set as optional, but default value = -1 is incorrect Compute correct height to preserve ratio.
2014-10-16 01:13:25 +08:00
}
Fix #73957: signed integer conversion in imagescale() We must not pass values to `gdImageScale()` which cannot be represented by an `unsigned int`. Instead we return FALSE, according to what we already did for negative integers.
2018-03-10 07:17:09 +08:00
if (tmp_h <= 0 || tmp_h > INT_MAX || tmp_w <= 0 || tmp_w > INT_MAX) {
#72337 invalid dimensions can lead to segv
2016-06-07 18:16:40 +08:00
RETURN_FALSE;
}
Fixed Bug #65171 imagescale() fails Third param (height) is set as optional, but default value = -1 is incorrect Compute correct height to preserve ratio.
2014-10-16 01:13:25 +08:00
new_width = tmp_w;
new_height = tmp_h;
Fix #73272: imagescale() affects imagesetinterpolation() We must not permanently change the interpolation method, but rather have to restore the old method after we're done with scaling the image.
2016-10-09 20:59:37 +08:00
/* gdImageGetInterpolationMethod() is only available as of GD 2.1.1 */
old_method = im->interpolation_id;
Fixed Bug #66893i imagescale ignore method argument We also have our goto fail; bug. Upstream fix for libgd https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0
2014-03-12 22:33:41 +08:00
if (gdImageSetInterpolationMethod(im, method)) {
im_scaled = gdImageScale(im, new_width, new_height);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
Fix #73272: imagescale() affects imagesetinterpolation() We must not permanently change the interpolation method, but rather have to restore the old method after we're done with scaling the image.
2016-10-09 20:59:37 +08:00
gdImageSetInterpolationMethod(im, old_method);
Fixed Bug #66893i imagescale ignore method argument We also have our goto fail; bug. Upstream fix for libgd https://bitbucket.org/libgd/gd-libgd/commits/5b42b1178c37ffd30c9a15733058656be0277da0
2014-03-12 22:33:41 +08:00
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
if (im_scaled == NULL) {
RETURN_FALSE;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, im_scaled);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Return an image containing the affine tramsformed src image, using an optional clipping area */
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
PHP_FUNCTION(imageaffine)
{
zval *IM;
gdImagePtr src;
gdImagePtr dst;
gdRect rect;
gdRectPtr pRect = NULL;
zval *z_rect = NULL;
zval *z_affine;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *tmp;
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
double affine[6];
int i, nelems;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *zval_affine_elem = NULL;
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "Oa|a!", &IM, gd_image_ce, &z_affine, &z_rect) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
src = php_gd_libgdimageptr_from_zval_p(IM);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
if ((nelems = zend_hash_num_elements(Z_ARRVAL_P(z_affine))) != 6) {
Improve error messages of various extensions Closes GH-5278
2020-03-19 05:44:02 +08:00
zend_argument_value_error(2, "must have 6 elements");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
for (i = 0; i < nelems; i++) {
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
if ((zval_affine_elem = zend_hash_index_find(Z_ARRVAL_P(z_affine), i)) != NULL) {
switch (Z_TYPE_P(zval_affine_elem)) {
master renames phase 1
2014-08-26 01:24:55 +08:00
case IS_LONG:
affine[i] = Z_LVAL_P(zval_affine_elem);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
break;
case IS_DOUBLE:
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
affine[i] = Z_DVAL_P(zval_affine_elem);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
break;
case IS_STRING:
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
affine[i] = zval_get_double(zval_affine_elem);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
break;
default:
Improve error messages of various extensions Closes GH-5278
2020-03-19 05:44:02 +08:00
zend_argument_type_error(3, "contains invalid type for element %i", i);
Use RETURN_THROWS() after zend_type_error()
2020-01-01 21:23:21 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
}
}
if (z_rect != NULL) {
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "x", sizeof("x") - 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
rect.x = zval_get_long(tmp);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(3, "must have an \"x\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "y", sizeof("y") - 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
rect.y = zval_get_long(tmp);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(3, "must have a \"y\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "width", sizeof("width") - 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
rect.width = zval_get_long(tmp);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(3, "must have a \"width\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(z_rect), "height", sizeof("height") - 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
rect.height = zval_get_long(tmp);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(3, "must have a \"height\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
pRect = &rect;
}
if (gdTransformAffineGetImage(&dst, src, pRect, affine) != GD_TRUE) {
RETURN_FALSE;
}
if (dst == NULL) {
RETURN_FALSE;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
php_gd_assign_libgdimageptr_as_extgdimage(return_value, dst);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Return an image containing the affine tramsformed src image, using an optional clipping area */
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
PHP_FUNCTION(imageaffinematrixget)
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
{
double affine[6];
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long type;
Fix bug #67248 (imageaffinematrixget missing check of parameters)
2014-05-12 09:14:57 +08:00
zval *options = NULL;
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *tmp;
- #64710, check return val
2013-04-26 14:15:33 +08:00
int res = GD_FALSE, i;
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "l|z", &type, &options) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
}
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
Fixed Bug #64961 segfault in imagesetinterpolation enum type are not long ;) so cannot be used as zend_parse_parameters arg.
2013-06-03 20:15:18 +08:00
switch((gdAffineStandardMatrix)type) {
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
case GD_AFFINE_TRANSLATE:
case GD_AFFINE_SCALE: {
double x, y;
Fix bug #67248 (imageaffinematrixget missing check of parameters)
2014-05-12 09:14:57 +08:00
if (!options || Z_TYPE_P(options) != IS_ARRAY) {
Improve error messages of various extensions Closes GH-5278
2020-03-19 05:44:02 +08:00
zend_argument_type_error(1, "must be of type array when using translate or scale");
Use RETURN_THROWS() after zend_type_error()
2020-01-01 21:23:21 +08:00
RETURN_THROWS();
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
}
Warnings to errors in imageaffinematrix*()
2019-09-04 07:16:09 +08:00
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(options), "x", sizeof("x") - 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
x = zval_get_double(tmp);
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(2, "must have an \"x\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
}
Fixed incorrect usage of HASH_OF() macro. Replaced HASH_OF() with more appropriate Z_ARRVAL_P() or Z_OBJPROP_P().
2015-09-25 03:39:59 +08:00
if ((tmp = zend_hash_str_find(Z_ARRVAL_P(options), "y", sizeof("y") - 1)) != NULL) {
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
y = zval_get_double(tmp);
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
} else {
Review the usage of apostrophes in error messages Closes GH-5590
2020-05-26 20:10:57 +08:00
zend_argument_value_error(2, "must have a \"y\" key");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
}
trailing whitespace removal
2015-01-03 17:22:58 +08:00
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
if (type == GD_AFFINE_TRANSLATE) {
res = gdAffineTranslate(affine, x, y);
} else {
res = gdAffineScale(affine, x, y);
}
break;
}
case GD_AFFINE_ROTATE:
case GD_AFFINE_SHEAR_HORIZONTAL:
case GD_AFFINE_SHEAR_VERTICAL: {
double angle;
Fix bug #67248 (imageaffinematrixget missing check of parameters)
2014-05-12 09:14:57 +08:00
if (!options) {
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
zend_argument_type_error(2, "must be of type int|float when using rotate or shear");
Use RETURN_THROWS() after zend_type_error()
2020-01-01 21:23:21 +08:00
RETURN_THROWS();
Fix bug #67248 (imageaffinematrixget missing check of parameters)
2014-05-12 09:14:57 +08:00
}
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
angle = zval_get_double(options);
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
if (type == GD_AFFINE_SHEAR_HORIZONTAL) {
res = gdAffineShearHorizontal(affine, angle);
} else if (type == GD_AFFINE_SHEAR_VERTICAL) {
res = gdAffineShearVertical(affine, angle);
} else {
res = gdAffineRotate(affine, angle);
}
break;
}
default:
Improve error messages of various extensions Closes GH-5278
2020-03-19 05:44:02 +08:00
zend_argument_value_error(1, "must be a valid element type");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
}
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
fix #64725, wrong res check
2013-04-27 23:52:30 +08:00
if (res == GD_FALSE) {
- #64710, check return val
2013-04-26 14:15:33 +08:00
RETURN_FALSE;
} else {
array_init(return_value);
for (i = 0; i < 6; i++) {
add_index_double(return_value, i, affine[i]);
}
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
}
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
} /* }}} */
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Concat two matrices (as in doing many ops in one go) */
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
PHP_FUNCTION(imageaffinematrixconcat)
{
double m1[6];
double m2[6];
double mr[6];
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
zval *tmp;
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
zval *z_m1;
zval *z_m2;
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
int i;
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
first shot remove TSRMLS_* things
2014-12-14 06:06:14 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "aa", &z_m1, &z_m2) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
}
Improve some ValueError messages Closes GH-5340
2020-04-02 05:32:39 +08:00
if (zend_hash_num_elements(Z_ARRVAL_P(z_m1)) != 6) {
zend_argument_value_error(1, "must have 6 elements");
RETURN_THROWS();
}
if (zend_hash_num_elements(Z_ARRVAL_P(z_m2)) != 6) {
zend_argument_value_error(1, "must have 6 elements");
Use RETURN_THROWS() after zend_value_error()
2019-12-31 23:58:15 +08:00
RETURN_THROWS();
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
}
for (i = 0; i < 6; i++) {
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
if ((tmp = zend_hash_index_find(Z_ARRVAL_P(z_m1), i)) != NULL) {
switch (Z_TYPE_P(tmp)) {
master renames phase 1
2014-08-26 01:24:55 +08:00
case IS_LONG:
m1[i] = Z_LVAL_P(tmp);
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
break;
case IS_DOUBLE:
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
m1[i] = Z_DVAL_P(tmp);
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
break;
case IS_STRING:
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
m1[i] = zval_get_double(tmp);
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
break;
default:
Improve error messages of various extensions Closes GH-5278
2020-03-19 05:44:02 +08:00
zend_argument_type_error(1, "contains invalid type for element %i", i);
Use RETURN_THROWS() after zend_type_error()
2020-01-01 21:23:21 +08:00
RETURN_THROWS();
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
}
}
Warnings to errors in imageaffinematrix*()
2019-09-04 07:16:09 +08:00
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
if ((tmp = zend_hash_index_find(Z_ARRVAL_P(z_m2), i)) != NULL) {
switch (Z_TYPE_P(tmp)) {
master renames phase 1
2014-08-26 01:24:55 +08:00
case IS_LONG:
m2[i] = Z_LVAL_P(tmp);
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
break;
case IS_DOUBLE:
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
m2[i] = Z_DVAL_P(tmp);
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
break;
case IS_STRING:
Fix casts in GD Using convert_to_* after ZVAL_COPY is unsafe.
2014-10-10 18:23:33 +08:00
m2[i] = zval_get_double(tmp);
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
break;
default:
Improve error messages of various extensions Closes GH-5278
2020-03-19 05:44:02 +08:00
zend_argument_type_error(2, "contains invalid type for element %i", i);
Use RETURN_THROWS() after zend_type_error()
2020-01-01 21:23:21 +08:00
RETURN_THROWS();
- add imageaffinematrixget and imagematrixconcat
2013-03-20 19:19:03 +08:00
}
}
}
if (gdAffineConcat (mr, m1, m2) != GD_TRUE) {
RETURN_FALSE;
}
array_init(return_value);
for (i = 0; i < 6; i++) {
add_index_double(return_value, i, mr[i]);
}
Refactor ext/gd (all tests passes)
2014-05-12 15:53:35 +08:00
} /* }}} */
- add affine matrix helper for translate, scale, rotate and shear
2013-03-20 18:01:37 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get the default interpolation method. */
Add imagegetinterpolation() While `imagesetinterpolation()` is available as of PHP 5.5.0, there is no according getter function, so users would have to track the current interpolation method manually. To remedy this, we introduce `imagegetinterpolation()` as thin wrapper for `gdImageGetInterpolationMethod()` (which has been introduced with libgd 2.1.1), and use `im->interpolation_id` as fallback for older libgd. Since our bundled libgd does not yet have this function, we add it. We also simplify the recently introduced bug79068.phpt, where it is sufficient to check that the interpolation method has not been changed.
2020-01-06 19:49:07 +08:00
PHP_FUNCTION(imagegetinterpolation)
{
zval *IM;
gdImagePtr im;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O", &IM, gd_image_ce) == FAILURE) {
RETURN_THROWS();
}
im = php_gd_libgdimageptr_from_zval_p(IM);
#ifdef HAVE_GD_GET_INTERPOLATION
RETURN_LONG(gdImageGetInterpolationMethod(im));
#else
RETURN_LONG(im->interpolation_id);
#endif
}
/* }}} */
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Set the default interpolation method, passing -1 or 0 sets it to the libgd default (bilinear). */
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
PHP_FUNCTION(imagesetinterpolation)
{
zval *IM;
gdImagePtr im;
master renames phase 1
2014-08-26 01:24:55 +08:00
zend_long method = GD_BILINEAR_FIXED;
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|l", &IM, gd_image_ce, &method) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
- add new interpolation method . imagescale . imageaffine . replace imagerotate with new generic and optimized new implementations . imagesetinterpolationmethod, to set the default interpolation to be used with the new functions . add imagepalettetotruecolor
2013-03-20 14:46:59 +08:00
if (method == -1) {
method = GD_BILINEAR_FIXED;
}
RETURN_BOOL(gdImageSetInterpolationMethod(im, (gdInterpolationMethod) method));
}
/* }}} */
- add image flip API support
2013-02-27 17:39:25 +08:00
Remove proto comments from C files Closes GH-5758
2020-07-01 21:32:55 +08:00
/* {{{ Get or set the resolution of the image in DPI. */
Add PHP bindings for setting and getting the image resolution We expose the image resolution related GD functionality to userland by introducing `imageresolution()` as getter/setter. Given only the image argument, it returns the current resolution as indexed array. Given only a second argument, it sets the horizontal and vertical resolution to this value. Given three arguments, it sets the horizontal and vertical resolution to the given arguments, respectively.
2016-09-20 04:48:22 +08:00
PHP_FUNCTION(imageresolution)
{
zval *IM;
gdImagePtr im;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
zend_long res_x, res_y;
zend_bool res_x_is_null = 1, res_y_is_null = 1;
Add PHP bindings for setting and getting the image resolution We expose the image resolution related GD functionality to userland by introducing `imageresolution()` as getter/setter. Given only the image argument, it returns the current resolution as indexed array. Given only a second argument, it sets the horizontal and vertical resolution to this value. Given three arguments, it sets the horizontal and vertical resolution to the given arguments, respectively.
2016-09-20 04:48:22 +08:00
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|l!l!", &IM, gd_image_ce, &res_x, &res_x_is_null, &res_y, &res_y_is_null) == FAILURE) {
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
RETURN_THROWS();
Add PHP bindings for setting and getting the image resolution We expose the image resolution related GD functionality to userland by introducing `imageresolution()` as getter/setter. Given only the image argument, it returns the current resolution as indexed array. Given only a second argument, it sets the horizontal and vertical resolution to this value. Given three arguments, it sets the horizontal and vertical resolution to the given arguments, respectively.
2016-09-20 04:48:22 +08:00
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
im = php_gd_libgdimageptr_from_zval_p(IM);
Add PHP bindings for setting and getting the image resolution We expose the image resolution related GD functionality to userland by introducing `imageresolution()` as getter/setter. Given only the image argument, it returns the current resolution as indexed array. Given only a second argument, it sets the horizontal and vertical resolution to this value. Given three arguments, it sets the horizontal and vertical resolution to the given arguments, respectively.
2016-09-20 04:48:22 +08:00
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (!res_x_is_null && !res_y_is_null) {
gdImageSetResolution(im, res_x, res_y);
RETURN_TRUE;
} else if (!res_x_is_null && res_y_is_null) {
gdImageSetResolution(im, res_x, res_x);
RETURN_TRUE;
} else if (res_x_is_null && !res_y_is_null) {
gdImageSetResolution(im, res_y, res_y);
RETURN_TRUE;
Add PHP bindings for setting and getting the image resolution We expose the image resolution related GD functionality to userland by introducing `imageresolution()` as getter/setter. Given only the image argument, it returns the current resolution as indexed array. Given only a second argument, it sets the horizontal and vertical resolution to this value. Given three arguments, it sets the horizontal and vertical resolution to the given arguments, respectively.
2016-09-20 04:48:22 +08:00
}
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
array_init(return_value);
add_next_index_long(return_value, gdImageResolutionX(im));
add_next_index_long(return_value, gdImageResolutionY(im));
Add PHP bindings for setting and getting the image resolution We expose the image resolution related GD functionality to userland by introducing `imageresolution()` as getter/setter. Given only the image argument, it returns the current resolution as indexed array. Given only a second argument, it sets the horizontal and vertical resolution to this value. Given three arguments, it sets the horizontal and vertical resolution to the given arguments, respectively.
2016-09-20 04:48:22 +08:00
}
/* }}} */
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
/*********************************************************
*
* Stream Handling
* Formerly contained within ext/gd/gd_ctx.c and included
* at the the top of this file
*
********************************************************/
#define CTX_PUTC(c,ctx) ctx->putC(ctx, c)
static void _php_image_output_putc(struct gdIOCtx *ctx, int c) /* {{{ */
{
/* without the following downcast, the write will fail
* (i.e., will write a zero byte) for all
* big endian architectures:
*/
unsigned char ch = (unsigned char) c;
php_write(&ch, 1);
} /* }}} */
static int _php_image_output_putbuf(struct gdIOCtx *ctx, const void* buf, int l) /* {{{ */
{
return php_write((void *)buf, l);
} /* }}} */
static void _php_image_output_ctxfree(struct gdIOCtx *ctx) /* {{{ */
{
if(ctx) {
efree(ctx);
}
} /* }}} */
static void _php_image_stream_putc(struct gdIOCtx *ctx, int c) /* {{{ */ {
char ch = (char) c;
php_stream * stream = (php_stream *)ctx->data;
php_stream_write(stream, &ch, 1);
} /* }}} */
static int _php_image_stream_putbuf(struct gdIOCtx *ctx, const void* buf, int l) /* {{{ */
{
php_stream * stream = (php_stream *)ctx->data;
return php_stream_write(stream, (void *)buf, l);
} /* }}} */
static void _php_image_stream_ctxfree(struct gdIOCtx *ctx) /* {{{ */
{
if(ctx->data) {
ctx->data = NULL;
}
if(ctx) {
efree(ctx);
}
} /* }}} */
static void _php_image_stream_ctxfreeandclose(struct gdIOCtx *ctx) /* {{{ */
{
if(ctx->data) {
php_stream_close((php_stream *) ctx->data);
ctx->data = NULL;
}
if(ctx) {
efree(ctx);
}
} /* }}} */
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
static gdIOCtx *create_stream_context_from_zval(zval *to_zval) {
php_stream *stream;
int close_stream = 1;
if (Z_TYPE_P(to_zval) == IS_RESOURCE) {
php_stream_from_zval_no_verify(stream, to_zval);
if (stream == NULL) {
return NULL;
}
close_stream = 0;
} else if (Z_TYPE_P(to_zval) == IS_STRING) {
if (CHECK_ZVAL_NULL_PATH(to_zval)) {
zend_argument_type_error(2, "must not contain null bytes");
return NULL;
}
stream = php_stream_open_wrapper(Z_STRVAL_P(to_zval), "wb", REPORT_ERRORS|IGNORE_PATH|IGNORE_URL_WIN, NULL);
if (stream == NULL) {
return NULL;
}
} else {
zend_argument_type_error(2, "must be a file name or a stream resource, %s given", zend_zval_type_name(to_zval));
return NULL;
}
return create_stream_context(stream, close_stream);
}
static gdIOCtx *create_stream_context(php_stream *stream, int close_stream) {
gdIOCtx *ctx = ecalloc(1, sizeof(gdIOCtx));
ctx->putC = _php_image_stream_putc;
ctx->putBuf = _php_image_stream_putbuf;
if (close_stream) {
ctx->gd_free = _php_image_stream_ctxfreeandclose;
} else {
ctx->gd_free = _php_image_stream_ctxfree;
}
ctx->data = (void *)stream;
return ctx;
}
static gdIOCtx *create_output_context() {
gdIOCtx *ctx = ecalloc(1, sizeof(gdIOCtx));
ctx->putC = _php_image_output_putc;
ctx->putBuf = _php_image_output_putbuf;
ctx->gd_free = _php_image_output_ctxfree;
return ctx;
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
static void _php_image_output_ctx(INTERNAL_FUNCTION_PARAMETERS, int image_type, char *tn, void (*func_p)())
{
zval *imgind;
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
zend_long quality = -1, basefilter = -1;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
gdImagePtr im;
gdIOCtx *ctx = NULL;
zval *to_zval = NULL;
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (image_type == PHP_GDIMG_TYPE_GIF) {
Fix the default value handling of imagegif()
2020-07-31 16:01:08 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|z!", &imgind, gd_image_ce, &to_zval) == FAILURE) {
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
RETURN_THROWS();
}
} else if (image_type == PHP_GDIMG_TYPE_PNG) {
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|z!ll", &imgind, gd_image_ce, &to_zval, &quality, &basefilter) == FAILURE) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
RETURN_THROWS();
}
} else {
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (zend_parse_parameters(ZEND_NUM_ARGS(), "O|z!l", &imgind, gd_image_ce, &to_zval, &quality) == FAILURE) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
RETURN_THROWS();
}
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
}
im = php_gd_libgdimageptr_from_zval_p(imgind);
Fix UNKNOWN default values in ext/mbstring and ext/gd Closes GH-5598
2020-05-19 02:32:21 +08:00
if (to_zval != NULL) {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
ctx = create_stream_context_from_zval(to_zval);
if (!ctx) {
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
RETURN_FALSE;
}
} else {
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
ctx = create_output_context();
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
}
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
switch (image_type) {
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
case PHP_GDIMG_TYPE_JPG:
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
(*func_p)(im, ctx, (int) quality);
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
break;
case PHP_GDIMG_TYPE_WEBP:
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
if (quality == -1) {
quality = 80;
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
}
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
(*func_p)(im, ctx, (int) quality);
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
break;
case PHP_GDIMG_TYPE_PNG:
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
(*func_p)(im, ctx, (int) quality, (int) basefilter);
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
break;
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
case PHP_GDIMG_TYPE_GIF:
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
(*func_p)(im, ctx);
break;
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
EMPTY_SWITCH_DEFAULT_CASE()
Convert GD Resources to objects
2019-09-28 01:47:24 +08:00
}
ctx->gd_free(ctx);
RETURN_TRUE;
}
Explode _php_image_output_ctx() into multiple functions Closes GH-5844
2020-07-06 17:28:10 +08:00
Use ZEND_THROWS() during ZPP in the GD, gettext, GMP, and hash extensions
2019-12-31 01:20:30 +08:00
/* }}} */
Reference in New Issue Copy Permalink