Ondřej Surý
bfbbf3c9f2
Fix E_ERROR -> GD_ERROR in JPEG_DEBUG blocks of gd_jpeg.c
2013-04-23 10:39:47 +02:00
Ondřej Surý
0e41ffa619
Correct the dllimport which should be used for applications
2013-04-23 08:16:49 +02:00
Pierre Joye
cd2921d8d9
fix build on windows
2013-04-23 07:58:24 +02:00
Pierre Joye
62285f7411
fix static build on windows
2013-04-23 07:57:46 +02:00
Pierre Joye
6d30fb875a
add gd_xbm.c
2013-04-23 07:57:30 +02:00
Pierre Joye
9150e4ff8b
fix windows build
2013-04-23 07:49:25 +02:00
Ondřej Surý
c60d9fe577
Unify the Win32 check to _WIN32 check which is defined by both VC and MinGW
2013-04-23 06:03:59 +02:00
Ondřej Surý
3f2813e139
Fix type GD_STDCALL -> BGD_STDCALL
2013-04-23 05:39:28 +02:00
Ondřej Surý
173bd59082
Fix Win32 build regression and also fix Win32 static build in one go. Also define new BGD_STDCALL __stdcall on Win32 and use it in other source files.
2013-04-23 05:37:36 +02:00
Ondřej Surý
b4b3e60a2c
Define BGDWIN32 on MinGW when using autotools
2013-04-23 05:36:16 +02:00
Ondřej Surý
302d124c9b
Remove duplicate -DBGDWIN32
2013-04-23 05:35:52 +02:00
Takeshi Abe
85c3b7e7df
it shoud be gd_error_ex
2013-04-23 11:09:17 +09:00
Ondřej Surý
444555faab
Rework the visibility #ifdef and #define block ( fixes #27 )
2013-04-23 00:00:24 +02:00
Ondřej Surý
36d5f8a75a
Don't output jpeg error_message directly, but format it first and push it to gd_error_ex(GD_ERROR, ...)
2013-04-22 23:32:50 +02:00
Ondřej Surý
35ce262dd4
One more gdTestAssert return value check
2013-04-22 23:15:45 +02:00
Ondřej Surý
38a121e9c4
Fix reverted error detection logic regression in png_resolution.c
2013-04-22 23:13:21 +02:00
Ondřej Surý
1a3f355f6a
Fix some unchecked values and possibly dereferenced null pointers in tests/
2013-04-22 23:08:20 +02:00
Ondřej Surý
8ecfbd0359
Merged in vapier/gd (pull request #6 )
...
misc minor fixes
2013-04-22 22:31:55 +02:00
Mike Frysinger
0cf194bd6e
fix jpeg emit callback prototype
...
Building with libjpeg-turbo-1.2.1 yields this warning:
gd_jpeg.c: In function 'gdImageCreateFromJpegCtxEx':
gd_jpeg.c:373:26: warning: assignment from incompatible pointer type [enabled by default]
cinfo.err->emit_message = jpeg_emit_message;
^
Looking at older jpeg releases (v6 & v8), it seems that this func has
always expected to have a "void" return value, not "long".
2013-04-22 15:37:04 -04:00
Mike Frysinger
ac33a3a6f1
fix implicit memset decl
...
Need to include string.h to get the memset prototype:
gd_color_match.c: In function 'gdImageColorMatch':
gd_color_match.c:32:2: warning: incompatible implicit declaration of built-in function 'memset' [enabled by default]
memset (buf, 0, sizeof(unsigned long) * 5 * im2->colorsTotal );
^
2013-04-22 15:33:57 -04:00
Mike Frysinger
bcffeea313
ignore more test artifacts
2013-04-22 15:23:29 -04:00
Mike Frysinger
d7a0e79f13
gd_xbm: fix fortify warning
...
When glibc fortify is enabled, we get this warning:
gd_xbm.c: In function 'gdCtxPrintf':
gd_xbm.c:150:2: warning: passing argument 1 of 'vsnprintf' from incompatible pointer type [enabled by default]
len = vsnprintf(&buf, sizeof(buf)-1, format, args);
^
In file included from /usr/include/stdio.h:937:0,
from gd_xbm.c:5:
/usr/include/bits/stdio2.h:74:42: note: expected 'char * __restrict__' but argument is of type 'char (*)[4096]'
__NTH (vsnprintf (char *__restrict __s, size_t __n,
^
Since &buf and buf are in practice the same pointer with arrays like
this, drop the & to fix the warning.
2013-04-22 15:20:17 -04:00
Ondřej Surý
da63a5af38
Ignore output files from tests/jpeg/jpeg_read.c
2013-04-22 20:37:02 +02:00
Ondřej Surý
04d39085e6
Merged in php-libgd (pull request #3 )
...
Merge missing functions to compile PHP GD library
2013-04-22 20:32:16 +02:00
Ondřej Surý
73cab5d8af
Use gdtest helper functions in jpeg/jpeg_read.c
2013-04-22 18:32:32 +02:00
Ondřej Surý
be262a9197
Cleanup gdtest functions to actually report usefull information.
2013-04-22 18:32:13 +02:00
Ondřej Surý
83f5b748c3
Make tests less chatty; silence them using our shiny new gdSetErrorMethod
2013-04-22 17:16:44 +02:00
Ondřej Surý
f3375cbc33
Gd2 functions need LIBZ
2013-04-22 16:43:39 +02:00
Ondřej Surý
5eef0f81bc
Don't open and close output file, without PNG or JPEG support
2013-04-22 16:43:39 +02:00
Ondřej Surý
fe2b2df68f
Don't use undeclared exit()
2013-04-22 16:43:39 +02:00
Ondřej Surý
632b0c221b
Conditionally compile tests in src/
2013-04-22 16:43:39 +02:00
Ondřej Surý
f4b6a978e3
Disable warning when PNG support is disabled
2013-04-22 16:43:39 +02:00
Ondřej Surý
9f15e879db
Some jpeg tests required LIBPNG
2013-04-22 16:43:39 +02:00
Ondřej Surý
5902acd90e
Make test build more resilient to top_builddir changes
2013-04-22 16:43:39 +02:00
Ondřej Surý
19ef54926c
Don't use gd_error outside of main library
2013-04-22 16:43:39 +02:00
Ondřej Surý
5b5f365499
Build and check all tests from tests/ subdirectory in the make check target
2013-04-22 16:43:39 +02:00
Remi Collet
8f475527ec
refresh images used by tests, fix gdimageline_aa test
2013-04-22 15:27:27 +02:00
Remi Collet
2efa4876cd
Merge branch 'master' of bitbucket.org:libgd/gd-libgd
2013-04-22 15:23:46 +02:00
Remi Collet
bf14585e5a
fix color order in bmp_read_palette, fix bmp_im2im test
2013-04-22 15:23:33 +02:00
Ondřej Surý
f7178323d2
Fix conflicting declaration of gdFontTiny
2013-04-22 15:11:32 +02:00
Ondřej Surý
d93e499263
Improve gd_error -> gd_error_ex usage
2013-04-22 15:11:24 +02:00
Remi Collet
69aaf712d5
Merge branch 'master' of bitbucket.org:libgd/gd-libgd
2013-04-22 08:59:20 +02:00
Takeshi Abe
ea9da302f9
fix typo
2013-04-22 15:52:12 +09:00
Ondřej Surý
948a154266
Merge gdImageColorMatch from php-libgd
2013-04-22 08:44:21 +02:00
Ondřej Surý
decf4407d4
Merge PHP libgd Xbm code
2013-04-22 08:44:21 +02:00
Ondřej Surý
6193c7c3b1
Add some missing #defines from php-libgd
2013-04-22 08:37:34 +02:00
Ondřej Surý
3edc61ae82
Replace debug printf( with gd_error_ex(E_DEBUG,
2013-04-22 08:37:34 +02:00
Ondřej Surý
3e01b43649
Add gdImageCreate*Ex functions to support extra PHP call
2013-04-22 08:37:33 +02:00
Ondřej Surý
88d42fd224
Merged in remicollet/gd-libgd/issue-warnings (pull request #5 )
...
gd_color_map.c:765:52: warning: redeclaration of 'GD_COLOR_MAP_X11' with different visibility (old visibility preserved) [enabled by default]
2013-04-22 08:36:41 +02:00
Remi Collet
f50c24e467
fix: -Wunused-function (keep code for now, but don't build)
2013-04-21 19:12:05 +02:00