[freetype2-demos] master c0f3283: * src/ftview.c (Render_All): Update `FT_Get_Color_Glyph_Layer' call.

[Werner LEMBERG]

branch: master
commit c0f32831e843a49dfea62ccb958b80f27c19f7b0
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/ftview.c (Render_All): Update `FT_Get_Color_Glyph_Layer' call.
    
    The function's signature was changed on 2018-07-02.
---
 ChangeLog    |  6 ++++++
 src/ftview.c | 24 +++++++++++++-----------
 2 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 678b03d..0aff651 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-07-02  Werner Lemberg  <address@hidden>
+
+       * src/ftview.c (Render_All): Update `FT_Get_Color_Glyph_Layer' call.
+
+       The function's signature was changed on 2018-07-02.
+
 2018-06-30  Alexei Podtelezhnikov  <address@hidden>
 
        [ftstring] Implement string shifts.
diff --git a/src/ftview.c b/src/ftview.c
index c3682e1..14947ff 100644
--- a/src/ftview.c
+++ b/src/ftview.c
@@ -435,6 +435,7 @@
       FT_LayerIterator  iterator;
       FT_UInt           glyph_idx;
 
+      FT_Bool  have_layers;
       FT_UInt  layer_glyph_idx;
       FT_UInt  layer_color_idx;
 
@@ -442,13 +443,14 @@
       glyph_idx = FTDemo_Get_Index( handle, (FT_UInt32)i );
 
       /* check whether we have glyph color layers */
-      iterator.p       = NULL;
-      layer_glyph_idx  = FT_Get_Color_Glyph_Layer( face,
-                                                   glyph_idx,
-                                                   &layer_color_idx,
-                                                   &iterator );
+      iterator.p  = NULL;
+      have_layers = FT_Get_Color_Glyph_Layer( face,
+                                              glyph_idx,
+                                              &layer_glyph_idx,
+                                              &layer_color_idx,
+                                              &iterator );
 
-      if ( palette && layer_glyph_idx /* && XXX handle->use_layers */ )
+      if ( palette && have_layers /* && XXX handle->use_layers */ )
       {
         FT_Int32  load_flags = handle->load_flags;
 
@@ -482,11 +484,11 @@
                                    &bitmap_offset,
                                    palette[layer_color_idx] );
 
-        } while ( ( layer_glyph_idx =
-                    FT_Get_Color_Glyph_Layer( face,
-                                              glyph_idx,
-                                              &layer_color_idx,
-                                              &iterator ) ) != 0 );
+        } while ( FT_Get_Color_Glyph_Layer( face,
+                                            glyph_idx,
+                                            &layer_glyph_idx,
+                                            &layer_color_idx,
+                                            &iterator ) );
 
         if ( error )
         {