From 51e9b8358fd2fdff355e0d6c78ac08fe5412fb6a Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Tue, 20 Jul 2004 04:05:14 +0000
Subject: [PATCH] in!

SVN revision: 10930
---
 legacy/evas/AUTHORS                           |  1 +
 .../src/lib/engines/common/evas_font_main.c   | 20 ++++++-------------
 .../evas/src/lib/engines/gl_x11/evas_engine.c |  4 ++--
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/legacy/evas/AUTHORS b/legacy/evas/AUTHORS
index ef9d10a476..e6e2854a4e 100644
--- a/legacy/evas/AUTHORS
+++ b/legacy/evas/AUTHORS
@@ -8,3 +8,4 @@ Yuri Hudobin <glassy_ape@users.sourceforge.net>
 Nathan Ingersoll <ningerso@d.umn.edu>
 Willem Monsuwe <willem@stack.nl>
 Jose O Gonzalez <jose_ogp@juno.com>
+Bernhard Nemec <Bernhard.Nemec@viasyshc.com>
diff --git a/legacy/evas/src/lib/engines/common/evas_font_main.c b/legacy/evas/src/lib/engines/common/evas_font_main.c
index 35ad9be275..48df39d2d5 100644
--- a/legacy/evas/src/lib/engines/common/evas_font_main.c
+++ b/legacy/evas/src/lib/engines/common/evas_font_main.c
@@ -115,8 +115,7 @@ evas_common_font_utf8_get_next(unsigned char *buf, int *iindex)
    if ((d & 0xe0) == 0xc0) 
      { 
 	/* 2 byte */
-	d2 = buf[index++];
-	if ((d2 & 0xc0) != 0x80)
+	if (((d2 = buf[index++]) & 0xc0) != 0x80)
 	  return 0;
 	r = d & 0x1f; /* copy lower 5 */
 	r <<= 6;
@@ -125,12 +124,8 @@ evas_common_font_utf8_get_next(unsigned char *buf, int *iindex)
    else if ((d & 0xf0) == 0xe0) 
      { 
 	/* 3 byte */
-	d2 = buf[index++];
-	d3 = buf[index++];
-	if ((d2 & 0xc0) != 0x80 ||
-	    (d3 & 0xc0) != 0x80)
-	  return 0;
-	r = d & 0x0f; /* copy lower 4 */
+	if (((d2 = buf[index++]) & 0xc0) != 0x80 ||
+	   ((d3 = buf[index++]) & 0xc0) != 0x80)r = d & 0x0f; /* copy lower 4 */
 	r <<= 6;
 	r |= (d2 & 0x3f);
 	r <<= 6;
@@ -139,12 +134,9 @@ evas_common_font_utf8_get_next(unsigned char *buf, int *iindex)
    else
      { 
 	/* 4 byte */
-	d2 = buf[index++];
-	d3 = buf[index++];
-	d4 = buf[index++];
-	if ((d2 & 0xc0) != 0x80 ||
-	    (d3 & 0xc0) != 0x80 ||
-	    (d4 & 0xc0) != 0x80)
+	if (((d2 = buf[index++]) & 0xc0) != 0x80 ||
+	    ((d3 = buf[index++]) & 0xc0) != 0x80 ||
+	    ((d4 = buf[index++]) & 0xc0) != 0x80)
 	  return 0;
 	r = d & 0x0f; /* copy lower 4 */
 	r <<= 6;
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 9539b5e3c8..feb7b7ba2d 100644
--- a/legacy/evas/src/lib/engines/gl_x11/evas_engine.c
+++ b/legacy/evas/src/lib/engines/gl_x11/evas_engine.c
@@ -386,8 +386,8 @@ evas_engine_gl_x11_output_flush(void *data)
 #else
    glXSwapBuffers(re->win->disp, re->win->win);   
 #endif   
-   glFlush();
-   glXWaitGL();
+//   glFlush();
+//   glXWaitGL();
 //   XSync(re->win->disp, False);
 //   printf("SYNC! %i\n", fr++);
 }