Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/evas
Dir : e17/libs/evas/src/lib/engines/common
Modified Files:
evas_font_main.c
Log Message:
in!
===================================================================
RCS file:
/cvsroot/enlightenment/e17/libs/evas/src/lib/engines/common/evas_font_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- evas_font_main.c 26 Jan 2004 11:27:59 -0000 1.12
+++ evas_font_main.c 20 Jul 2004 04:05:14 -0000 1.13
@@ -115,8 +115,7 @@
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 @@
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 @@
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;
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
