[freetype2-demos] master 15e3771: [graph] Minor clean-ups.

[Werner Lemberg]

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

    [graph] Minor clean-ups.
    
    * graph/gblender.c (gblender_reset_key): Remove unnecessary masks.
    * graph/gblany.h (*vrgb*, *vbgr*): Remove redundant casts.
---
 graph/gblany.h   | 16 ++++++++--------
 graph/gblender.c |  6 ++----
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/graph/gblany.h b/graph/gblany.h
index e826915..949409b 100644
--- a/graph/gblany.h
+++ b/graph/gblany.h
@@ -291,10 +291,10 @@ GCONCAT( _gblender_blit_vrgb_, GDST_TYPE )( GBlenderBlit  
blit,
 
     do
     {
-      unsigned int   ar = GBLENDER_SHADE_INDEX(src[0]);
-      unsigned int   ag = GBLENDER_SHADE_INDEX(src[src_pitch]);
-      unsigned int   ab = GBLENDER_SHADE_INDEX(src[src_pitch << 1]);
-      GBlenderPixel  aa = ((GBlenderPixel)ar << 16) | (ag << 8) | ab;
+      unsigned int  ar = GBLENDER_SHADE_INDEX(src[0]);
+      unsigned int  ag = GBLENDER_SHADE_INDEX(src[src_pitch]);
+      unsigned int  ab = GBLENDER_SHADE_INDEX(src[src_pitch << 1]);
+      unsigned int  aa = (ar << 16) | (ag << 8) | ab;
 
       if ( aa == 0 )
       {
@@ -354,10 +354,10 @@ GCONCAT( _gblender_blit_vbgr_, GDST_TYPE )( GBlenderBlit  
blit,
 
     do
     {
-      unsigned int   ab = GBLENDER_SHADE_INDEX(src[0]);
-      unsigned int   ag = GBLENDER_SHADE_INDEX(src[src_pitch]);
-      unsigned int   ar = GBLENDER_SHADE_INDEX(src[src_pitch << 1]);
-      GBlenderPixel  aa = ((GBlenderPixel)ar << 16) | (ag << 8) | ab;
+      unsigned int  ab = GBLENDER_SHADE_INDEX(src[0]);
+      unsigned int  ag = GBLENDER_SHADE_INDEX(src[src_pitch]);
+      unsigned int  ar = GBLENDER_SHADE_INDEX(src[src_pitch << 1]);
+      unsigned int  aa = (ar << 16) | (ag << 8) | ab;
 
       if ( aa == 0 )
       {
diff --git a/graph/gblender.c b/graph/gblender.c
index 6d94dde..f51eac4 100644
--- a/graph/gblender.c
+++ b/graph/gblender.c
@@ -251,10 +251,8 @@ gblender_reset_key( GBlender     blender,
     gr[2] = (unsigned char)b;
     gr   += 3;
 #else
-    gr[0] = (( r & 255 ) << 16) |
-            (( g & 255 ) << 8 ) |
-            (( b & 255 )      ) ;
-    gr ++;
+    gr[0] = ( r << 16 ) | ( g << 8 ) | b;
+    gr   += 1;
 #endif
   }
 }