Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ext/gd/libgd/gd.c
Original file line number Diff line number Diff line change
Expand Up @@ -3188,7 +3188,7 @@ int gdImagePaletteToTrueColor(gdImagePtr src)
const unsigned int sx = gdImageSX(src);

// Note: do not revert back to gdMalloc() below ; reason here,
// due to a bug with a certain memory_limit INI value treshold,
// due to a bug with a certain memory_limit INI value threshold,
// imagepalettetotruecolor crashes with even unrelated ZendMM allocations.
// See GH-17772 for a use case.
src->tpixels = (int **) gdCalloc(sy, sizeof(int *));
Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gd.h
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ extern "C" {
pixels are represented by integers, which
must be 32 bits wide or more.

True colors are repsented as follows:
True colors are represented as follows:

ARGB

Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gd_bmp.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ static int _gdImageBmpCtx(gdImagePtr im, gdIOCtxPtr out, int compression){
gdBMPPutInt(out, (compression ? BMP_BI_RLE8 : BMP_BI_RGB)); /* compression */
gdBMPPutInt(out, bitmap_size); /* image size */
gdBMPPutInt(out, 0); /* H resolution */
gdBMPPutInt(out, 0); /* V ressolution */
gdBMPPutInt(out, 0); /* V resolution */
gdBMPPutInt(out, im->colorsTotal); /* colours used */
gdBMPPutInt(out, 0); /* important colours */

Expand Down
6 changes: 3 additions & 3 deletions ext/gd/libgd/gd_interpolation.c
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ typedef struct
{
double *Weights; /* Normalized weights of neighboring pixels */
int Left,Right; /* Bounds of source pixels window */
} ContributionType; /* Contirbution information for a single pixel */
} ContributionType; /* Contribution information for a single pixel */

typedef struct
{
Expand Down Expand Up @@ -481,7 +481,7 @@ static double filter_hermite(const double x1)
return 0.0;
}

/* Trangle filter, default radius 1 */
/* Triangle filter, default radius 1 */
static double filter_triangle(const double x1)
{
const double x = x1 < 0.0 ? -x1 : x1;
Expand Down Expand Up @@ -630,7 +630,7 @@ static double filter_welsh(const double x)
#endif


/* keep it for future usage for affine copy over an existing image, targetting fix for 2.2.2 */
/* keep it for future usage for affine copy over an existing image, targeting fix for 2.2.2 */
#if 0
/* Copied from upstream's libgd */
static inline int _color_blend (const int dst, const int src)
Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gd_tga.c
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ int read_image_tga( gdIOCtx *ctx, oTga *tga )
if (tga->imagetype != TGA_TYPE_RGB && tga->imagetype != TGA_TYPE_RGB_RLE)
return -1;

/*! \brief Allocate memmory for image block
/*! \brief Allocate memory for image block
* Allocate a chunk of memory for the image block to be passed into.
*/
tga->bitmap = (int *) gdMalloc(image_block_size * sizeof(int));
Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gd_tga.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ typedef struct oTga_ {
uint8_t alphabits; // alpha bits (low 4bits of header 17)
uint8_t fliph; // horizontal or vertical
uint8_t flipv; // flip
char *ident; // identifcation tag string
char *ident; // identification tag string
int *bitmap; // bitmap data

} oTga;
Expand Down
2 changes: 1 addition & 1 deletion ext/gd/libgd/gdft.c
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ static void *fontFetch (char **error, void *key)
fontlist = gdEstrdup(a->fontlist);

/*
* Must use gd_strtok_r becasuse strtok() isn't thread safe
* Must use gd_strtok_r because strtok() isn't thread safe
*/
for (name = gd_strtok_r (fontlist, LISTSEPARATOR, &strtok_ptr); name; name = gd_strtok_r (0, LISTSEPARATOR, &strtok_ptr)) {
char *strtok_ptr_path;
Expand Down
Loading