[freetype2-demos] master cc236c9: [ftgamma] Minor refactoring.

[Alexei Podtelezhnikov]

branch: master
commit cc236c998451244f91032ced37ef65e0c34c8638
Author: Alexei Podtelezhnikov <address@hidden>
Commit: Alexei Podtelezhnikov <address@hidden>

    [ftgamma] Minor refactoring.
    
    * src/ftgamma.c (Render_GammaGrid): Move labels from here...
    (main): ... to here.
---
 ChangeLog     |    7 +++++++
 src/ftgamma.c |   19 +++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 83c5806..8435683 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-12-22  Alexei Podtelezhnikov  <address@hidden>
+
+       [ftgamma] Minor refactoring.
+
+       * src/ftgamma.c (Render_GammaGrid): Move labels from here...
+       (main): ... to here.
+
 2015-12-20  Alexei Podtelezhnikov  <address@hidden>
 
        Relocate gamma grid display from [ftview] to [ftgamma].
diff --git a/src/ftgamma.c b/src/ftgamma.c
index 08b34d8..16a47c2 100644
--- a/src/ftgamma.c
+++ b/src/ftgamma.c
@@ -79,10 +79,6 @@
     int  h = ( bitmap->rows - 2 * y ) / 15;
     int  w = bitmap->width - 2 * x;
 
-    int     i;
-    char    buf[4];
-    grColor color = grFindColor( bitmap, 0x00, 0x00, 0x00, 0xff );
-
 
     do_fill( bitmap, x,    y, w, h,  85, 255 );
     do_fill( bitmap, x, y+=h, w, h, 170, 170 );
@@ -102,12 +98,6 @@
     do_fill( bitmap, x, y+=h, w, h,  85,  85 );
     do_fill( bitmap, x, y+=h, w, h,   0, 170 );
 
-    for ( i = 0; i <= 10; i++ )
-    {
-      sprintf( buf, "%.1f", 1. + .2 * i );
-      grWriteCellString( bitmap, 9 + i * w / 10, 395, buf, color );
-    }
-
     return 0;
   }
 
@@ -245,6 +235,8 @@
   main( void )
   {
     grEvent          event;
+    char             buf[4];
+    int              i;
 
     display = FTDemo_Display_New( gr_pixel_mode_rgb24, DIM_X, DIM_Y );
     if ( !display )
@@ -260,6 +252,13 @@
 
       Render_GammaGrid( display->bitmap );
 
+      for ( i = 0; i <= 10; i++ )
+      {
+        sprintf( buf, "%.1f", 1. + .2 * i );
+        grWriteCellString( display->bitmap, 9 + i * 60, 395, buf,
+                           display->fore_color );
+      }
+
       grRefreshSurface( display->surface );
       grListenSurface( display->surface, 0, &event );
     } while ( Process_Event( &event ) == 0 );