Revision: 65320
http://sourceforge.net/p/brlcad/code/65320
Author: starseeker
Date: 2015-06-16 02:17:52 +0000 (Tue, 16 Jun 2015)
Log Message:
-----------
bzero->memset
Modified Paths:
--------------
brlcad/trunk/src/other/URToolkit/cnv/aliastorle.c
brlcad/trunk/src/other/URToolkit/cnv/rletoabA60.c
brlcad/trunk/src/other/URToolkit/cnv/rletoalias.c
brlcad/trunk/src/other/URToolkit/cnv/rletorla.c
brlcad/trunk/src/other/URToolkit/tools/avg4.c
brlcad/trunk/src/other/URToolkit/tools/crop.c
brlcad/trunk/src/other/URToolkit/tools/fant.c
brlcad/trunk/src/other/URToolkit/tools/mcut.c
brlcad/trunk/src/other/URToolkit/tools/rlecomp.c
brlcad/trunk/src/other/URToolkit/tools/rleldmap.c
brlcad/trunk/src/other/URToolkit/tools/rlestereo.c
Modified: brlcad/trunk/src/other/URToolkit/cnv/aliastorle.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/cnv/aliastorle.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/cnv/aliastorle.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -600,7 +600,7 @@
* Usually compilers fill buffers with zeros,
* but ...
*/
- bzero( ptr, size );
+ memset( ptr, 0, size );
return ptr;
}
Modified: brlcad/trunk/src/other/URToolkit/cnv/rletoabA60.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/cnv/rletoabA60.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/cnv/rletoabA60.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -106,9 +106,9 @@
/*
* Initialize some variables.
*/
- bzero( scanred, LINE_LENGTH * FRAME_LENGTH );
- bzero( scangrn, LINE_LENGTH * FRAME_LENGTH );
- bzero( scanblu, LINE_LENGTH * FRAME_LENGTH );
+ memset( scanred, 0, LINE_LENGTH * FRAME_LENGTH );
+ memset( scangrn, 0, LINE_LENGTH * FRAME_LENGTH );
+ memset( scanblu, 0, LINE_LENGTH * FRAME_LENGTH );
for (i=0; i<3; i++)
scanbuf[i] = (rle_pixel *) malloc ( LINE_LENGTH * sizeof(rle_pixel));
Modified: brlcad/trunk/src/other/URToolkit/cnv/rletoalias.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/cnv/rletoalias.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/cnv/rletoalias.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -465,7 +465,7 @@
* Usually compilers fill buffers with zeros,
* but ...
*/
- bzero( ptr, size );
+ memset( ptr, 0, size );
return ptr;
}
Modified: brlcad/trunk/src/other/URToolkit/cnv/rletorla.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/cnv/rletorla.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/cnv/rletorla.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -178,7 +178,7 @@
char *d_str;
long second;
- bzero(&rlb_head, 740);
+ memset(&rlb_head, 0, 740);
rlb_head.window.left = minx;
rlb_head.window.right = maxx;
rlb_head.window.top = maxy;
Modified: brlcad/trunk/src/other/URToolkit/tools/avg4.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/tools/avg4.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/tools/avg4.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -121,7 +121,7 @@
*/
if ((chan == RLE_ALPHA) && (!in_hdr.alpha))
{
- bzero(alphptr, new_xlen);
+ memset(alphptr, 0, new_xlen);
}
else for( i = 0; i < new_xlen; i++)
{
Modified: brlcad/trunk/src/other/URToolkit/tools/crop.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/tools/crop.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/tools/crop.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -173,7 +173,7 @@
*pix = c;
}
else
- bzero( (char *)&scanline[j][out_hdr.xmin],
+ memset( (char *)&scanline[j][out_hdr.xmin], 0,
out_hdr.xmax - out_hdr.xmin + 1 );
bottom_row = in_hdr.ymin;
Modified: brlcad/trunk/src/other/URToolkit/tools/fant.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/tools/fant.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/tools/fant.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -748,7 +748,7 @@
clear_raster(ras_ptr)
rle_pixel ***ras_ptr;
{
- bzero( &(ras_ptr[cur_chan][0][0]), array_width * array_lines );
+ memset( &(ras_ptr[cur_chan][0][0]), 0, array_width * array_lines );
}
#ifdef DEBUG
Modified: brlcad/trunk/src/other/URToolkit/tools/mcut.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/tools/mcut.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/tools/mcut.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -381,7 +381,7 @@
/* Get a color box. */
cb = (color_box_t *) malloc( sizeof( color_box_t ) );
RLE_CHECK_ALLOC( cmd_nm, cb, 0 );
- bzero( cb, sizeof( color_box_t ) );
+ memset( cb, 0, sizeof( color_box_t ) );
/* Compact histogram. */
for ( oldh = newh = 0; oldh < 32768; oldh++ )
@@ -502,7 +502,7 @@
*/
newbox = (color_box_t *) malloc( sizeof(color_box_t) );
RLE_CHECK_ALLOC( cmd_nm, newbox, 0 );
- bzero( newbox, sizeof( color_box_t ) );
+ memset( newbox, 0, sizeof( color_box_t ) );
newbox->hist = &box->hist[i];
newbox->hsize = box->hsize - i;
Modified: brlcad/trunk/src/other/URToolkit/tools/rlecomp.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/tools/rlecomp.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/tools/rlecomp.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -184,13 +184,13 @@
{
A_hdr.bg_color = (int *)malloc( A_hdr.ncolors * sizeof(int) );
RLE_CHECK_ALLOC( A_hdr.cmd, A_hdr.bg_color, "background color" );
- bzero( A_hdr.bg_color, A_hdr.ncolors * sizeof(int) );
+ memset( A_hdr.bg_color, 0, A_hdr.ncolors * sizeof(int) );
}
if ( B_hdr.bg_color == 0 )
{
B_hdr.bg_color = (int *)malloc( B_hdr.ncolors * sizeof(int) );
RLE_CHECK_ALLOC( B_hdr.cmd, B_hdr.bg_color, "background color" );
- bzero( B_hdr.bg_color, B_hdr.ncolors * sizeof(int) );
+ memset( B_hdr.bg_color, 0, B_hdr.ncolors * sizeof(int) );
}
/*
@@ -204,8 +204,8 @@
MALLOC_ERR;
for ( i = RLE_ALPHA; i < out_hdr.ncolors; i++ )
{
- bzero( Ascanline[i], out_hdr.xmax + 1 );
- bzero( Bscanline[i], out_hdr.xmax + 1 );
+ memset( Ascanline[i], 0, out_hdr.xmax + 1 );
+ memset( Bscanline[i], 0, out_hdr.xmax + 1 );
}
if (rle_row_alloc( &out_hdr, &scanout ) < 0)
@@ -433,7 +433,7 @@
if (*num_skip > 0) /* Generate a blank (skipped) scanline */
{
for( i = RLE_ALPHA; i < the_hdr->ncolors; i++ )
- bzero( scanline[i], the_hdr->xmax );
+ memset( scanline[i], 0, the_hdr->xmax );
(*num_skip)--;
if (*num_skip == 0)
*num_skip = -1; /* Flag raw data available */
@@ -537,7 +537,7 @@
/*
* Create a "bytemask" of the non-zero pixels.
*/
- bzero( non_zero_pixels, xlen );
+ memset( non_zero_pixels, 0, xlen );
for (chan = 0; chan < in_hdr->ncolors; chan++ )
{
register int bgc = in_hdr->bg_color[chan];
Modified: brlcad/trunk/src/other/URToolkit/tools/rleldmap.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/tools/rleldmap.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/tools/rleldmap.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -238,7 +238,7 @@
else
break;
/* Build in_hdr for non-existant image (all zeros works fine) */
- bzero( &in_hdr, sizeof in_hdr );
+ memset( &in_hdr, 0, sizeof in_hdr );
}
/* If apply flag was given, check for compatibility of color maps */
Modified: brlcad/trunk/src/other/URToolkit/tools/rlestereo.c
===================================================================
--- brlcad/trunk/src/other/URToolkit/tools/rlestereo.c 2015-06-16 02:09:19 UTC
(rev 65319)
+++ brlcad/trunk/src/other/URToolkit/tools/rlestereo.c 2015-06-16 02:17:52 UTC
(rev 65320)
@@ -195,10 +195,10 @@
*/
if (GreenFlag) {
RightIndex = 1;
- bzero(outline[2], Xres * sizeof(rle_pixel));
+ memset(outline[2], 0, Xres * sizeof(rle_pixel));
} else {
RightIndex = 2;
- bzero(outline[1], Xres * sizeof(rle_pixel));
+ memset(outline[1], 0, Xres * sizeof(rle_pixel));
}
/*
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
