Skip to content

Fix bundled libgd includes #6975

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 2 commits into from
Closed

Fix bundled libgd includes #6975

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
310d4b2
Fix bundled libgd includes
flavioheleno May 12, 2021
5d50c68
Ensure external libgd support is not broken
flavioheleno May 12, 2021
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
24 changes: 17 additions & 7 deletions ext/gd/gd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,13 +57,23 @@

#include "gd_compat.h"

#include <gd.h>
#include <gd_errors.h>
#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 */
#ifdef HAVE_GD_BUNDLED
# include "libgd/gd.h"
# include "libgd/gd_errors.h"
# include "libgd/gdfontt.h" /* 1 Tiny font */
# include "libgd/gdfonts.h" /* 2 Small font */
# include "libgd/gdfontmb.h" /* 3 Medium bold font */
# include "libgd/gdfontl.h" /* 4 Large font */
# include "libgd/gdfontg.h" /* 5 Giant font */
#else
# include <gd.h>
# include <gd_errors.h>
# 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 */
#endif

#if defined(HAVE_GD_FREETYPE) && defined(HAVE_GD_BUNDLED)
# include <ft2build.h>
Expand Down
3 changes: 2 additions & 1 deletion ext/gd/libgd/gd_crop.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,12 @@
* (end code)
**/

#include <gd.h>
#include <stdlib.h>
#include <string.h>
#include <math.h>

#include "gd.h"

static int gdGuessBackgroundColorFromCorners(gdImagePtr im, int *color);
static int gdColorMatch(gdImagePtr im, int col1, int col2, float threshold);

Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gd_interpolation.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
#include <string.h>
#include <math.h>

#include <gd.h>
#include "gd.h"
#include "gdhelpers.h"

#ifdef _MSC_VER
Expand Down
6 changes: 3 additions & 3 deletions ext/gd/libgd/gd_wbmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@
----------------------------------------------------------------------------
*/

#include <gd.h>
#include <gdfonts.h>
#include <gd_errors.h>
#include <stdio.h>
#include <stdlib.h>
#include <limits.h>

#include "gd.h"
#include "gdfonts.h"
#include "gd_errors.h"
#include "wbmp.h"


Expand Down