This isn’t right … memcpy() args are swapped compared to bcopy(). Ditto in r65319.
Cheers! Sean On Jun 15, 2015, at 10:03 PM, starsee...@users.sourceforge.net wrote: > Revision: 65318 > http://sourceforge.net/p/brlcad/code/65318 > Author: starseeker > Date: 2015-06-16 02:03:57 +0000 (Tue, 16 Jun 2015) > Log Message: > ----------- > bcopy -> memcpy > > Modified Paths: > -------------- > brlcad/trunk/src/other/libutahrle/rle_hdr.c > brlcad/trunk/src/other/libutahrle/rle_rawrow.c > > Modified: brlcad/trunk/src/other/libutahrle/rle_hdr.c > =================================================================== > --- brlcad/trunk/src/other/libutahrle/rle_hdr.c 2015-06-16 01:59:37 UTC > (rev 65317) > +++ brlcad/trunk/src/other/libutahrle/rle_hdr.c 2015-06-16 02:03:57 UTC > (rev 65318) > @@ -153,7 +153,7 @@ > int size = to_hdr->ncolors * sizeof(int); > to_hdr->bg_color = (int *)malloc( size ); > RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->bg_color, "background color" ); > - bcopy( from_hdr->bg_color, to_hdr->bg_color, size ); > + memcpy( from_hdr->bg_color, to_hdr->bg_color, size ); > } > > if ( to_hdr->cmap ) > @@ -161,7 +161,7 @@ > int size = to_hdr->ncmap * (1 << to_hdr->cmaplen) * sizeof(rle_map); > to_hdr->cmap = (rle_map *)malloc( size ); > RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->cmap, "color map" ); > - bcopy( from_hdr->cmap, to_hdr->cmap, size ); > + memcpy( from_hdr->cmap, to_hdr->cmap, size ); > } > > /* Only copy array of pointers, as the original comment memory > @@ -180,7 +180,7 @@ > size *= sizeof(char *); > to_hdr->comments = (CONST_DECL char **)malloc( size ); > RLE_CHECK_ALLOC( to_hdr->cmd, to_hdr->comments, "comments" ); > - bcopy( (const void *)from_hdr->comments, (void *)to_hdr->comments, > size ); > + memcpy( (const void *)from_hdr->comments, (void *)to_hdr->comments, > size ); > } > else > to_hdr->comments = NULL; /* Blow off empty comment list. */ > > Modified: brlcad/trunk/src/other/libutahrle/rle_rawrow.c > =================================================================== > --- brlcad/trunk/src/other/libutahrle/rle_rawrow.c 2015-06-16 01:59:37 UTC > (rev 65317) > +++ brlcad/trunk/src/other/libutahrle/rle_rawrow.c 2015-06-16 02:03:57 UTC > (rev 65318) > @@ -61,7 +61,7 @@ > switch (raw[chan][i].opcode) > { > case RByteDataOp: > - bcopy( (char *)raw[chan][i].u.pixels, (char *)outptr, > + memcpy( (char *)raw[chan][i].u.pixels, (char *)outptr, > raw[chan][i].length ); > break;
------------------------------------------------------------------------------
_______________________________________________ BRL-CAD Developer mailing list brlcad-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-devel
