libgd
/
libgd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #153 from davidchappelle/master 

A few minor patches for libgd
master
Mike Frysinger 2015-12-23 11:58:31 -05:00
parent 78dad445b3 52dad8b975
commit e08acb0565
3 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -25,6 +25,10 @@ libimagequant-prefix
src/deps.mk
deps
Release_GD
# CMake build directory
/build
# Autotools related files.
*.l[ao]
.deps

6
src/gd_filter.c
View File

@ -15,7 +15,11 @@
#include <time.h>
#include <math.h>
#define NDEBUG /* Uncomment to enable assertions. */
#undef NDEBUG
/* Comment out this line to enable asserts.
* TODO: This logic really belongs in cmake and configure.
*/
#define NDEBUG 1
#include <assert.h>
typedef int (BGD_STDCALL *FuncPtr)(gdImagePtr, int, int);

11
src/gd_interpolation.c
View File

@ -61,9 +61,12 @@ TODO:
#include <stdlib.h>
#include <string.h>
#include <math.h>
#include <assert.h>
#define NDEBUG 1 /* TODO: disable/enable assertions in configure. */
#undef NDEBUG
/* Comment out this line to enable asserts.
* TODO: This logic really belongs in cmake and configure.
*/
#define NDEBUG 1
#include <assert.h>
#include "gd.h"
@ -1634,7 +1637,7 @@ BGD_DECLARE(gdImagePtr) gdImageScale(const gdImagePtr src, const unsigned int ne
{
gdImagePtr im_scaled = NULL;
if (src == NULL || src->interpolation_id < 0 || src->interpolation_id > GD_METHOD_COUNT) {
if (src == NULL || (uintmax_t)src->interpolation_id >= GD_METHOD_COUNT) {
return 0;
}
@ -2515,7 +2518,7 @@ BGD_DECLARE(int) gdTransformAffineBoundingBox(gdRectPtr src, const double affine
BGD_DECLARE(int) gdImageSetInterpolationMethod(gdImagePtr im, gdInterpolationMethod id)
{
if (im == NULL || id < 0 || id > GD_METHOD_COUNT) {
if (im == NULL || id < 0 || (uintmax_t)id > GD_METHOD_COUNT) {
return 0;
}