Changeset 4146Tweet

Timestamp:

Dec 18, 2009, 10:50:37 PM (13 years ago)

Author:

Sam Hocevar

Message:

Fix an alignment issue in caca_get_canvas_chars() and caca_get_canvas_attrs().
Fixes #41.

Location:

libcaca/trunk/caca

Files:

• caca.h (modified) (1 diff)
• canvas.c (modified) (5 diffs)
• driver/conio.c (modified) (2 diffs)
• driver/gl.c (modified) (2 diffs)
• driver/ncurses.c (modified) (1 diff)
• driver/slang.c (modified) (1 diff)
• driver/vga.c (modified) (1 diff)
• driver/win32.c (modified) (1 diff)
• driver/x11.c (modified) (1 diff)

libcaca/trunk/caca/caca.h

@@ -219 +219 @@
 __extern int caca_get_canvas_width(caca_canvas_t const *);
 __extern int caca_get_canvas_height(caca_canvas_t const *);
-__extern uint8_t const * caca_get_canvas_chars(caca_canvas_t const *);
-__extern uint8_t const * caca_get_canvas_attrs(caca_canvas_t const *);
+__extern uint32_t const * caca_get_canvas_chars(caca_canvas_t const *);
+__extern uint32_t const * caca_get_canvas_attrs(caca_canvas_t const *);
 __extern int caca_free_canvas(caca_canvas_t *);
 __extern int caca_rand(int, int);

libcaca/trunk/caca/canvas.c

@@ -264 +264 @@
  *  caca_get_char().
  *
- *  This function is only useful for display drivers such as the \e libcaca
- *  library.
+ *  This function is probably only useful for \e libcaca 's internal display
+ *  drivers.
  *
  *  This function never fails.
@@ -272 +272 @@
  *  \return The canvas character array.
  */
-uint8_t const * caca_get_canvas_chars(caca_canvas_t const *cv)
-{
-    return (uint8_t const *)cv->chars;
+uint32_t const * caca_get_canvas_chars(caca_canvas_t const *cv)
+{
+    return (uint32_t const *)cv->chars;
 }
 
@@ -283 +283 @@
  *  caca_get_attr().
  *
- *  This function is only useful for display drivers such as the \e libcaca
- *  library.
+ *  This function is probably only useful for \e libcaca 's internal display
+ *  drivers.
  *
  *  This function never fails.
@@ -291 +291 @@
  *  \return The canvas attribute array.
  */
-uint8_t const * caca_get_canvas_attrs(caca_canvas_t const *cv)
-{
-    return (uint8_t const *)cv->attrs;
+uint32_t const * caca_get_canvas_attrs(caca_canvas_t const *cv)
+{
+    return (uint32_t const *)cv->attrs;
 }
 
@@ -540 +540 @@
 int cucul_get_canvas_height(cucul_canvas_t const *)
     CACA_ALIAS(caca_get_canvas_height);
-uint8_t const * cucul_get_canvas_chars(cucul_canvas_t const *)
+uint32_t const * cucul_get_canvas_chars(cucul_canvas_t const *)
     CACA_ALIAS(caca_get_canvas_chars);
-uint8_t const * cucul_get_canvas_attrs(cucul_canvas_t const *)
+uint32_t const * cucul_get_canvas_attrs(cucul_canvas_t const *)
     CACA_ALIAS(caca_get_canvas_attrs);
 int cucul_free_canvas(cucul_canvas_t *) CACA_ALIAS(caca_free_canvas);

libcaca/trunk/caca/driver/conio.c

@@ -1 +1 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2006 Sam Hocevar <sam@zoy.org>
+ *  Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net>
  *                All Rights Reserved
  *
@@ -99 +99 @@
 {
     char *screen = dp->drv.p->screen;
-    uint32_t const *chars = (uint32_t const *)caca_get_canvas_chars(dp->cv);
-    uint32_t const *attrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv);
+    uint32_t const *chars = caca_get_canvas_chars(dp->cv);
+    uint32_t const *attrs = caca_get_canvas_attrs(dp->cv);
     int width = caca_get_canvas_width(dp->cv);
     int height = caca_get_canvas_height(dp->cv);

libcaca/trunk/caca/driver/gl.c

@@ -1 +1 @@
 /*
  *  libcaca       Colour ASCII-Art library
- *  Copyright (c) 2002-2006 Sam Hocevar <sam@hocevar.net>
+ *  Copyright (c) 2002-2009 Sam Hocevar <sam@hocevar.net>
  *                2006 Jean-Yves Lamoureux <jylam@lnxscene.org>
  *                2007 Ben Wiley Sittler <bsittler@gmail.com>
@@ -217 +217 @@
 static void gl_display(caca_display_t *dp)
 {
-    uint32_t const *cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv);
-    uint32_t const *cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv);
+    uint32_t const *cvchars = caca_get_canvas_chars(dp->cv);
+    uint32_t const *cvattrs = caca_get_canvas_attrs(dp->cv);
     int width = caca_get_canvas_width(dp->cv);
     int x, y, line;

libcaca/trunk/caca/driver/ncurses.c

@@ -356 +356 @@
         caca_get_dirty_rect(dp->cv, i, &dx, &dy, &dw, &dh);
 
-        cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv)
-                    + dx + dy * dp->cv->width;
-        cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv)
-                    + dx + dy * dp->cv->width;
+        cvchars = caca_get_canvas_chars(dp->cv) + dx + dy * dp->cv->width;
+        cvattrs = caca_get_canvas_attrs(dp->cv) + dx + dy * dp->cv->width;
 
         for(y = dy; y < dy + dh; y++)

libcaca/trunk/caca/driver/slang.c

@@ -245 +245 @@
         caca_get_dirty_rect(dp->cv, i, &dx, &dy, &dw, &dh);
 
-        cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv)
-                    + dx + dy * dp->cv->width;
-        cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv)
-                    + dx + dy * dp->cv->width;
+        cvchars = caca_get_canvas_chars(dp->cv) + dx + dy * dp->cv->width;
+        cvattrs = caca_get_canvas_attrs(dp->cv) + dx + dy * dp->cv->width;
 
         for(y = dy; y < dy + dh; y++)

libcaca/trunk/caca/driver/vga.c

@@ -125 +125 @@
         caca_get_dirty_rect(dp->cv, i, &dx, &dy, &dw, &dh);
 
-        cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv)
-                    + dx + dy * dp->cv->width;
-        cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv)
-                    + dx + dy * dp->cv->width;
+        cvchars = caca_get_canvas_chars(dp->cv) + dx + dy * dp->cv->width;
+        cvattrs = caca_get_canvas_attrs(dp->cv) + dx + dy * dp->cv->width;
 
         screen += dy * dp->cv->width + dx;

libcaca/trunk/caca/driver/win32.c

@@ -196 +196 @@
     SMALL_RECT rect;
     CHAR_INFO *buffer = dp->drv.p->buffer;
-    uint32_t const *cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv);
-    uint32_t const *cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv);
+    uint32_t const *cvchars = caca_get_canvas_chars(dp->cv);
+    uint32_t const *cvattrs = caca_get_canvas_attrs(dp->cv);
     int width = caca_get_canvas_width(dp->cv);
     int height = caca_get_canvas_height(dp->cv);

libcaca/trunk/caca/driver/x11.c

@@ -394 +394 @@
 static void x11_display(caca_display_t *dp)
 {
-    uint32_t const *cvchars = (uint32_t const *)caca_get_canvas_chars(dp->cv);
-    uint32_t const *cvattrs = (uint32_t const *)caca_get_canvas_attrs(dp->cv);
+    uint32_t const *cvchars = caca_get_canvas_chars(dp->cv);
+    uint32_t const *cvattrs = caca_get_canvas_attrs(dp->cv);
     int width = caca_get_canvas_width(dp->cv);
     int height = caca_get_canvas_height(dp->cv);