CS fixes.

1 files changed, 30 insertions, 30 deletions

diff --git a/ext/gd/libgd/gd.h b/ext/gd/libgd/gd.h
index 20f5561378..accc257ebc 100644
--- a/ext/gd/libgd/gd.h
+++ b/ext/gd/libgd/gd.h
@@ -21,8 +21,8 @@ extern "C" {
  * that the above copyright notice appear in all copies and that both that
  * copyright notice and this permission notice appear in supporting
  * documentation.  This software is provided "AS IS." Thomas Boutell and
- * Boutell.Com, Inc. disclaim all warranties, either express or implied, 
- * including but not limited to implied warranties of merchantability and 
+ * Boutell.Com, Inc. disclaim all warranties, either express or implied,
+ * including but not limited to implied warranties of merchantability and
  * fitness for a particular purpose, with respect to this code and accompanying
  * documentation. */
 
@@ -43,19 +43,19 @@ void php_gd_error(const char *format, ...);
 
 /* Image type. See functions below; you will not need to change
 	the elements directly. Use the provided macros to
-	access sx, sy, the color table, and colorsTotal for 
+	access sx, sy, the color table, and colorsTotal for
 	read-only purposes. */
 
-/* If 'truecolor' is set true, the image is truecolor; 
+/* If 'truecolor' is set true, the image is truecolor;
 	pixels are represented by integers, which
-	must be 32 bits wide or more. 
+	must be 32 bits wide or more.
 
 	True colors are repsented as follows:
 
 	ARGB
 
 	Where 'A' (alpha channel) occupies only the
-	LOWER 7 BITS of the MSB. This very small 
+	LOWER 7 BITS of the MSB. This very small
 	loss of alpha channel resolution allows gd 2.x
 	to keep backwards compatibility by allowing
 	signed integers to be used to represent colors,
@@ -78,7 +78,7 @@ void php_gd_error(const char *format, ...);
 #define gdEffectOverlay 3
 
 
-/* This function accepts truecolor pixel values only. The 
+/* This function accepts truecolor pixel values only. The
 	source color is composited with the destination color
 	based on the alpha channel value of the source color.
 	The resulting color is opaque. */
@@ -96,11 +96,11 @@ typedef struct gdImageStruct {
 	int colorsTotal;
 	int red[gdMaxColors];
 	int green[gdMaxColors];
-	int blue[gdMaxColors]; 
+	int blue[gdMaxColors];
 	int open[gdMaxColors];
 	/* For backwards compatibility, this is set to the
 		first palette entry with 100% transparency,
-		and is also set and reset by the 
+		and is also set and reset by the
 		gdImageColorTransparent function. Newer
 		applications can allocate palette entries
 		with any desired level of transparency; however,
@@ -112,7 +112,7 @@ typedef struct gdImageStruct {
 	int *polyInts;
 	int polyAllocated;
 	struct gdImageStruct *brush;
-	struct gdImageStruct *tile;	
+	struct gdImageStruct *tile;
 	int brushColorMap[gdMaxColors];
 	int tileColorMap[gdMaxColors];
 	int styleLength;
@@ -126,10 +126,10 @@ typedef struct gdImageStruct {
 		really support multiple levels of transparency in
 		palettes, to my knowledge, as of 2/15/01. Most
 		common browsers will display 100% opaque and
-		100% transparent correctly, and do something 
+		100% transparent correctly, and do something
 		unpredictable and/or undesirable for levels
 		in between. TBB */
-	int alpha[gdMaxColors]; 
+	int alpha[gdMaxColors];
 	/* Truecolor flag and pixels. New 2.0 fields appear here at the
 		end to minimize breakage of existing object code. */
 	int trueColor;
@@ -137,7 +137,7 @@ typedef struct gdImageStruct {
 	/* Should alpha channel be copied, or applied, each time a
 		pixel is drawn? This applies to truecolor images only.
 		No attempt is made to alpha-blend in palette images,
-		even if semitransparent palette entries exist. 
+		even if semitransparent palette entries exist.
 		To do that, build your image as a truecolor image,
 		then quantize down to 8 bits. */
 	int alphaBlendingFlag;
@@ -147,7 +147,7 @@ typedef struct gdImageStruct {
 		PNG at the moment; other future formats may also
 		have that capability. JPEG doesn't. */
 	int saveAlphaFlag;
-	
+
 
 	/* 2.0.12: anti-aliased globals */
 	int AA;
@@ -156,7 +156,7 @@ typedef struct gdImageStruct {
 	unsigned char **AA_opacity;
 	int AA_polygon;
 	/* Stored and pre-computed variables for determining the perpendicular
-	 * distance from a point to the anti-aliased line being drawn: 
+	 * distance from a point to the anti-aliased line being drawn:
 	 */
 	int AAL_x1;
 	int AAL_y1;
@@ -230,7 +230,7 @@ gdImagePtr gdImageCreateTrueColor(int sx, int sy);
 gdImagePtr gdImageCreateFromPng(FILE *fd);
 gdImagePtr gdImageCreateFromPngCtx(gdIOCtxPtr in);
 gdImagePtr gdImageCreateFromWBMP(FILE *inFile);
-gdImagePtr gdImageCreateFromWBMPCtx(gdIOCtx *infile); 
+gdImagePtr gdImageCreateFromWBMPCtx(gdIOCtx *infile);
 gdImagePtr gdImageCreateFromJpeg(FILE *infile);
 gdImagePtr gdImageCreateFromJpegCtx(gdIOCtx *infile);
 
@@ -264,11 +264,11 @@ void gdImageDestroy(gdImagePtr im);
 
 /* Replaces or blends with the background depending on the
 	most recent call to gdImageAlphaBlending and the
-	alpha channel value of 'color'; default is to overwrite. 
+	alpha channel value of 'color'; default is to overwrite.
 	Tiling and line styling are also implemented
-	here. All other gd drawing functions pass through this call, 
+	here. All other gd drawing functions pass through this call,
 	allowing for many useful effects. */
-	
+
 void gdImageSetPixel(gdImagePtr im, int x, int y, int color);
 
 int gdImageGetPixel(gdImagePtr im, int x, int y);
@@ -296,9 +296,9 @@ void gdImageString16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s
 void gdImageStringUp16(gdImagePtr im, gdFontPtr f, int x, int y, unsigned short *s, int color);
 
 /* 2.0.16: for thread-safe use of gdImageStringFT and friends,
- * call this before allowing any thread to call gdImageStringFT. 
+ * call this before allowing any thread to call gdImageStringFT.
  * Otherwise it is invoked by the first thread to invoke
- * gdImageStringFT, with a very small but real risk of a race condition. 
+ * gdImageStringFT, with a very small but real risk of a race condition.
  * Return 0 on success, nonzero on failure to initialize freetype.
  */
 int gdFontCacheSetup(void);
@@ -347,7 +347,7 @@ typedef struct {
 void gdImagePolygon(gdImagePtr im, gdPointPtr p, int n, int c);
 void gdImageFilledPolygon(gdImagePtr im, gdPointPtr p, int n, int c);
 
-/* These functions still work with truecolor images, 
+/* These functions still work with truecolor images,
 	for which they never return error. */
 int gdImageColorAllocate(gdImagePtr im, int r, int g, int b);
 /* gd 2.0: palette entries with non-opaque transparency are permitted. */
@@ -428,7 +428,7 @@ void gdImagePngCtx(gdImagePtr im, gdIOCtx *out);
 /* 2.0.12: Compression level: 0-9 or -1, where 0 is NO COMPRESSION at all,
  * 1 is FASTEST but produces larger files, 9 provides the best
  * compression (smallest files) but takes a long time to compress, and
- * -1 selects the default compiled into the zlib library. 
+ * -1 selects the default compiled into the zlib library.
  */
 void gdImagePngEx(gdImagePtr im, FILE * out, int level);
 void gdImagePngCtxEx(gdImagePtr im, gdIOCtx * out, int level);
@@ -486,7 +486,7 @@ void gdImageEllipse(gdImagePtr im, int cx, int cy, int w, int h, int c);
 	gdArc and gdChord are mutually exclusive;
 	gdChord just connects the starting and ending
 	angles with a straight line, while gdArc produces
-	a rounded edge. gdPie is a synonym for gdArc. 
+	a rounded edge. gdPie is a synonym for gdArc.
 	gdNoFill indicates that the arc or chord should be
 	outlined, not filled. gdEdged, used together with
 	gdNoFill, indicates that the beginning and ending
@@ -505,7 +505,7 @@ void gdImageFilledEllipse(gdImagePtr im, int cx, int cy, int w, int h, int color
 void gdImageFillToBorder(gdImagePtr im, int x, int y, int border, int color);
 void gdImageFill(gdImagePtr im, int x, int y, int color);
 void gdImageCopy(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int w, int h);
-void gdImageCopyMerge(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, 
+void gdImageCopyMerge(gdImagePtr dst, gdImagePtr src, int dstX, int dstY,
 			int srcX, int srcY, int w, int h, int pct);
 void gdImageCopyMergeGray(gdImagePtr dst, gdImagePtr src, int dstX, int dstY,
                         int srcX, int srcY, int w, int h, int pct);
@@ -521,8 +521,8 @@ void gdImageCopyResized(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int
 	destination pixel, taking into account what portion of the
 	destination pixel each source pixel represents. This is a
 	floating point operation, but this is not a performance issue
-	on modern hardware, except for some embedded devices. If the 
-	destination is a palette image, gdImageCopyResized is 
+	on modern hardware, except for some embedded devices. If the
+	destination is a palette image, gdImageCopyResized is
 	substituted automatically. */
 void gdImageCopyResampled(gdImagePtr dst, gdImagePtr src, int dstX, int dstY, int srcX, int srcY, int dstW, int dstH, int srcW, int srcH);
 
@@ -537,7 +537,7 @@ void gdImageSetTile(gdImagePtr im, gdImagePtr tile);
 void gdImageSetAntiAliased(gdImagePtr im, int c);
 void gdImageSetAntiAliasedDontBlend(gdImagePtr im, int c, int dont_blend);
 void gdImageSetStyle(gdImagePtr im, int *style, int noOfPixels);
-/* Line thickness (defaults to 1). Affects lines, ellipses, 
+/* Line thickness (defaults to 1). Affects lines, ellipses,
 	rectangles, polygons and so forth. */
 void gdImageSetThickness(gdImagePtr im, int thickness);
 /* On or off (1 or 0) for all three of these. */
@@ -582,7 +582,7 @@ gdIOCtx* gdNewDynamicCtx(int, void*);
 gdIOCtx* gdNewSSCtx(gdSourcePtr in, gdSinkPtr out);
 void* gdDPExtractData(struct gdIOCtx* ctx, int *size);
 
-#define GD2_CHUNKSIZE           128 
+#define GD2_CHUNKSIZE           128
 #define GD2_CHUNKSIZE_MIN	64
 #define GD2_CHUNKSIZE_MAX       4096
 
@@ -592,7 +592,7 @@ void* gdDPExtractData(struct gdIOCtx* ctx, int *size);
 #define GD2_FMT_COMPRESSED      2
 
 
-/* filters section 
+/* filters section
  *
  * Negate the imag src, white becomes black,
  * The red, green, and blue intensities of an image are negated.