[freetype2-demos] master 617d678: [ftstring] Miscellaneous updates.

[Alexei Podtelezhnikov]

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

    [ftstring] Miscellaneous updates.
    
    * src/ftstring.c (event_gamma_change): Do not report gamma updates.
    (write_header): Permanently display gamma.
    (gamma_ramp_draw): Brighten the curve.
---
 ChangeLog      |    8 ++++++++
 src/ftstring.c |    9 +++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index be88048..b0138e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-12-07  Alexei Podtelezhnikov  <address@hidden>
+
+       [ftstring] Miscellaneous updates.
+
+       * src/ftstring.c (event_gamma_change): Do not report gamma updates.
+       (write_header): Permanently display gamma.
+       (gamma_ramp_draw): Brighten the curve.
+
 2015-12-06  Alexei Podtelezhnikov  <address@hidden>
 
        [graph] Small improvements.
diff --git a/src/ftstring.c b/src/ftstring.c
index 2d321e6..4274cfe 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -260,9 +260,6 @@
 
     grSetGlyphGamma( status.gamma );
 
-    sprintf( status.header_buffer, "gamma changed to %.1f", status.gamma );
-    status.header = status.header_buffer;
-
     gamma_inv = 1.0f / status.gamma;
 
     for ( i = 0; i < 256; i++ )
@@ -461,7 +458,7 @@
     y = ( bitmap->rows + 256 ) / 2;
 
     for (i = 0; i < 256; i++)
-      p[bitmap->pitch * ( y - gamma_ramp[i] ) + bpp * ( x + i )] = 0x80;
+      p[bitmap->pitch * ( y - gamma_ramp[i] ) + bpp * ( x + i )] ^= 0xFF;
   }
 
 
@@ -511,8 +508,8 @@
     grWriteCellString( display->bitmap, 0, 0,
                        status.header, display->fore_color );
 
-    sprintf( status.header_buffer, "at %g points, angle = %d",
-             status.ptsize / 64.0, status.angle );
+    sprintf( status.header_buffer, "at %g points, angle = %d, gamma = %g",
+             status.ptsize / 64.0, status.angle, status.gamma );
     grWriteCellString( display->bitmap, 0, CELLSTRING_HEIGHT,
                        status.header_buffer, display->fore_color );