Conversion fixes

helly25 · helly25 · commit 65eb0d81258f · 2002-11-29T01:44:19.000Z
diff --git a/ext/gd/libgd/gd.c b/ext/gd/libgd/gd.c
@@ -1092,7 +1092,7 @@ gdImageDashedLine (gdImagePtr im, int x1, int y1, int x2, int y2, int color)
   else
     {
       /* More-or-less vertical. use wid for horizontal stroke */
-      wid = thick * sin (atan2 (dy, dx));
+      wid = (int)(thick * sin (atan2 (dy, dx)));
       vert = 0;
 
       d = 2 * dx - dy;
diff --git a/ext/gd/libgd/gd_jpeg.c b/ext/gd/libgd/gd_jpeg.c
@@ -812,7 +812,7 @@ term_destination (j_compress_ptr cinfo)
   /* Write any data remaining in the buffer */
   if (datacount > 0)
     {
-      if (gdPutBuf (dest->buffer, datacount, dest->outfile) != datacount)
+      if ((size_t)gdPutBuf (dest->buffer, datacount, dest->outfile) != datacount)
 	ERREXIT (cinfo, JERR_FILE_WRITE);
     }
 }
diff --git a/ext/gd/libgd/gdft.c b/ext/gd/libgd/gdft.c
@@ -26,6 +26,10 @@ extern int access(const char *pathname, int mode);
 #endif
 
 /* number of antialised colors for indexed bitmaps */
+/* overwrite Windows GDI define in case of windows build */
+#ifdef NUMCOLORS
+#undef NUMCOLORS
+#endif
 #define NUMCOLORS 8
 
 char *
@@ -880,8 +884,8 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist,
       if (ch == '\r')
 	{
 	  penf.x = 0;
-	  x1 = (penf.x * cos_a - penf.y * sin_a + 32) / 64;
-	  y1 = (penf.x * sin_a + penf.y * cos_a + 32) / 64;
+	  x1 = (int)(penf.x * cos_a - penf.y * sin_a + 32) / 64;
+	  y1 = (int)(penf.x * sin_a + penf.y * cos_a + 32) / 64;
 	  pen.x = pen.y = 0;
 	  previous = 0;		/* clear kerning flag */
 	  next++;
@@ -890,10 +894,10 @@ gdImageStringFTEx (gdImage * im, int *brect, int fg, char *fontlist,
       /* newlines */
       if (ch == '\n')
 	{
-	  penf.y -= face->size->metrics.height * linespace;
+	  penf.y -= (long)(face->size->metrics.height * linespace);
 	  penf.y = (penf.y - 32) & -64;		/* round to next pixel row */
-	  x1 = (penf.x * cos_a - penf.y * sin_a + 32) / 64;
-	  y1 = (penf.x * sin_a + penf.y * cos_a + 32) / 64;
+	  x1 = (int)(penf.x * cos_a - penf.y * sin_a + 32) / 64;
+	  y1 = (int)(penf.x * sin_a + penf.y * cos_a + 32) / 64;
 	  pen.x = pen.y = 0;
 	  previous = 0;		/* clear kerning flag */
 	  next++;

Original file line number	Diff line number	Diff line change
`@@ -1092,7 +1092,7 @@ gdImageDashedLine (gdImagePtr im, int x1, int y1, int x2, int y2, int color)`
`1092`	`1092`	`else`
`1093`	`1093`	`{`
`1094`	`1094`	`/* More-or-less vertical. use wid for horizontal stroke */`
`1095`		`- wid = thick * sin (atan2 (dy, dx));`
	`1095`	`+ wid = (int)(thick * sin (atan2 (dy, dx)));`
`1096`	`1096`	`vert = 0;`
`1097`	`1097`
`1098`	`1098`	`d = 2 * dx - dy;`
Original file line number	Diff line number	Diff line change
`@@ -812,7 +812,7 @@ term_destination (j_compress_ptr cinfo)`
`812`	`812`	`/* Write any data remaining in the buffer */`
`813`	`813`	`if (datacount > 0)`
`814`	`814`	`{`
`815`		`- if (gdPutBuf (dest->buffer, datacount, dest->outfile) != datacount)`
	`815`	`+ if ((size_t)gdPutBuf (dest->buffer, datacount, dest->outfile) != datacount)`
`816`	`816`	`ERREXIT (cinfo, JERR_FILE_WRITE);`
`817`	`817`	`}`
`818`	`818`	`}`