cvs: gd /libgd/src circletexttest.c

mattias		Sat Dec 22 08:37:35 2007 UTC

  Modified files:              
    /gd/libgd/src	circletexttest.c 
  Log:
  - ws + cs
  
http://cvs.php.net/viewvc.cgi/gd/libgd/src/circletexttest.c?r1=1.7&r2=1.8&diff_format=u
Index: gd/libgd/src/circletexttest.c
diff -u gd/libgd/src/circletexttest.c:1.7 gd/libgd/src/circletexttest.c:1.8
--- gd/libgd/src/circletexttest.c:1.7	Fri Jan 12 13:00:16 2007
+++ gd/libgd/src/circletexttest.c	Sat Dec 22 08:37:35 2007
@@ -1,73 +1,63 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#	include "config.h"
 #endif
 
 #include <stdio.h>
 #include "gd.h"
 
-int
-main (int argc, char *argv[])
+int main(int argc, char *argv[])
 {
-  /* 2.0.22: can't depend on PNG either  */
+	/* 2.0.22: can't depend on PNG either  */
 #ifndef HAVE_LIBPNG
-  fprintf (stderr, "Requires PNG support, gd was compiled without it\n");
-  exit (0);
+	fprintf(stderr, "Requires PNG support, gd was compiled without it\n");
+	exit(0);
 #else
-  char *error;
-  FILE *in = 0;
-  FILE *out;
-  gdImagePtr im;
-  int radius;
-  /* Create an image of text on a circle, with an
-     alpha channel so that we can copy it onto a
-     background */
-  /* TBB: 2.0.18: shouldn't depend on JPEG */
+	char *error;
+	FILE *in = 0;
+	FILE *out;
+	gdImagePtr im;
+	int radius;
+	/* Create an image of text on a circle, with an
+	 * alpha channel so that we can copy it onto a
+	 * background
+	 * TBB: 2.0.18: shouldn't depend on JPEG
+	 */
 #ifdef HAVE_LIBJPEG
-  in = fopen ("eleanor.jpg", "rb");
-  if (!in)
-    {
-      im = gdImageCreateTrueColor (300, 300);
-    }
-  else
-    {
-      im = gdImageCreateFromJpeg (in);
-      fclose (in);
-    }
+	in = fopen("eleanor.jpg", "rb");
+	if(!in) {
+		im = gdImageCreateTrueColor(300, 300);
+    } else {
+		im = gdImageCreateFromJpeg(in);
+		fclose(in);
+	}
 #else
-  im = gdImageCreateTrueColor (300, 300);
+	im = gdImageCreateTrueColor(300, 300);
 #endif /* HAVE_LIBJPEG */
-  if (gdImageSX (im) < gdImageSY (im))
-    {
-      radius = gdImageSX (im) / 2;
-    }
-  else
-    {
-      radius = gdImageSY (im) / 2;
-    }
-  error = gdImageStringFTCircle (im,
-			 gdImageSX (im) / 2,
-			 gdImageSY (im) / 2,
-			 radius,
-			 radius / 2,
-			 0.8,
-			 "arial",
-			 24,
-			 "top text",
-			 "bottom text",
-			 gdTrueColorAlpha (192, 100, 255, 32));
-  if (error) 
-    {
-      fprintf(stderr, "gdImageStringFTEx error: %s\n", error);
-    }
-  out = fopen ("gdfx.png", "wb");
-  if (!out)
-    {
-      fprintf (stderr, "Can't create gdfx.png\n");
-      return 1;
-    }
-  gdImagePng (im, out);
-  fclose (out);
-  gdImageDestroy (im);
+	if(gdImageSX(im) < gdImageSY(im)) {
+		radius = gdImageSX(im) / 2;
+	} else {
+		radius = gdImageSY(im) / 2;
+	}
+
+	error = gdImageStringFTCircle(im,
+		gdImageSX(im) / 2, gdImageSY(im) / 2,
+		radius, radius / 2,
+		0.8, "arial", 24, "top text", "bottom text",
+		gdTrueColorAlpha(192, 100, 255, 32)
+	);
+	if(error)  {
+		fprintf(stderr, "gdImageStringFTEx error: %s\n", error);
+	}
+
+	out = fopen("gdfx.png", "wb");
+	if(!out) {
+		fprintf(stderr, "Can't create gdfx.png\n");
+		return 1;
+	}
+
+	gdImagePng(im, out);
+	fclose(out);
+	gdImageDestroy(im);
 #endif /* HAVE_LIBPNG */
-  return 0;
+	return 0;
 }