From 5cb0b69195e5b23d1fe76a38b07945100f45ac5f Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Mon, 28 Mar 2005 03:58:04 +0000
Subject: [PATCH] ooh issues! thanks jose!

SVN revision: 13947
---
 .../evas/src/lib/engines/buffer/evas_engine.c | 16 +++----
 .../src/lib/engines/cairo_x11/evas_engine.c   | 16 +++----
 .../lib/engines/directfb/evas_engine_dfb.c    | 42 ++++++++-----------
 legacy/evas/src/lib/engines/fb/evas_engine.c  | 16 +++----
 .../evas/src/lib/engines/gl_x11/evas_engine.c | 16 +++----
 .../lib/engines/software_qtopia/evas_engine.c | 16 +++----
 .../lib/engines/software_x11/evas_engine.c    | 16 +++----
 .../lib/engines/software_xcb/evas_engine.c    | 16 +++----
 8 files changed, 73 insertions(+), 81 deletions(-)

diff --git a/legacy/evas/src/lib/engines/buffer/evas_engine.c b/legacy/evas/src/lib/engines/buffer/evas_engine.c
index c94b638743..36cc6403ee 100644
--- a/legacy/evas/src/lib/engines/buffer/evas_engine.c
+++ b/legacy/evas/src/lib/engines/buffer/evas_engine.c
@@ -517,10 +517,10 @@ evas_engine_buffer_context_color_get(void *data, void *context, int *r, int *g,
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->col.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
    return 1;
 }
 
@@ -548,10 +548,10 @@ evas_engine_buffer_context_multiplier_get(void *data, void *context, int *r, int
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->mul.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->mul.col));
    return ((RGBA_Draw_Context *)context)->mul.use;
 }
 
diff --git a/legacy/evas/src/lib/engines/cairo_x11/evas_engine.c b/legacy/evas/src/lib/engines/cairo_x11/evas_engine.c
index 174c655845..a8733b6a40 100644
--- a/legacy/evas/src/lib/engines/cairo_x11/evas_engine.c
+++ b/legacy/evas/src/lib/engines/cairo_x11/evas_engine.c
@@ -466,10 +466,10 @@ evas_engine_cairo_x11_context_color_get(void *data, void *context, int *r, int *
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->col.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
    return 1;
 }
 
@@ -497,10 +497,10 @@ evas_engine_cairo_x11_context_multiplier_get(void *data, void *context, int *r,
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->mul.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->mul.col));
    return ((RGBA_Draw_Context *)context)->mul.use;
 }
 
diff --git a/legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c b/legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c
index 708e16f501..c2f634c29e 100644
--- a/legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c
+++ b/legacy/evas/src/lib/engines/directfb/evas_engine_dfb.c
@@ -418,11 +418,11 @@ evas_engine_directfb_context_clip_get(void *data, void *context, int *x, int *y,
    Render_Engine      *re;
 
    re = (Render_Engine *) data;
-   *x = ((RGBA_Draw_Context *) data)->clip.x;
-   *y = ((RGBA_Draw_Context *) data)->clip.y;
-   *w = ((RGBA_Draw_Context *) data)->clip.w;
-   *h = ((RGBA_Draw_Context *) data)->clip.h;
-   return ((RGBA_Draw_Context *) data)->clip.use;
+   *x = ((RGBA_Draw_Context *) context)->clip.x;
+   *y = ((RGBA_Draw_Context *) context)->clip.y;
+   *w = ((RGBA_Draw_Context *) context)->clip.w;
+   *h = ((RGBA_Draw_Context *) contect)->clip.h;
+   return ((RGBA_Draw_Context *) context)->clip.use;
 }
 
 void
@@ -440,17 +440,13 @@ int
 evas_engine_directfb_context_color_get(void *data, void *context, int *r,
 				       int *g, int *b, int *a)
 {
+   Render_Engine      *re;
 
-   DATA32              p;
-   DATA8              *pp;
-   RGBA_Draw_Context  *dc = (RGBA_Draw_Context *) context;
-
-   p = dc->col.col;
-   pp = (DATA8 *) & p;
-   *r = R_VAL(pp);
-   *g = G_VAL(pp);
-   *b = B_VAL(pp);
-   *a = A_VAL(pp);
+   re = (Render_Engine *) data;
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
 }
 
 void
@@ -476,17 +472,13 @@ int
 evas_engine_directfb_context_multiplier_get(void *data, void *context, int *r,
 					    int *g, int *b, int *a)
 {
-   DATA32              p;
-   DATA8              *pp;
-   RGBA_Draw_Context  *dc = (RGBA_Draw_Context *) context;
-
-   p = dc->mul.col;
-   pp = (DATA8 *) & p;
-   *r = R_VAL(pp);
-   *g = G_VAL(pp);
-   *b = B_VAL(pp);
-   *a = A_VAL(pp);
+   Render_Engine      *re;
 
+   re = (Render_Engine *) data;
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->mul.col));
    return dc->mul.use;
 }
 
diff --git a/legacy/evas/src/lib/engines/fb/evas_engine.c b/legacy/evas/src/lib/engines/fb/evas_engine.c
index fa3ba85901..21d6c169fa 100644
--- a/legacy/evas/src/lib/engines/fb/evas_engine.c
+++ b/legacy/evas/src/lib/engines/fb/evas_engine.c
@@ -433,10 +433,10 @@ evas_engine_fb_context_color_get(void *data, void *context, int *r, int *g, int
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->col.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
    return 1;
 }
 
@@ -464,10 +464,10 @@ evas_engine_fb_context_multiplier_get(void *data, void *context, int *r, int *g,
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->mul.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->mul.col));
    return ((RGBA_Draw_Context *)context)->mul.use;
 }
 
diff --git a/legacy/evas/src/lib/engines/gl_x11/evas_engine.c b/legacy/evas/src/lib/engines/gl_x11/evas_engine.c
index 8fdb91a226..ac67c19d7b 100644
--- a/legacy/evas/src/lib/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/lib/engines/gl_x11/evas_engine.c
@@ -469,10 +469,10 @@ evas_engine_gl_x11_context_color_get(void *data, void *context, int *r, int *g,
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->col.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
    return 1;
 }
 
@@ -500,10 +500,10 @@ evas_engine_gl_x11_context_multiplier_get(void *data, void *context, int *r, int
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->mul.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->mul.col));
    return ((RGBA_Draw_Context *)context)->mul.use;
 }
 
diff --git a/legacy/evas/src/lib/engines/software_qtopia/evas_engine.c b/legacy/evas/src/lib/engines/software_qtopia/evas_engine.c
index 6843976e02..7c179916a7 100644
--- a/legacy/evas/src/lib/engines/software_qtopia/evas_engine.c
+++ b/legacy/evas/src/lib/engines/software_qtopia/evas_engine.c
@@ -451,10 +451,10 @@ evas_engine_software_qtopia_context_color_get(void *data, void *context, int *r,
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->col.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
    return 1;
 }
 
@@ -482,10 +482,10 @@ evas_engine_software_qtopia_context_multiplier_get(void *data, void *context, in
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->mul.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->mul.col));
    return ((RGBA_Draw_Context *)context)->mul.use;
 }
 
diff --git a/legacy/evas/src/lib/engines/software_x11/evas_engine.c b/legacy/evas/src/lib/engines/software_x11/evas_engine.c
index 9a54dbfbe0..7d571bbd18 100644
--- a/legacy/evas/src/lib/engines/software_x11/evas_engine.c
+++ b/legacy/evas/src/lib/engines/software_x11/evas_engine.c
@@ -495,10 +495,10 @@ evas_engine_software_x11_context_color_get(void *data, void *context, int *r, in
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->col.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
    return 1;
 }
 
@@ -526,10 +526,10 @@ evas_engine_software_x11_context_multiplier_get(void *data, void *context, int *
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->mul.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->mul.col));
    return ((RGBA_Draw_Context *)context)->mul.use;
 }
 
diff --git a/legacy/evas/src/lib/engines/software_xcb/evas_engine.c b/legacy/evas/src/lib/engines/software_xcb/evas_engine.c
index 0470b5b646..d58284c7d6 100644
--- a/legacy/evas/src/lib/engines/software_xcb/evas_engine.c
+++ b/legacy/evas/src/lib/engines/software_xcb/evas_engine.c
@@ -516,10 +516,10 @@ evas_engine_software_xcb_context_color_get(void *data, void *context, int *r, in
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->col.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->col.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->col.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->col.col));
    return 1;
 }
 
@@ -547,10 +547,10 @@ evas_engine_software_xcb_context_multiplier_get(void *data, void *context, int *
    Render_Engine *re;
    
    re = (Render_Engine *)data;
-   *r = (int)(R_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *g = (int)(G_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *b = (int)(B_VAL(((RGBA_Draw_Context *)context)->mul.col));
-   *a = (int)(A_VAL(((RGBA_Draw_Context *)context)->mul.col));
+   *r = (int)(R_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *g = (int)(G_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *b = (int)(B_VAL(&((RGBA_Draw_Context *)context)->mul.col));
+   *a = (int)(A_VAL(&((RGBA_Draw_Context *)context)->mul.col));
    return ((RGBA_Draw_Context *)context)->mul.use;
 }