cvs: gd /gd-pango/examples japanese.txt rotated.c simple.c

tabe		Sat Jun 14 14:50:24 2008 UTC

  Added files:                 
    /gd/gd-pango/examples	japanese.txt 

  Modified files:              
    /gd/gd-pango/examples	simple.c rotated.c 
  Log:
  added japanese.txt for examples; modified main()'s parameters.
  
http://cvs.php.net/viewvc.cgi/gd/gd-pango/examples/simple.c?r1=1.1&r2=1.2&diff_format=u
Index: gd/gd-pango/examples/simple.c
diff -u gd/gd-pango/examples/simple.c:1.1 gd/gd-pango/examples/simple.c:1.2
--- gd/gd-pango/examples/simple.c:1.1	Fri Dec 22 23:50:39 2006
+++ gd/gd-pango/examples/simple.c	Sat Jun 14 14:50:24 2008
@@ -15,7 +15,7 @@
   | Authors: Pierre-A. Joye <[email protected]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: simple.c,v 1.1 2006/12/22 23:50:39 pajoye Exp $ */
+/* $Id: simple.c,v 1.2 2008/06/14 14:50:24 tabe Exp $ */
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
@@ -43,7 +43,7 @@
 	return text;
 }
 
-void main()
+int main(int argc, char *argv[])
 {
 	gdImagePtr im;
 	char *text;
@@ -64,6 +64,7 @@
 	text = readFile("hebrew.txt");
 	text = readFile("german.txt");
  	text = readFile("english.txt");
+	text = readFile("japanese.txt");
 */
 
 	text = readFile("arabic.txt");
@@ -79,6 +80,7 @@
 	gdPangoSetDefaultColor(context, &default_colors);
 
 	gdPangoSetMarkup(context, text, -1);
+	free(text);
 
 	w = gdPangoGetLayoutWidth(context);
 	h = gdPangoGetLayoutHeight(context);
http://cvs.php.net/viewvc.cgi/gd/gd-pango/examples/rotated.c?r1=1.1&r2=1.2&diff_format=u
Index: gd/gd-pango/examples/rotated.c
diff -u gd/gd-pango/examples/rotated.c:1.1 gd/gd-pango/examples/rotated.c:1.2
--- gd/gd-pango/examples/rotated.c:1.1	Fri Dec 29 14:52:38 2006
+++ gd/gd-pango/examples/rotated.c	Sat Jun 14 14:50:24 2008
@@ -15,7 +15,7 @@
   | Authors: Pierre-A. Joye <[email protected]>                             |
   +----------------------------------------------------------------------+
 */
-/* $Id: rotated.c,v 1.1 2006/12/29 14:52:38 pajoye Exp $ */
+/* $Id: rotated.c,v 1.2 2008/06/14 14:50:24 tabe Exp $ */
 
 #include <pango/pango.h>
 #include <pango/pangoft2.h>
@@ -43,7 +43,7 @@
 	return text;
 }
 
-int main()
+int main(int argc, char *argv[])
 {
 	gdImagePtr im;
 	char *text;
@@ -66,6 +66,7 @@
 	text = readFile("hebrew.txt");
 	text = readFile("german.txt");
  	text = readFile("english.txt");
+	text = readFile("japanese.txt");
 */
 
 	text = readFile("english.txt");
@@ -77,6 +78,7 @@
 
 	gdPangoSetDefaultColor(context, &default_colors);
 	gdPangoSetMarkup(context, text, -1);
+	free(text);
 
 	pangocontext = gdPangoGetPangoContext(context);
 	layout = gdPangoGetPangoLayout(context);

http://cvs.php.net/viewvc.cgi/gd/gd-pango/examples/japanese.txt?view=markup&rev=1.1
Index: gd/gd-pango/examples/japanese.txt
+++ gd/gd-pango/examples/japanese.txt
色は匂へど　散りぬるを
我が世誰そ　常ならむ
有為の奥山　今日越えて
浅き夢見じ　酔ひもせず