[freetype2-demos] master 85f1ab8: [ftstring] Ditch gamma ramp.

[Alexei Podtelezhnikov]

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

    [ftstring] Ditch gamma ramp.
    
    * src/ftstring.c (status): `gamma_ramp' removed.
    (gamma_ramp_draw): Remove.
    (event_gamma_change): Remove setting `gamma_ramp'.
    
    * src/ftstring.1: Mention stress test glyphs.
---
 ChangeLog      |  9 +++++++++
 src/ftstring.1 |  4 ++++
 src/ftstring.c | 37 +------------------------------------
 3 files changed, 14 insertions(+), 36 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 37f59b0..6210e43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2018-06-28  Alexei Podtelezhnikov  <address@hidden>
 
+       [ftstring] Ditch gamma ramp.
+
+       * src/ftstring.c (status): `gamma_ramp' removed.
+       (gamma_ramp_draw): Remove.
+       (event_gamma_change): Remove setting `gamma_ramp'.
+       * src/ftstring.1: Mention stress test glyphs.
+
+2018-06-28  Alexei Podtelezhnikov  <address@hidden>
+
        [ftgrid, ftview, ftstring] Update font and encoding handling.
 
        * src/ftcommon.c (my_face_requester): Check `cmap_index' range.
diff --git a/src/ftstring.1 b/src/ftstring.1
index b295406..a0ac393 100644
--- a/src/ftstring.1
+++ b/src/ftstring.1
@@ -33,6 +33,10 @@ also tries to attach the corresponding metrics file (with 
extension `.afm'
 or `.pfm').
 .
 .PP
+Besides the string,
+.B ftstring
+also displays two stress test pattens sensitive to rendering flaws, such as
+incorrect gamma settings.
 This program is part of the FreeType demos package.
 .
 .
diff --git a/src/ftstring.c b/src/ftstring.c
index a171d61..5d188cb 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -92,7 +92,6 @@
 
     FTDemo_String_Context  sc;
 
-    FT_Byte    gamma_ramp[256];   /* for show only */
     FT_Matrix  trans_matrix;
     int        font_index;
     char*      header;
@@ -100,7 +99,7 @@
 
   } status = { DIM, RENDER_MODE_STRING, FT_ENCODING_UNICODE, 72, 48, 0, NULL,
                { 0, 0, 0x8000, 0, NULL },
-               { 0 }, { 0, 0, 0, 0 }, 0, NULL, { 0 } };
+               { 0, 0, 0, 0 }, 0, NULL, { 0 } };
 
   static FTDemo_Display*  display;
   static FTDemo_Handle*   handle;
@@ -368,10 +367,6 @@
   static void
   event_gamma_change( double  delta )
   {
-    int     i;
-    double  p;
-
-
     display->gamma += delta;
 
     if ( display->gamma > 3.0 )
@@ -380,14 +375,6 @@
       display->gamma = 0.1;
 
     grSetGlyphGamma( display->gamma );
-
-    /* power function calculated using finite differences */
-    for ( p = 1.0, i = 255; i > 0; i-- )
-    {
-      status.gamma_ramp[i] = (FT_Byte)( p * 255. + 0.5 );
-      p -= display->gamma * p / i;
-    }
-    status.gamma_ramp[i] = 0;
   }
 
 
@@ -562,26 +549,6 @@
 
 
   static void
-  gamma_ramp_draw( FT_Byte    gamma_ramp[256],
-                   grBitmap*  bitmap )
-  {
-    int       i, x, y;
-    int       bpp = bitmap->pitch / bitmap->width;
-    FT_Byte*  p = (FT_Byte*)bitmap->buffer;
-
-
-    if ( bitmap->pitch < 0 )
-      p += -bitmap->pitch * ( bitmap->rows - 1 );
-
-    x = ( bitmap->width - 256 ) / 2;
-    y = ( bitmap->rows + 256 ) / 2;
-
-    for (i = 0; i < 256; i++)
-      p[bitmap->pitch * ( y - i ) + bpp * ( x + gamma_ramp[i] )] ^= 0xFF;
-  }
-
-
-  static void
   write_header( FT_Error  error_code )
   {
     FTDemo_Draw_Header( handle, display, status.ptsize, status.res,
@@ -767,8 +734,6 @@
     {
       FTDemo_Display_Clear( display );
 
-      gamma_ramp_draw( status.gamma_ramp, display->bitmap );
-
       switch ( status.render_mode )
       {
       case RENDER_MODE_STRING: