Merge branch 'master' into webp-lossless

# Conflicts:
#	tests/webp/.gitignore
#	tests/webp/CMakeLists.txt
#	tests/webp/Makemodule.am

1 files changed, 30 insertions, 0 deletions

diff --git a/tests/gdimagestring16/gdimagestring16.c b/tests/gdimagestring16/gdimagestring16.c
new file mode 100644
index 0000000..0ca0668
--- /dev/null
+++ b/tests/gdimagestring16/gdimagestring16.c
@@ -0,0 +1,30 @@
+/**
+ * Base test for gdImageString16()
+ */
+#include <gd.h>
+#include <gdfontl.h>
+#include "gdtest.h"
+
+int main()
+{
+	/* Declare the image */
+	gdImagePtr im = NULL;
+	unsigned short s[2] = {'H', 0};
+	int foreground;
+	int errorcode = 0;
+	gdFontPtr fontptr = gdFontGetLarge();
+
+	im = gdImageCreate(20, 20);
+	gdImageColorAllocate(im, 255, 255, 255);
+	foreground = gdImageColorAllocate(im, 22, 4, 238);
+
+	gdImageString16(im, fontptr, 2, 2, s, foreground);
+
+	if (!gdAssertImageEqualsToFile("gdimagestring16/gdimagestring16_exp.png", im))
+		errorcode = 1;
+
+	/* Destroy the image in memory */
+	gdImageDestroy(im);
+
+	return errorcode;
+}