cvs: gd(GD_2_0) /libgd/src gdft.c /libgd/src/tests CMakeLists.txt Makefile.am /libgd/src/tests/gdimagestringftex CMakeLists.txt Makefile.am gdimagestringftex_returnfontpathname.c

[email protected] ("Takeshi Abe") Mon, 20 Apr 2009 09:10:09 -0000
Newsgroups php.gd.cvs
Message-ID <cvstabe1240218608@cvsserver>
tabe		Mon Apr 20 09:10:09 2009 UTC

  Added files:                 (Branch: GD_2_0)
    /gd/libgd/src/tests/gdimagestringftex	CMakeLists.txt Makefile.am 
                                         	gdimagestringftex_returnfontpathname.c 

  Modified files:              
    /gd/libgd/src	gdft.c 
    /gd/libgd/src/tests	CMakeLists.txt Makefile.am 
  Log:
  MFH: removed unused assignment to fontpath
  
http://cvs.php.net/viewvc.cgi/gd/libgd/src/gdft.c?r1=1.28.2.14&r2=1.28.2.15&diff_format=u
Index: gd/libgd/src/gdft.c
diff -u gd/libgd/src/gdft.c:1.28.2.14 gd/libgd/src/gdft.c:1.28.2.15
--- gd/libgd/src/gdft.c:1.28.2.14	Wed Apr 15 17:30:45 2009
+++ gd/libgd/src/gdft.c	Mon Apr 20 09:10:08 2009
@@ -954,8 +954,6 @@
       /* 2.0.29: we can return the font path if desired */
       if (strex->flags & gdFTEX_RETURNFONTPATHNAME) 
         strex->fontpath = strdup(font->fontpath);
-      else
-        strex->fontpath = 0;
     }
 
   matrix.xx = (FT_Fixed) (cos_a * (1 << 16));
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/CMakeLists.txt?r1=1.1.2.6&r2=1.1.2.7&diff_format=u
Index: gd/libgd/src/tests/CMakeLists.txt
diff -u gd/libgd/src/tests/CMakeLists.txt:1.1.2.6 gd/libgd/src/tests/CMakeLists.txt:1.1.2.7
--- gd/libgd/src/tests/CMakeLists.txt:1.1.2.6	Tue Mar 17 17:32:09 2009
+++ gd/libgd/src/tests/CMakeLists.txt	Mon Apr 20 09:10:08 2009
@@ -51,6 +51,7 @@
 		gdimagefilltoborder
 		freetype
 		xpm
+		gdimagestringftex
 	)
 
 	FOREACH(test_dir ${TESTS_DIRS})
http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/Makefile.am?r1=1.1.2.3&r2=1.1.2.4&diff_format=u
Index: gd/libgd/src/tests/Makefile.am
diff -u gd/libgd/src/tests/Makefile.am:1.1.2.3 gd/libgd/src/tests/Makefile.am:1.1.2.4
--- gd/libgd/src/tests/Makefile.am:1.1.2.3	Tue Mar 17 17:32:09 2009
+++ gd/libgd/src/tests/Makefile.am	Mon Apr 20 09:10:08 2009
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in -*-Makefile-*-
 AUTOMAKE_OPTIONS = foreign 1.7
 
-SUBDIRS = gd2 gdimagecolordeallocate gdimagecolortransparent gdimagefill gdimagefilltoborder gdtest jpeg gdimagearc gdimagecolorexact gdimagecopy gdimagefilledellipse gdimageline gdtiled freetype gdimagecolorclosest gdimagecolorresolve gdimagecopyrotated gdimagefilledrectangle gdimagerectangle gdimagesetpixel gif png xpm
+SUBDIRS = gd2 gdimagecolordeallocate gdimagecolortransparent gdimagefill gdimagefilltoborder gdtest jpeg gdimagearc gdimagecolorexact gdimagecopy gdimagefilledellipse gdimageline gdtiled freetype gdimagecolorclosest gdimagecolorresolve gdimagecopyrotated gdimagefilledrectangle gdimagerectangle gdimagesetpixel gif png xpm gdimagestringftex
 
 EXTRA_DIST = CMakeLists.txt
 

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdimagestringftex/CMakeLists.txt?view=markup&rev=1.1
Index: gd/libgd/src/tests/gdimagestringftex/CMakeLists.txt
+++ gd/libgd/src/tests/gdimagestringftex/CMakeLists.txt

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdimagestringftex/Makefile.am?view=markup&rev=1.1
Index: gd/libgd/src/tests/gdimagestringftex/Makefile.am
+++ gd/libgd/src/tests/gdimagestringftex/Makefile.am

http://cvs.php.net/viewvc.cgi/gd/libgd/src/tests/gdimagestringftex/gdimagestringftex_returnfontpathname.c?view=markup&rev=1.1
Index: gd/libgd/src/tests/gdimagestringftex/gdimagestringftex_returnfontpathname.c
+++ gd/libgd/src/tests/gdimagestringftex/gdimagestringftex_returnfontpathname.c