[freetype2-demos] master a7252ef: Use `LCD_MODE_XXX' enum values.

[Alexei Podtelezhnikov]

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

    Use `LCD_MODE_XXX' enum values.
    
    * src/ftcommon.c (FTDemo_New, FTDemo_Update_Current_Flags,
    FTDemo_Glyph_To_Bitmap, FTDemo_Index_To_Bitmap): Ditto.
    * src/ftgrid.c (event_lcd_filter_change): Ditto.
    * src/ftstring.c (event_lcdmode_change): Ditto.
---
 ChangeLog      |  9 +++++++++
 src/ftcommon.c | 24 ++++++++++++++----------
 src/ftgrid.c   |  2 +-
 src/ftstring.c |  2 +-
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5caf23e..e285778 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-29  Alexei Podtelezhnikov  <address@hidden>
+
+       Use `LCD_MODE_XXX' enum values.
+
+       * src/ftcommon.c (FTDemo_New, FTDemo_Update_Current_Flags,
+       FTDemo_Glyph_To_Bitmap, FTDemo_Index_To_Bitmap): Ditto.
+       * src/ftgrid.c (event_lcd_filter_change): Ditto.
+       * src/ftstring.c (event_lcdmode_change): Ditto.
+
 2017-03-29  Werner Lemberg  <address@hidden>
 
        * src/ftview.c (INIT_SIZE): Improve vertical start position.
diff --git a/src/ftcommon.c b/src/ftcommon.c
index 3c37952..ab0f22f 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -299,7 +299,7 @@
     handle->hinted    = 1;
     handle->use_sbits = 1;
     handle->autohint  = 0;
-    handle->lcd_mode  = 1;
+    handle->lcd_mode  = LCD_MODE_AA;
     handle->color     = 1;
 
     handle->use_sbits_cache = 1;
@@ -642,7 +642,7 @@
     {
       flags |= FT_LOAD_NO_HINTING;
 
-      if ( handle->lcd_mode == 0 )
+      if ( handle->lcd_mode == LCD_MODE_MONO )
         flags |= FT_LOAD_MONOCHROME;
     }
 
@@ -773,14 +773,16 @@
       break;
 
     case FT_PIXEL_MODE_LCD:
-      target->mode  = handle->lcd_mode == 3 ? gr_pixel_mode_lcd
-                                            : gr_pixel_mode_lcd2;
+      target->mode  = handle->lcd_mode == LCD_MODE_RGB
+                      ? gr_pixel_mode_lcd
+                      : gr_pixel_mode_lcd2;
       target->grays = source->num_grays;
       break;
 
     case FT_PIXEL_MODE_LCD_V:
-      target->mode  = handle->lcd_mode == 5 ? gr_pixel_mode_lcdv
-                                            : gr_pixel_mode_lcdv2;
+      target->mode  = handle->lcd_mode == LCD_MODE_VRGB
+                      ? gr_pixel_mode_lcdv
+                      : gr_pixel_mode_lcdv2;
       target->grays = source->num_grays;
       break;
 
@@ -882,13 +884,15 @@
           break;
 
         case FT_PIXEL_MODE_LCD:
-          target->mode  = handle->lcd_mode == 3 ? gr_pixel_mode_lcd
-                                                : gr_pixel_mode_lcd2;
+          target->mode  = handle->lcd_mode == LCD_MODE_RGB
+                          ? gr_pixel_mode_lcd
+                          : gr_pixel_mode_lcd2;
           break;
 
         case FT_PIXEL_MODE_LCD_V:
-          target->mode  = handle->lcd_mode == 5 ? gr_pixel_mode_lcdv
-                                                : gr_pixel_mode_lcdv2;
+          target->mode  = handle->lcd_mode == LCD_MODE_VRGB
+                          ? gr_pixel_mode_lcdv
+                          : gr_pixel_mode_lcdv2;
           break;
 
         case FT_PIXEL_MODE_BGRA:
diff --git a/src/ftgrid.c b/src/ftgrid.c
index 55a9482..c722484 100644
--- a/src/ftgrid.c
+++ b/src/ftgrid.c
@@ -1199,7 +1199,7 @@
   static void
   event_lcd_filter_change( void )
   {
-    if ( handle->lcd_mode > 2 )
+    if ( handle->lcd_mode >= LCD_MODE_RGB )
     {
       const char*  lcd_filter = NULL;
 
diff --git a/src/ftstring.c b/src/ftstring.c
index 5224d9c..179e1ee 100644
--- a/src/ftstring.c
+++ b/src/ftstring.c
@@ -270,7 +270,7 @@
       lcd_mode = " LCD (vert. BGR)";
       break;
     default:
-      handle->lcd_mode = 0;
+      handle->lcd_mode = LCD_MODE_MONO;
       lcd_mode = " monochrome";
     }