Changeset 1067 for libcaca/trunkTweet

Timestamp:

Sep 19, 2006, 8:40:09 PM (16 years ago)

Author:

Jean-Yves Lamoureux

Message:

• Ugly workaround in OpenGL driver for IA64 platform, unicode still does not work, thought.

Location:

libcaca/trunk

Files:

• caca/driver_gl.c (modified) (1 diff)
• cucul/font.c (modified) (1 diff)

libcaca/trunk/caca/driver_gl.c

@@ -255 +255 @@
             int i, b;
 
-            for(b = 0, i = 0; dp->drv.p->blocks[i + 1]; i += 2)
+            for(b = 0, i = 0; (dp->drv.p->blocks[i + 1]); i += 2)
             {
-                if(cv < dp->drv.p->blocks[i])
-                    break;
-
-                if(cv >= dp->drv.p->blocks[i + 1])
+                if(cv < (dp->drv.p->blocks[i]&0xFFFFFFFF))
+                     break;
+
+                if(cv >= (dp->drv.p->blocks[i + 1]))
                 {
-                    b += dp->drv.p->blocks[i + 1] - dp->drv.p->blocks[i];
+                    b += (dp->drv.p->blocks[i + 1]) - (dp->drv.p->blocks[i]);
                     continue;
                 }
 
                 glBindTexture(GL_TEXTURE_2D,
-                              dp->drv.p->txid[b + cv - dp->drv.p->blocks[i]]);
+                              dp->drv.p->txid[b + cv - (dp->drv.p->blocks[i]&0xFFFFFFFF)]);
 
                 fg = _cucul_argb32_to_rgb12fg(*attr);

libcaca/trunk/cucul/font.c

@@ -433 +433 @@
                     break;
                 }
-
-                if(ch < f->block_list[b].stop)
+                if(ch < f->block_list[b].stop) {
                     break;
+                }
             }