mirror of
https://git.FreeBSD.org/ports.git
synced 2024-12-25 04:43:33 +00:00
df643d44db
This patch unbreaks building this port on 7-CURRENT (with gcc 4.2) PR: ports/116126 Submitted by: Simun Mikecin <numisemis@yahoo.com>
39 lines
1.4 KiB
C
39 lines
1.4 KiB
C
--- videolib/videolib.c.orig 1999-11-03 03:22:04.000000000 +0100
|
|
+++ videolib/videolib.c 2007-09-05 18:31:05.000000000 +0200
|
|
@@ -479,9 +479,8 @@
|
|
*(p++) = (*src16 >> 8) | (*src16 << 8);
|
|
src16++;
|
|
}
|
|
- for ( i = dst_line_pad; i > 0; i-- )
|
|
- *(((VL_UINT8 *)p)++) = 0x00;
|
|
- (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
|
|
+ memset(p, 0, dst_line_pad);
|
|
+ dst_line += dst->geom.bytes_per_line / sizeof(VL_UINT16);
|
|
}
|
|
|
|
src16 = dst_line = (VL_UINT16 *) dst->buf;
|
|
@@ -513,9 +512,9 @@
|
|
if ( src_padded )
|
|
src16 = (VL_UINT16 *)( (VL_UINT8 *)src16 + dst_line_pad );
|
|
else
|
|
- for ( i = dst_line_pad; i > 0; i-- )
|
|
- *(((VL_UINT8 *)dst)++) = 0x00;
|
|
- (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
|
|
+ memset(dst, 0, dst_line_pad);
|
|
+ dst += dst_line_pad / sizeof(VL_IMAGE);
|
|
+ dst_line += dst->geom.bytes_per_line / sizeof(VL_UINT16);
|
|
}
|
|
|
|
if ( !dst_swap_b ) { /* More ugliness */
|
|
@@ -527,8 +526,8 @@
|
|
*(p++) = (*src16 >> 8) | (*src16 << 8);
|
|
src16++;
|
|
}
|
|
- (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
|
|
- (VL_UINT8 *)src16 += dst->geom.bytes_per_line;
|
|
+ dst_line += dst->geom.bytes_per_line / sizeof(VL_UINT16);
|
|
+ src16 += dst->geom.bytes_per_line / sizeof(VL_UINT16);
|
|
}
|
|
}
|
|
}
|