[freetype2-demos] master ab324d3 05/22: * graph/gblender.h (GBLENDER_CHANNEL_VARS): Squash reintroduced bug.

[Werner Lemberg]

branch: master
commit ab324d307e4cfe5f766ee7f50953e610ab9212c2
Author: Alexei Podtelezhnikov <apodtele@gmail.com>
Commit: Alexei Podtelezhnikov <apodtele@gmail.com>

    * graph/gblender.h (GBLENDER_CHANNEL_VARS): Squash reintroduced bug.
---
 ChangeLog        | 4 ++++
 graph/gblender.h | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index fb1dc40..9f91d32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2021-01-21  Alexei Podtelezhnikov  <apodtele@gmail.com>
+
+       * graph/gblender.h (GBLENDER_CHANNEL_VARS): Squash reintroduced bug.
+
 2021-01-17  Alexei Podtelezhnikov  <apodtele@gmail.com>
 
        * graph/grfill.c (gr_fill_hline_4): Clean up.
diff --git a/graph/gblender.h b/graph/gblender.h
index 0168711..366ca69 100644
--- a/graph/gblender.h
+++ b/graph/gblender.h
@@ -176,7 +176,7 @@
   unsigned int     _grfore  = (_rfore);                                        
                                                                 \
   unsigned int     _ggback  = (_gb)->cache_g_back;                             
                                                                 \
   unsigned char*   _ggcells = ( (_gfore) == (_gb)->cache_g_fore ? 
(_gb)->cache_g_cells : gblender_lookup_channel( (_gb), _ggback, _gfore ));    \
-  unsigned int     _ggfore  = (_rfore);                                        
                                                                 \
+  unsigned int     _ggfore  = (_gfore);                                        
                                                                 \
   unsigned int     _gbback  = (_gb)->cache_b_back;                             
                                                                 \
   unsigned char*   _gbcells = ( (_bfore) == (_gb)->cache_b_fore ? 
(_gb)->cache_b_cells : gblender_lookup_channel( (_gb), _gbback, _bfore ));    \
   unsigned int     _gbfore  = (_bfore)