Skip to content

Commit ec7250f

Browse files
committed
Merge commit '1ec484d' into PHP-5.5
* commit '1ec484d': - add imageaffinematrixget and imagematrixconcat - add affine matrix helper for translate, scale, rotate and shear - fix unix build - add new files for interpolation - config.m4 sync with .w32 - 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
2 parents aa2b548 + 1ec484d commit ec7250f

File tree

8 files changed

+3556
-10
lines changed

8 files changed

+3556
-10
lines changed

ext/gd/config.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ if test "$PHP_GD" = "yes"; then
298298
libgd/gdcache.c libgd/gdkanji.c libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c \
299299
libgd/gd_topal.c libgd/gd_gif_in.c libgd/xbm.c libgd/gd_gif_out.c libgd/gd_security.c \
300300
libgd/gd_filter.c libgd/gd_pixelate.c libgd/gd_arc.c libgd/gd_rotate.c libgd/gd_color.c \
301-
libgd/gd_transform.c libgd/gd_crop.c"
301+
libgd/gd_transform.c libgd/gd_crop.c libgd/gd_interpolation.c libgd/gd_matrix.c"
302302

303303
dnl check for fabsf and floorf which are available since C99
304304
AC_CHECK_FUNCS(fabsf floorf)

ext/gd/config.w32

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ if (PHP_GD != "no") {
4848
gd_io_file.c gd_io_ss.c gd_jpeg.c gdkanji.c gd_png.c gd_ss.c \
4949
gdtables.c gd_topal.c gd_wbmp.c gdxpm.c wbmp.c xbm.c gd_security.c gd_transform.c \
5050
gd_filter.c gd_pixelate.c gd_arc.c gd_rotate.c gd_color.c webpimg.c gd_webp.c \
51-
gd_crop.c", "gd");
51+
gd_crop.c gd_interpolation.c gd_matrix.c", "gd");
5252
AC_DEFINE('HAVE_LIBGD', 1, 'GD support');
5353
ADD_FLAG("CFLAGS_GD", " \
5454
/D HAVE_GD_DYNAMIC_CTX_EX=1 \
@@ -84,7 +84,7 @@ if (PHP_GD != "no") {
8484
");
8585

8686
PHP_INSTALL_HEADERS("", "ext/gd ext/gd/libgd" );
87-
} else {
87+
} else {
8888
WARNING("gd not enabled; libraries and headers not found");
8989
}
9090
}

0 commit comments

Comments
 (0)