removed obsolete files + update

demos/Makefile

@@ -281,22 +281,15 @@ else
 	  $(LINK)
 
 
-  $(BIN_)ftview$E: $(OBJ_)ftview.$O $(FTLIB) $(GRAPH_LIB) $(COMMON_OBJ) $(OBJ_)ftrast2.$O $(OBJ_)ftrast.$O
-	  $(GRAPH_LINK2)
+  $(BIN_)ftview$E: $(OBJ_)ftview.$O $(FTLIB) $(GRAPH_LIB) $(COMMON_OBJ)
+	  $(GRAPH_LINK)
 
   $(BIN_)ftstring$E: $(OBJ_)ftstring.$O $(FTLIB) $(GRAPH_LIB) $(COMMON_OBJ)
 	  $(GRAPH_LINK)
 
-
-  $(BIN_)try$E: $(OBJ_)try.$O $(FTLIB) $(GRAPH_LIB) $(COMMON_OBJ) $(OBJ_)ftgrays2.$O
-	  $(GRAPH_LINK) $(OBJ_)ftgrays2.$O
-
   $(BIN_)fttimer$E: $(OBJ_)fttimer.$O $(FTLIB) $(GRAPH_LIB) $(COMMON_OBJ)
 	  $(GRAPH_LINK)
 
-  $(BIN_)fttimer2$E: $(OBJ_)fttimer2.$O $(FTLIB) $(GRAPH_LIB) $(COMMON_OBJ) $(OBJ_)ftgrays2.$O
-	  $(GRAPH_LINK) $(OBJ_)ftgrays2.$O
-
 
 endif
 

demos/src/ftgrays2.h

@@ -1,9 +0,0 @@
-#ifndef FTGRAYS2_H
-#define FTGRAYS2_H
-
-#include <ftimage.h>
-
-  extern
-  FT_Raster_Funcs  ft_grays2_raster;
-
-#endif

demos/src/ftrast.h

@@ -1,8 +0,0 @@
-#ifndef FTRASTER_H
-#define FTRASTER_H
-
-#include <freetype/ftimage.h>
-
-  extern  FT_Raster_Funcs  ft_black_raster;
-
-#endif

demos/src/ftrast2.h

@@ -1,41 +0,0 @@
-/*******************************************************************
- *
- *  ftraster.h                                                 v 2.0
- *
- *  The FreeType glyph scan-line converter (interface)
- *
- *  Copyright 1996-2000 by
- *  David Turner, Robert Wilhelm, and Werner Lemberg
- *
- *  This file is part of the FreeType project, and may only be used
- *  modified and distributed under the terms of the FreeType project
- *  license, LICENSE.TXT. By continuing to use, modify, or distribute
- *  this file you indicate that you have read the license and
- *  understand and accept it fully.
- *
- *
- ******************************************************************/
-
-#ifndef FTRAST2_H
-#define FTRAST2_H
-
-#include <freetype/ftimage.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef EXPORT_VAR
-#define EXPORT_VAR(x)  extern x
-#endif
-
-  EXPORT_VAR(FT_Raster_Funcs)   ft_black2_raster;
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* FTRAST2_H */
-
-
-/* END */

demos/src/ftview.c

@@ -16,6 +16,9 @@
 /****************************************************************************/
 
 #include <freetype/freetype.h>
+#include <freetype/ftraster.h>
+#include <freetype/ftgrays.h>
+
 #include "common.h"
 
 #include <stdio.h>
@@ -26,10 +29,6 @@
 #include "graph.h"
 #include "grfont.h"
 
-#include <freetype/ftgrays.h>
-#include "ftrast.h"
-#include "ftrast2.h"
-
 #define  DIM_X   500
 #define  DIM_Y   400
 
@@ -276,7 +275,7 @@ $\243^\250*\265\371%!\247:/;.,?<>";
     {
       if ( !(error = LoadChar( i, hinted )) )
       {
-#ifdef DEBUG
+        #ifdef DEBUG
         if (i <= first_glyph+6)
         {
           LOG(( "metrics[%02d] = [%x %x]\n",
@@ -287,8 +286,8 @@ $\243^\250*\265\371%!\247:/;.,?<>";
           if (i == first_glyph+6)
           LOG(( "-------------------------\n"));
         }
+        #endif
         
-#endif
         Render_Glyph( x, y );
 
         x += ( glyph->metrics.horiAdvance >> 6 ) + 1;
@@ -337,7 +336,7 @@ $\243^\250*\265\371%!\247:/;.,?<>";
     {
       if ( !(error = LoadChar( FT_Get_Char_Index( face, (unsigned char)*p ), hinted )) )
       {
-#ifdef DEBUG
+        #ifdef DEBUG
         if (i <= first_glyph+6)
         {
           LOG(( "metrics[%02d] = [%x %x]\n",
@@ -348,8 +347,8 @@ $\243^\250*\265\371%!\247:/;.,?<>";
           if (i == first_glyph+6)
           LOG(( "-------------------------\n"));
         }
+        #endif
         
-#endif
         Render_Glyph( x, y );
 
         x += ( glyph->metrics.horiAdvance >> 6 ) + 1;
@@ -421,19 +420,10 @@ $\243^\250*\265\371%!\247:/;.,?<>";
 
   static void  reset_raster( void )
   {
-    FT_Error  error;
-    
-    error = 1;
-    if ( !antialias)
-    {
-      error = FT_Set_Raster( library, use_grays ? &ft_black2_raster
-                                                : &ft_black_raster );
-    }                                                
-    else if ( use_grays && antialias )
-      error = FT_Set_Raster( library, &ft_grays_raster );
-      
-    if (error)
-      (void)FT_Set_Raster( library, &std_raster );
+    if ( antialias && use_grays )
+      FT_Set_Raster( library, &ft_grays_raster );
+    else
+      FT_Set_Raster( library, &std_raster );
   }