Skip to content

[WIP] GD Resources -> Objects #4714

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 12 commits into from
Closed

[WIP] GD Resources -> Objects #4714

Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3d78a0c
Helper file for GD functions
marandall Aug 26, 2019
4f72f7e
Split object file for later use
marandall Sep 24, 2019
60784e2
W32 build
marandall Sep 24, 2019
362b291
W32 build
marandall Sep 24, 2019
921e088
Fixed bad symbol inside W32 ifdef
marandall Sep 24, 2019
7c97e0b
Serialization protection
marandall Sep 25, 2019
cce31cd
Remove unnecessary symbol
marandall Sep 25, 2019
a6fb300
Cleanup unrelated spacing -> tab
marandall Sep 25, 2019
2ca3a01
Merge master
marandall Sep 25, 2019
69a33d6
Re-deleted ctx, new copyright
marandall Sep 25, 2019
1fb3c51
Whitespace, bracket style, resource dec fixes in stubs
marandall Sep 26, 2019
9d0b12e
Moved everything into gd.c
marandall Sep 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ext/gd/config.m4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ dnl Various checks for GD features
PHP_GD_FREETYPE2
PHP_GD_JISX0208

PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared,, \\$(GD_CFLAGS))
PHP_NEW_EXTENSION(gd, gd.c gd_image_object.c $extra_sources, $ext_shared,, \\$(GD_CFLAGS))
PHP_ADD_BUILD_DIR($ext_builddir/libgd)
GD_CFLAGS="-I$ext_srcdir/libgd $GD_CFLAGS"
GD_HEADER_DIRS="ext/gd/ ext/gd/libgd/"
Expand All @@ -183,7 +183,7 @@ dnl Various checks for GD features
AC_DEFINE(HAVE_LIBGD, 1, [ ])
PHP_GD_CHECK_VERSION

PHP_NEW_EXTENSION(gd, gd.c $extra_sources, $ext_shared)
PHP_NEW_EXTENSION(gd, gd.c gd_image_object.c $extra_sources, $ext_shared)
GD_HEADER_DIRS="ext/gd/"
PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [
AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])
Expand All @@ -195,4 +195,4 @@ dnl Various checks for GD features
PHP_SUBST(GDLIB_CFLAGS)
PHP_SUBST(GDLIB_LIBS)
PHP_SUBST(GD_SHARED_LIBADD)
fi
fi
2 changes: 1 addition & 1 deletion ext/gd/config.w32
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if (PHP_GD != "no") {
CHECK_LIB("User32.lib", "gd", PHP_GD);
CHECK_LIB("Gdi32.lib", "gd", PHP_GD);

EXTENSION("gd", "gd.c", null, "-Iext/gd/libgd", "php_gd2.dll");
EXTENSION("gd", "gd.c gd_image_object.c", null, "-Iext/gd/libgd", "php_gd2.dll");
ADD_SOURCES("ext/gd/libgd", "gd2copypal.c gd.c \
gdcache.c gdfontg.c gdfontl.c gdfontmb.c gdfonts.c gdfontt.c \
gdft.c gd_gd2.c gd_gd.c gd_gif_in.c gd_gif_out.c gdhelpers.c gd_io.c gd_io_dp.c \
Expand Down
Loading