[Spice-devel] [PATCH spice-server 3/3] glz: Inline GET_{r, g, b} macros

[Frediano Ziglio]

With last changes are just used once and are straight forward.

Signed-off-by: Frediano Ziglio <fziglio at redhat.com>
---
 server/glz-encode.tmpl.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/server/glz-encode.tmpl.c b/server/glz-encode.tmpl.c
index c9b39360..624bb374 100644
--- a/server/glz-encode.tmpl.c
+++ b/server/glz-encode.tmpl.c
@@ -100,9 +100,7 @@
 #define ENCODE_PIXEL(e, pix) {encode(e, (pix).b); encode(e, (pix).g); encode(e, (pix).r);}
 #define MIN_REF_ENCODE_SIZE 2
 #define MAX_REF_ENCODE_SIZE 2
-#define GET_r(pix) ((pix).r)
-#define GET_g(pix) ((pix).g)
-#define GET_b(pix) ((pix).b)
+#define SAME_PIXEL(p1, p2) ((p1).r == (p2).r && (p1).g == (p2).g && (p1).b == (p2).b)
 #define HASH_FUNC(v, p) {    \
     v = DJB2_START;          \
     DJB2_HASH(v, p[0].r);    \
@@ -118,12 +116,6 @@
     }
 #endif
 
-#if defined(LZ_RGB24) || defined(LZ_RGB32)
-#define SAME_PIXEL(p1, p2) (GET_r(p1) == GET_r(p2) && GET_g(p1) == GET_g(p2) && \
-                            GET_b(p1) == GET_b(p2))
-
-#endif
-
 #define PIXEL_ID(pix_ptr, seg_ptr, pix_per_byte) \
     (((pix_ptr) - ((PIXEL *)(seg_ptr)->lines)) * pix_per_byte + (seg_ptr)->pixels_so_far)
 
@@ -531,9 +523,6 @@ static void FNAME(compress)(Encoder *encoder)
 #undef ENCODE_PIXEL
 #undef SAME_PIXEL
 #undef HASH_FUNC
-#undef GET_r
-#undef GET_g
-#undef GET_b
 #undef GET_rgb
 #undef LZ_PLT
 #undef LZ_RGB_ALPHA
-- 
2.17.1