X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fpngsize.c;h=bb75b91da9b98171543749263aa0cc04879f89dd;hb=9e6db622e8756105c1322481b34650ecbe15da1a;hp=121ae66ed9b8249ca75742c98ce51a5f1dfa7f0f;hpb=5837606887a6d81e8b1f7588525cb1c8783fb62b;p=rrdtool.git diff --git a/src/pngsize.c b/src/pngsize.c index 121ae66..bb75b91 100644 --- a/src/pngsize.c +++ b/src/pngsize.c @@ -1,10 +1,11 @@ /***************************************************************************** - * RRDtool 1.0.33 Copyright Tobias Oetiker, 1997 - 2000 + * RRDtool 1.2.14 Copyright by Tobi Oetiker, 1997-2006 ***************************************************************************** * pngsize.c determine the size of a PNG image *****************************************************************************/ #include +#include "rrd_tool.h" int PngSize(FILE *fd, long *width, long *height) @@ -21,6 +22,13 @@ PngSize(FILE *fd, long *width, long *height) (*width)=0; (*height)=0; +/* this is to make compile on aix work since they seem to define jmpbuf + to be _jmpbuf which breaks compilation */ + +#ifdef jmpbuf +#undef jmpbuf +#endif + if (setjmp(png_read_ptr->jmpbuf)){ png_destroy_read_struct(&png_read_ptr, &info_ptr, (png_infopp)NULL); return 0;