[GRASS-SVN] r31457 - grass/branches/develbranch_6/general/g.mkfontcap

svn_grass at osgeo.org svn_grass at osgeo.org
Wed May 21 04:03:07 EDT 2008


Author: glynn
Date: 2008-05-21 04:03:07 -0400 (Wed, 21 May 2008)
New Revision: 31457

Modified:
   grass/branches/develbranch_6/general/g.mkfontcap/freetype_fonts.c
   grass/branches/develbranch_6/general/g.mkfontcap/stroke_fonts.c
Log:
Remove unnecessary casts of G_realloc() (merge r31173 from trunk)


Modified: grass/branches/develbranch_6/general/g.mkfontcap/freetype_fonts.c
===================================================================
--- grass/branches/develbranch_6/general/g.mkfontcap/freetype_fonts.c	2008-05-21 07:53:04 UTC (rev 31456)
+++ grass/branches/develbranch_6/general/g.mkfontcap/freetype_fonts.c	2008-05-21 08:03:07 UTC (rev 31457)
@@ -115,8 +115,7 @@
                 if (totalfonts >= maxfonts)
                 {
 	            maxfonts += 20;
-		    fontcap = (struct GFONT_CAP *) G_realloc(fontcap, 
-		                         maxfonts * sizeof(struct GFONT_CAP));
+		    fontcap = G_realloc(fontcap, maxfonts * sizeof(struct GFONT_CAP));
                 }
 
 	        if (FT_New_Face(ftlibrary, filepath, index, &face) == 0)

Modified: grass/branches/develbranch_6/general/g.mkfontcap/stroke_fonts.c
===================================================================
--- grass/branches/develbranch_6/general/g.mkfontcap/stroke_fonts.c	2008-05-21 07:53:04 UTC (rev 31456)
+++ grass/branches/develbranch_6/general/g.mkfontcap/stroke_fonts.c	2008-05-21 08:03:07 UTC (rev 31457)
@@ -67,8 +67,7 @@
     	if (totalfonts >= maxfonts)
     	{
     	    maxfonts += 20;   
-            fontcap = (struct GFONT_CAP *) G_realloc(fontcap, 
-		                         maxfonts * sizeof(struct GFONT_CAP));
+            fontcap = G_realloc(fontcap, maxfonts * sizeof(struct GFONT_CAP));
     	}        
        
         /* Path */
@@ -137,8 +136,8 @@
         if( num_descriptions >= memsize )
 	{
 	    memsize += 20;
-	    font_descriptions = (struct font_desc *) G_realloc( 
-		      font_descriptions, memsize * sizeof(struct font_desc) );
+	    font_descriptions = G_realloc(font_descriptions,
+					  memsize * sizeof(struct font_desc) );
 	}
        
         font_descriptions[num_descriptions].filename = G_store(name);



More information about the grass-commit mailing list