aboutsummaryrefslogtreecommitdiffstats
path: root/com32/lib/sys/vesa/screencpy.c
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2013-01-10 11:22:56 +0000
committerMatt Fleming <matt.fleming@intel.com>2013-01-11 09:28:38 +0000
commitafd985f6eec18a0f66a8fc55f9c5e3431128310f (patch)
treeb4e657eccfd9a6f993286f49bc2b6951ef68eb56 /com32/lib/sys/vesa/screencpy.c
parente394bc5e14d6e0d588178bf4a78f942acd423135 (diff)
downloadsyslinux-afd985f6eec18a0f66a8fc55f9c5e3431128310f.tar.gz
syslinux-afd985f6eec18a0f66a8fc55f9c5e3431128310f.tar.xz
syslinux-afd985f6eec18a0f66a8fc55f9c5e3431128310f.zip
Revert "vesa: Correct screencpy() prototype"
This reverts commit 15a67011987c341814533ac4d8e23c9a72dc7605, because as Peter points out, The objects are uint32_t and so the prototype is correct. It should not "leak" outside the screencpy function that we play ugly tricks with these pointers; that is better handled by an internal cast. So do the necessary casting inside bios_vesacon_screencpy(). Cc: H. Peter Anvin <hpa@zytor.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'com32/lib/sys/vesa/screencpy.c')
-rw-r--r--com32/lib/sys/vesa/screencpy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/com32/lib/sys/vesa/screencpy.c b/com32/lib/sys/vesa/screencpy.c
index 5c6d9151..d78109bc 100644
--- a/com32/lib/sys/vesa/screencpy.c
+++ b/com32/lib/sys/vesa/screencpy.c
@@ -70,8 +70,8 @@ void __vesacon_copy_to_screen(size_t dst, const uint32_t * src, size_t npixels)
{
size_t bytes = npixels * __vesacon_bytes_per_pixel;
char rowbuf[bytes + 4] __aligned(4);
- const char *s;
+ const uint32_t *s;
- s = (const char *)__vesacon_format_pixels(rowbuf, src, npixels);
+ s = (const uint32_t *)__vesacon_format_pixels(rowbuf, src, npixels);
firmware->vesa->screencpy(dst, s, bytes, &wi);
}