diff options
Diffstat (limited to 'tests/gdtest/gdtest.c')
| -rw-r--r-- | tests/gdtest/gdtest.c | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/tests/gdtest/gdtest.c b/tests/gdtest/gdtest.c index d173975..832f27a 100644 --- a/tests/gdtest/gdtest.c +++ b/tests/gdtest/gdtest.c @@ -1,4 +1,6 @@ +#ifdef HAVE_CONFIG_H #include <config.h> +#endif #include <assert.h> #include <setjmp.h> #include <stdlib.h> @@ -21,7 +23,14 @@ #endif #ifdef _WIN32 -# include "readdir.h" +#include "readdir.h" +#include <errno.h> +#endif + +/* GDTEST_TOP_DIR is defined in other compile ways except msys + * test_config.h is created by windows/msys/run_test.sh*/ +#ifndef GDTEST_TOP_DIR +#include <test_config.h> #endif #include "gd.h" @@ -59,7 +68,7 @@ gdImagePtr gdTestImageFromPng(const char *filename) if (fp == NULL) { return NULL; } - + image = gdImageCreateFromPng(fp); fclose(fp); return image; @@ -186,11 +195,11 @@ static int getfilesystemtime(struct timeval *tv) fft.LowPart = ft.dwLowDateTime; ff = fft.QuadPart; - ff /= 10Ui64; /* convert to microseconds */ - ff -= 11644473600000000Ui64; /* convert to unix epoch */ + ff /= 10ULL; /* convert to microseconds */ + ff -= 11644473600000000ULL; /* convert to unix epoch */ - tv->tv_sec = (long)(ff / 1000000Ui64); - tv->tv_usec = (long)(ff % 1000000Ui64); + tv->tv_sec = (long)(ff / 1000000ULL); + tv->tv_usec = (long)(ff % 1000000ULL); return 0; } @@ -203,7 +212,7 @@ mkdtemp (char *tmpl) static int counter = 0; char *XXXXXX; struct timeval tv; - _int64 value; + __int64 value; int count; /* find the last occurrence of "XXXXXX" */ @@ -219,7 +228,7 @@ mkdtemp (char *tmpl) value = (tv.tv_usec ^ tv.tv_sec) + counter++; for (count = 0; count < 100; value += 7777, ++count) { - _int64 v = value; + __int64 v = value; /* Fill in the random bits. */ XXXXXX[0] = letters[v % NLETTERS]; @@ -304,7 +313,7 @@ char *gdTestTempFile(const char *template) ret); gdTestAssert(error != 0); } else { - sprintf(ret, "%s\\%s", tempdir, template); + sprintf(ret, "%s\\%s", tempdir, template); } } #else @@ -501,7 +510,6 @@ unsigned int gdMaxPixelDiff(gdImagePtr a, gdImagePtr b) return diff; } - int gdTestImageCompareToImage(const char* file, unsigned int line, const char* message, gdImagePtr expected, gdImagePtr actual) { @@ -561,6 +569,7 @@ int gdTestImageCompareToImage(const char* file, unsigned int line, const char* m if (!fp) goto fail; gdImagePng(surface_diff,fp); fclose(fp); + gdImageDestroy(surface_diff); fp = fopen(file_out, "wb"); if (!fp) goto fail; @@ -578,13 +587,13 @@ fail: if (surface_diff) { gdImageDestroy(surface_diff); } - return 0; + return 1; } int gdTestImageCompareToFile(const char* file, unsigned int line, const char* message, const char *expected_file, gdImagePtr actual) { - gdImagePtr expected; + gdImagePtr expected = 0; int res = 1; expected = gdTestImageFromPng(expected_file); @@ -599,7 +608,6 @@ int gdTestImageCompareToFile(const char* file, unsigned int line, const char* me return res; } - static int failureCount = 0; int gdNumFailures() { |