summaryrefslogtreecommitdiff
path: root/Build/source/libs/gd
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2015-01-15 07:50:55 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2015-01-15 07:50:55 +0000
commitbb3f6eb79fcb90e229c175394728f5f8ed603c46 (patch)
treeb3d4ef49fa081dad81fb7b083cf4aaadc1089fc3 /Build/source/libs/gd
parent1d8d65cd3d09299d88efe342a49366834fc76eb9 (diff)
libs/gd: Build fix for Visual Studio 2010 (from Akira)
git-svn-id: svn://tug.org/texlive/trunk@36060 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/gd')
-rw-r--r--Build/source/libs/gd/libgd-2.1.1-PATCHES/ChangeLog5
-rw-r--r--Build/source/libs/gd/libgd-2.1.1-PATCHES/patch-04-double-semicolon45
-rw-r--r--Build/source/libs/gd/libgd-2.1.1/src/gd.c4
-rw-r--r--Build/source/libs/gd/libgd-2.1.1/src/gd_interpolation.c2
-rw-r--r--Build/source/libs/gd/libgd-2.1.1/src/gd_matrix.c2
5 files changed, 54 insertions, 4 deletions
diff --git a/Build/source/libs/gd/libgd-2.1.1-PATCHES/ChangeLog b/Build/source/libs/gd/libgd-2.1.1-PATCHES/ChangeLog
index f4dc178903b..bb889a51005 100644
--- a/Build/source/libs/gd/libgd-2.1.1-PATCHES/ChangeLog
+++ b/Build/source/libs/gd/libgd-2.1.1-PATCHES/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-15 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * patch-04-double-semicolon: Build fix for Visual Studio 2010,
+ from Akira Kakuto <kakuto@fuk.kindai.ac.jp>.
+
2015-01-14 Peter Breitenlohner <peb@mppmu.mpg.de>
Imported libgd-2.1.1 source tree from:
diff --git a/Build/source/libs/gd/libgd-2.1.1-PATCHES/patch-04-double-semicolon b/Build/source/libs/gd/libgd-2.1.1-PATCHES/patch-04-double-semicolon
new file mode 100644
index 00000000000..bd6cbb16e41
--- /dev/null
+++ b/Build/source/libs/gd/libgd-2.1.1-PATCHES/patch-04-double-semicolon
@@ -0,0 +1,45 @@
+diff -ur libgd-2.1.1.orig/src/gd.c libgd-2.1.1/src/gd.c
+--- libgd-2.1.1.orig/src/gd.c 2015-01-06 10:16:03.000000000 +0100
++++ libgd-2.1.1/src/gd.c 2015-01-15 08:43:16.599168819 +0100
+@@ -2060,7 +2060,7 @@
+ int alphablending_bak;
+
+ /* stack of filled segments */
+- /* struct seg stack[FILL_MAX],*sp = stack;; */
++ /* struct seg stack[FILL_MAX],*sp = stack; */
+ struct seg *stack;
+ struct seg *sp;
+
+@@ -3631,7 +3631,7 @@
+ for (x = 0; x < sx; x++) {
+ const unsigned char c = *(src_row + x);
+ if (c == src->transparent) {
+- *(dst_row + x) = gdTrueColorAlpha(0, 0, 0, 127);;
++ *(dst_row + x) = gdTrueColorAlpha(0, 0, 0, 127);
+ } else {
+ *(dst_row + x) = gdTrueColorAlpha(src->red[c], src->green[c], src->blue[c], src->alpha[c]);
+ }
+diff -ur libgd-2.1.1.orig/src/gd_interpolation.c libgd-2.1.1/src/gd_interpolation.c
+--- libgd-2.1.1.orig/src/gd_interpolation.c 2015-01-06 10:16:03.000000000 +0100
++++ libgd-2.1.1/src/gd_interpolation.c 2015-01-15 08:43:16.599168819 +0100
+@@ -1047,7 +1047,7 @@
+ {
+ const unsigned int src_width = src->sx;
+ const unsigned int src_height = src->sy;
+- gdImagePtr tmp_im = NULL;;
++ gdImagePtr tmp_im = NULL;
+ gdImagePtr dst = NULL;
+
+ /* First, handle the trivial case. */
+diff -ur libgd-2.1.1.orig/src/gd_matrix.c libgd-2.1.1/src/gd_matrix.c
+--- libgd-2.1.1.orig/src/gd_matrix.c 2015-01-06 10:16:03.000000000 +0100
++++ libgd-2.1.1/src/gd_matrix.c 2015-01-15 08:43:16.599168819 +0100
+@@ -248,7 +248,7 @@
+ BGD_DECLARE(int) gdAffineShearVertical(double dst[6], const double angle)
+ {
+ dst[0] = 1;
+- dst[1] = tan(angle * M_PI / 180.0);;
++ dst[1] = tan(angle * M_PI / 180.0);
+ dst[2] = 0;
+ dst[3] = 1;
+ dst[4] = 0;
diff --git a/Build/source/libs/gd/libgd-2.1.1/src/gd.c b/Build/source/libs/gd/libgd-2.1.1/src/gd.c
index cc698a0923f..053873b4d97 100644
--- a/Build/source/libs/gd/libgd-2.1.1/src/gd.c
+++ b/Build/source/libs/gd/libgd-2.1.1/src/gd.c
@@ -2060,7 +2060,7 @@ BGD_DECLARE(void) gdImageFill(gdImagePtr im, int x, int y, int nc)
int alphablending_bak;
/* stack of filled segments */
- /* struct seg stack[FILL_MAX],*sp = stack;; */
+ /* struct seg stack[FILL_MAX],*sp = stack; */
struct seg *stack;
struct seg *sp;
@@ -3631,7 +3631,7 @@ BGD_DECLARE(int) gdImagePaletteToTrueColor(gdImagePtr src)
for (x = 0; x < sx; x++) {
const unsigned char c = *(src_row + x);
if (c == src->transparent) {
- *(dst_row + x) = gdTrueColorAlpha(0, 0, 0, 127);;
+ *(dst_row + x) = gdTrueColorAlpha(0, 0, 0, 127);
} else {
*(dst_row + x) = gdTrueColorAlpha(src->red[c], src->green[c], src->blue[c], src->alpha[c]);
}
diff --git a/Build/source/libs/gd/libgd-2.1.1/src/gd_interpolation.c b/Build/source/libs/gd/libgd-2.1.1/src/gd_interpolation.c
index a829d4f2d9e..84cf92a0b89 100644
--- a/Build/source/libs/gd/libgd-2.1.1/src/gd_interpolation.c
+++ b/Build/source/libs/gd/libgd-2.1.1/src/gd_interpolation.c
@@ -1047,7 +1047,7 @@ gdImageScaleTwoPass(const gdImagePtr src, const unsigned int new_width,
{
const unsigned int src_width = src->sx;
const unsigned int src_height = src->sy;
- gdImagePtr tmp_im = NULL;;
+ gdImagePtr tmp_im = NULL;
gdImagePtr dst = NULL;
/* First, handle the trivial case. */
diff --git a/Build/source/libs/gd/libgd-2.1.1/src/gd_matrix.c b/Build/source/libs/gd/libgd-2.1.1/src/gd_matrix.c
index 182ea35b546..b7827a07034 100644
--- a/Build/source/libs/gd/libgd-2.1.1/src/gd_matrix.c
+++ b/Build/source/libs/gd/libgd-2.1.1/src/gd_matrix.c
@@ -248,7 +248,7 @@ BGD_DECLARE(int) gdAffineShearHorizontal(double dst[6], const double angle)
BGD_DECLARE(int) gdAffineShearVertical(double dst[6], const double angle)
{
dst[0] = 1;
- dst[1] = tan(angle * M_PI / 180.0);;
+ dst[1] = tan(angle * M_PI / 180.0);
dst[2] = 0;
dst[3] = 1;
dst[4] = 0;