Replace CopyMagickMemory() with memcpy() / memmove()
diff --git a/coders/icon.c b/coders/icon.c
index d73e082..a99c68c 100644
--- a/coders/icon.c
+++ b/coders/icon.c
@@ -362,7 +362,7 @@
png=(unsigned char *) AcquireQuantumMemory(length+16,sizeof(*png));
if (png == (unsigned char *) NULL)
ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
- (void) CopyMagickMemory(png,"\211PNG\r\n\032\n\000\000\000\015",12);
+ (void) memcpy(png,"\211PNG\r\n\032\n\000\000\000\015",12);
png[12]=(unsigned char) icon_info.planes;
png[13]=(unsigned char) (icon_info.planes >> 8);
png[14]=(unsigned char) icon_info.bits_per_pixel;
diff --git a/coders/jpeg.c b/coders/jpeg.c
index 5eae683..18545e4 100644
--- a/coders/jpeg.c
+++ b/coders/jpeg.c
@@ -2004,14 +2004,14 @@
tag_length=strlen(ICC_PROFILE);
p=GetStringInfoDatum(custom_profile);
- (void) CopyMagickMemory(p,ICC_PROFILE,tag_length);
+ (void) memcpy(p,ICC_PROFILE,tag_length);
p[tag_length]='\0';
for (i=0; i < (ssize_t) GetStringInfoLength(profile); i+=65519L)
{
length=MagickMin(GetStringInfoLength(profile)-i,65519L);
p[12]=(unsigned char) ((i/65519L)+1);
p[13]=(unsigned char) (GetStringInfoLength(profile)/65519L+1);
- (void) CopyMagickMemory(p+tag_length+3,GetStringInfoDatum(profile)+i,
+ (void) memcpy(p+tag_length+3,GetStringInfoDatum(profile)+i,
length);
jpeg_write_marker(jpeg_info,ICC_MARKER,GetStringInfoDatum(
custom_profile),(unsigned int) (length+tag_length+3));
@@ -2039,7 +2039,7 @@
}
else
{
- (void) CopyMagickMemory(p,"Photoshop 3.0 8BIM\04\04\0\0\0\0",24);
+ (void) memcpy(p,"Photoshop 3.0 8BIM\04\04\0\0\0\0",24);
tag_length=26;
p[24]=(unsigned char) (length >> 8);
p[25]=(unsigned char) (length & 0xff);
diff --git a/coders/mvg.c b/coders/mvg.c
index 6fa3efa..bbc9968 100644
--- a/coders/mvg.c
+++ b/coders/mvg.c
@@ -211,7 +211,7 @@
draw_info->primitive=(char *) AcquireMagickMemory(GetBlobSize(image)+1);
if (draw_info->primitive != (char *) NULL)
{
- CopyMagickMemory(draw_info->primitive,GetBlobStreamData(image),
+ memcpy(draw_info->primitive,GetBlobStreamData(image),
GetBlobSize(image));
draw_info->primitive[GetBlobSize(image)]='\0';
}
diff --git a/coders/palm.c b/coders/palm.c
index 9aa1a41..a36296d 100644
--- a/coders/palm.c
+++ b/coders/palm.c
@@ -473,7 +473,7 @@
one_row[i+bit]=last_row[i+bit];
}
}
- (void) CopyMagickMemory(last_row, one_row, bytes_per_row);
+ (void) memcpy(last_row, one_row, bytes_per_row);
}
}
ptr=one_row;
@@ -975,7 +975,7 @@
(void) WriteBlobByte(image, byte);
(void) WriteBlob(image,tptr-tmpbuf,(unsigned char *) tmpbuf);
}
- (void) CopyMagickMemory(last_row,one_row,bytes_per_row);
+ (void) memcpy(last_row,one_row,bytes_per_row);
}
else
(void) WriteBlob(image,bytes_per_row,one_row);
diff --git a/coders/pcd.c b/coders/pcd.c
index 2f35f0c..f2a1e9a 100644
--- a/coders/pcd.c
+++ b/coders/pcd.c
@@ -464,7 +464,7 @@
}
p=pixels+(2*height-2)*scaled_width;
q=pixels+(2*height-1)*scaled_width;
- (void) CopyMagickMemory(q,p,(size_t) (2*width));
+ (void) memcpy(q,p,(size_t) (2*width));
}
static Image *ReadPCDImage(const ImageInfo *image_info,ExceptionInfo *exception)
diff --git a/coders/pcl.c b/coders/pcl.c
index 077aef1..e94ae4f 100644
--- a/coders/pcl.c
+++ b/coders/pcl.c
@@ -943,7 +943,7 @@
(double) packets);
(void) WriteBlobString(image,buffer);
(void) WriteBlob(image,packets,compress_pixels);
- (void) CopyMagickMemory(previous_pixels,pixels,length*
+ (void) memcpy(previous_pixels,pixels,length*
sizeof(*pixels));
break;
}
diff --git a/coders/pcx.c b/coders/pcx.c
index a8bce12..0c99a5e 100644
--- a/coders/pcx.c
+++ b/coders/pcx.c
@@ -616,7 +616,7 @@
}
case 8:
{
- (void) CopyMagickMemory(r,p,image->columns);
+ (void) memcpy(r,p,image->columns);
break;
}
default:
diff --git a/coders/pdb.c b/coders/pdb.c
index effda78..7e1a80e 100644
--- a/coders/pdb.c
+++ b/coders/pdb.c
@@ -708,7 +708,7 @@
{
if (literal > 0)
*destination++=(unsigned char) (literal-1);
- (void) CopyMagickMemory(destination,source,literal);
+ (void) memcpy(destination,source,literal);
destination+=literal;
if (repeat > 0)
{
@@ -798,8 +798,8 @@
pdb_info.modify_number=0;
pdb_info.application_info=0;
pdb_info.sort_info=0;
- (void) CopyMagickMemory(pdb_info.type,"vIMG",4);
- (void) CopyMagickMemory(pdb_info.id,"View",4);
+ (void) memcpy(pdb_info.type,"vIMG",4);
+ (void) memcpy(pdb_info.id,"View",4);
pdb_info.seed=0;
pdb_info.next_record=0;
comment=GetImageProperty(image,"comment",exception);
@@ -916,7 +916,7 @@
if (0x7f < literal)
{
q=EncodeRLE(q,buffer,(literal < 0x80 ? literal : 0x80),0);
- (void) CopyMagickMemory(buffer,buffer+literal+repeat,0x80);
+ (void) memmove(buffer,buffer+literal+repeat,0x80);
literal-=0x80;
}
}
diff --git a/coders/pict.c b/coders/pict.c
index 36125ca..5794771 100644
--- a/coders/pict.c
+++ b/coders/pict.c
@@ -485,7 +485,7 @@
image->filename);
break;
}
- (void) CopyMagickMemory(q,p,(size_t) number_pixels);
+ (void) memcpy(q,p,(size_t) number_pixels);
}
scanline=(unsigned char *) RelinquishMagickMemory(scanline);
return(pixels);
@@ -520,7 +520,7 @@
number_pixels=length*bytes_per_pixel;
p=ExpandBuffer(scanline+j+1,&number_pixels,bits_per_pixel);
if ((q-pixels+number_pixels) <= *extent)
- (void) CopyMagickMemory(q,p,(size_t) number_pixels);
+ (void) memcpy(q,p,(size_t) number_pixels);
q+=number_pixels;
j+=(ssize_t) (length*bytes_per_pixel+1);
}
@@ -532,7 +532,7 @@
for (i=0; i < (ssize_t) length; i++)
{
if ((q-pixels+number_pixels) <= *extent)
- (void) CopyMagickMemory(q,p,(size_t) number_pixels);
+ (void) memcpy(q,p,(size_t) number_pixels);
q+=number_pixels;
}
j+=(ssize_t) bytes_per_pixel+1;
diff --git a/coders/png.c b/coders/png.c
index c5119e2..2cc4c38 100644
--- a/coders/png.c
+++ b/coders/png.c
@@ -1284,7 +1284,7 @@
static void PNGType(png_bytep p,const png_byte *type)
{
- (void) CopyMagickMemory(p,type,4*sizeof(png_byte));
+ (void) memcpy(p,type,4*sizeof(png_byte));
}
static void LogPNGChunk(MagickBooleanType logging, const png_byte *type,
@@ -6948,7 +6948,7 @@
}
n=GetAuthenticPixels(image,0,0,image->columns,1,exception);
- (void) CopyMagickMemory(next,n,length);
+ (void) memcpy(next,n,length);
for (y=0; y < (ssize_t) image->rows; y++)
{
@@ -6975,7 +6975,7 @@
{
n=GetAuthenticPixels(image,0,y+1,image->columns,1,
exception);
- (void) CopyMagickMemory(next,n,length);
+ (void) memcpy(next,n,length);
}
for (i=0; i < m; i++, yy++)
diff --git a/coders/psd.c b/coders/psd.c
index 58d22ed..02160b2 100644
--- a/coders/psd.c
+++ b/coders/psd.c
@@ -3081,7 +3081,7 @@
if ((quantum >= 12) && (quantum < (ssize_t) length))
{
if ((q+quantum < (datum+length-16)))
- (void) CopyMagickMemory(q,q+quantum,length-quantum-(q-datum));
+ (void) memmove(q,q+quantum,length-quantum-(q-datum));
SetStringInfoLength(bim_profile,length-quantum);
}
break;
@@ -3136,7 +3136,7 @@
if ((id == 0x000003ed) && (cnt < (ssize_t) (length-12)) &&
((ssize_t) length-(cnt+12)-(q-datum)) > 0)
{
- (void) CopyMagickMemory(q,q+cnt+12,length-(cnt+12)-(q-datum));
+ (void) memmove(q,q+cnt+12,length-(cnt+12)-(q-datum));
SetStringInfoLength(bim_profile,length-(cnt+12));
break;
}
@@ -3232,7 +3232,7 @@
if (found == MagickFalse)
{
if (remaining_length > 0)
- p=(unsigned char *) CopyMagickMemory(p-12,p+size,remaining_length);
+ p=(unsigned char *) memmove(p-12,p+size,remaining_length);
continue;
}
length+=(size_t) size+12;
diff --git a/coders/sfw.c b/coders/sfw.c
index ddd503f..f5a7861 100644
--- a/coders/sfw.c
+++ b/coders/sfw.c
@@ -279,7 +279,7 @@
}
TranslateSFWMarker(header); /* translate soi and app tags */
TranslateSFWMarker(header+2);
- (void) CopyMagickMemory(header+6,"JFIF\0\001\0",7); /* JFIF magic */
+ (void) memcpy(header+6,"JFIF\0\001\0",7); /* JFIF magic */
/*
Translate remaining markers.
*/
diff --git a/coders/sixel.c b/coders/sixel.c
index 417a011..b657f2f 100644
--- a/coders/sixel.c
+++ b/coders/sixel.c
@@ -373,7 +373,7 @@
}
(void) memset(dmbuf, background_color_index, (size_t) dmsx * dmsy);
for (y = 0; y < imsy; ++y) {
- (void) CopyMagickMemory(dmbuf + dmsx * y, imbuf + imsx * y, imsx);
+ (void) memcpy(dmbuf + dmsx * y, imbuf + imsx * y, imsx);
}
imbuf = (unsigned char *) RelinquishMagickMemory(imbuf);
imsx = dmsx;
@@ -451,7 +451,7 @@
}
(void) memset(dmbuf, background_color_index, (size_t) dmsx * dmsy);
for (y = 0; y < imsy; ++y) {
- (void) CopyMagickMemory(dmbuf + dmsx * y, imbuf + imsx * y, imsx);
+ (void) memcpy(dmbuf + dmsx * y, imbuf + imsx * y, imsx);
}
imbuf = (unsigned char *) RelinquishMagickMemory(imbuf);
imsx = dmsx;
@@ -549,7 +549,7 @@
return (MagickFalse);
}
for (y = 0; y < dmsy; ++y) {
- (void) CopyMagickMemory(dmbuf + dmsx * y, imbuf + imsx * y, dmsx);
+ (void) memcpy(dmbuf + dmsx * y, imbuf + imsx * y, dmsx);
}
imbuf = (unsigned char *) RelinquishMagickMemory(imbuf);
imsx = dmsx;
@@ -596,7 +596,7 @@
{
if ((context->pos += nwrite) >= SIXEL_OUTPUT_PACKET_SIZE) {
WriteBlob(context->image,SIXEL_OUTPUT_PACKET_SIZE,context->buffer);
- CopyMagickMemory(context->buffer,
+ memcpy(context->buffer,
context->buffer + SIXEL_OUTPUT_PACKET_SIZE,
(context->pos -= SIXEL_OUTPUT_PACKET_SIZE));
}
diff --git a/coders/sun.c b/coders/sun.c
index 1a557c7..c78fbc0 100644
--- a/coders/sun.c
+++ b/coders/sun.c
@@ -498,7 +498,7 @@
sun_pixels=(unsigned char *) RelinquishMagickMemory(sun_pixels);
ThrowReaderException(ResourceLimitError,"ImproperImageHeader");
}
- (void) CopyMagickMemory(sun_pixels,sun_data,sun_info.length);
+ (void) memcpy(sun_pixels,sun_data,sun_info.length);
}
sun_data=(unsigned char *) RelinquishMagickMemory(sun_data);
/*
diff --git a/coders/svg.c b/coders/svg.c
index 5f1b61b..4ae3497 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -365,7 +365,7 @@
q=message+length-1;
while ((isspace((int) ((unsigned char) *q)) != 0) && (q > p))
q--;
- (void) CopyMagickMemory(message,p,(size_t) (q-p+1));
+ (void) memcpy(message,p,(size_t) (q-p+1));
message[q-p+1]='\0';
StripString(message);
}
diff --git a/coders/tiff.c b/coders/tiff.c
index e194736..f9796b5 100644
--- a/coders/tiff.c
+++ b/coders/tiff.c
@@ -3006,7 +3006,7 @@
Fill scanlines to tile height.
*/
i=(ssize_t) (row % tiff_info->tile_geometry.height)*TIFFScanlineSize(tiff);
- (void) CopyMagickMemory(tiff_info->scanlines+i,(char *) tiff_info->scanline,
+ (void) memcpy(tiff_info->scanlines+i,(char *) tiff_info->scanline,
(size_t) TIFFScanlineSize(tiff));
if (((size_t) (row % tiff_info->tile_geometry.height) !=
(tiff_info->tile_geometry.height-1)) &&
