multimedia/fxtv/patches/patch-ap

   1 $NetBSD: patch-ap,v 1.1 2006/06/30 18:11:39 tron Exp $
   2
   3 Fix illegal C.
   4
   5 --- videolib/videolib.c.orig    1999-11-03 02:22:04.000000000 +0000
   6 +++ videolib/videolib.c 2006-06-30 19:10:23.000000000 +0100
   7 @@ -479,9 +479,9 @@
   8              *(p++) = (*src16 >> 8) | (*src16 << 8);
   9              src16++;
  10            }
  11 -          for ( i = dst_line_pad; i > 0; i-- )
  12 -            *(((VL_UINT8 *)p)++) = 0x00;
  13 -          (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
  14 +          (void)memset(p, 0, dst_line_pad);
  15 +          dst_line = (VL_UINT16 *)((VL_UINT8 *)dst_line +
  16 +                                   dst->geom.bytes_per_line);
  17          }
  18
  19          src16 = dst_line = (VL_UINT16 *) dst->buf;
  20 @@ -513,9 +513,9 @@
  21          if ( src_padded )
  22            src16 = (VL_UINT16 *)( (VL_UINT8 *)src16 + dst_line_pad );
  23          else
  24 -          for ( i = dst_line_pad; i > 0; i-- )
  25 -            *(((VL_UINT8 *)dst)++) = 0x00;
  26 -        (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
  27 +          (void)memset(p, 0, dst_line_pad);
  28 +        dst_line = (VL_UINT16 *)((VL_UINT8 *)dst_line +
  29 +                                 dst->geom.bytes_per_line);
  30        }
  31
  32        if ( !dst_swap_b ) {                       /*  More ugliness  */
  33 @@ -527,8 +527,10 @@
  34              *(p++) = (*src16 >> 8) | (*src16 << 8);
  35              src16++;
  36            }
  37 -          (VL_UINT8 *)dst_line += dst->geom.bytes_per_line;
  38 -          (VL_UINT8 *)src16    += dst->geom.bytes_per_line;
  39 +          dst_line = (VL_UINT16 *)((VL_UINT8 *)dst_line +
  40 +                                   dst->geom.bytes_per_line);
  41 +          src16 = (VL_UINT16 *)((VL_UINT8 *)src16 +
  42 +                                dst->geom.bytes_per_line);
  43          }
  44        }
  45      }