diff --git a/magick/animate.c b/magick/animate.c
index b055619..dde8ece 100644
--- a/magick/animate.c
+++ b/magick/animate.c
@@ -1292,7 +1292,6 @@
char
command[MaxTextExtent],
- *cwd,
geometry[MaxTextExtent],
resource_name[MaxTextExtent];
@@ -2827,7 +2826,7 @@
/*
Change to home directory.
*/
- cwd=getcwd(working_directory,MaxTextExtent);
+ (void) getcwd(working_directory,MaxTextExtent);
status=chdir(resource_info->home_directory);
if (status == -1)
(void) ThrowMagickException(&images->exception,GetMagickModule(),
diff --git a/magick/cipher.c b/magick/cipher.c
index a5900a2..6ba2f5b 100644
--- a/magick/cipher.c
+++ b/magick/cipher.c
@@ -559,9 +559,6 @@
const unsigned char
*digest;
- IndexPacket
- *indexes;
-
ssize_t
y;
@@ -656,7 +653,6 @@
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
length=ExportQuantumPixels(image,image_view,quantum_info,quantum_type,
pixels,exception);
p=pixels;
@@ -762,9 +758,6 @@
const unsigned char
*digest;
- IndexPacket
- *indexes;
-
ssize_t
y;
@@ -866,7 +859,6 @@
q=GetCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception);
if (q == (PixelPacket *) NULL)
break;
- indexes=GetCacheViewAuthenticIndexQueue(image_view);
length=ExportQuantumPixels(image,image_view,quantum_info,quantum_type,
pixels,exception);
p=pixels;
diff --git a/magick/color.c b/magick/color.c
index a7bd137..009fd17 100644
--- a/magick/color.c
+++ b/magick/color.c
@@ -1691,6 +1691,7 @@
assert(y_offset != (ssize_t *) NULL);
assert(exception != (ExceptionInfo *) NULL);
x=0;
+ status=MagickTrue;
GetMagickPixelPacket(image,&pixel);
GetMagickPixelPacket(image,&target);
image_view=AcquireCacheView(image);
@@ -1735,6 +1736,8 @@
image_view=DestroyCacheView(image_view);
*x_offset=x;
*y_offset=y;
+ if (status == MagickFalse)
+ return(status);
return(y < (ssize_t) image->rows ? MagickTrue : MagickFalse);
}
diff --git a/magick/compare.c b/magick/compare.c
index f593d34..d17033f 100644
--- a/magick/compare.c
+++ b/magick/compare.c
@@ -1413,6 +1413,7 @@
ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
(void) ResetMagickMemory(channel_distortion,0,length*
sizeof(*channel_distortion));
+ status=MagickTrue;
switch (metric)
{
case AbsoluteErrorMetric:
@@ -1471,6 +1472,11 @@
break;
}
}
+ if (status == MagickFalse)
+ {
+ channel_distortion=(double *) RelinquishMagickMemory(channel_distortion);
+ return((double *) NULL);
+ }
return(channel_distortion);
}
diff --git a/magick/display.c b/magick/display.c
index 6d7a0cb..53e4860 100644
--- a/magick/display.c
+++ b/magick/display.c
@@ -14264,7 +14264,6 @@
char
command[MaxTextExtent],
- *cwd,
geometry[MaxTextExtent],
resource_name[MaxTextExtent];
@@ -15978,7 +15977,7 @@
/*
Change to home directory.
*/
- cwd=getcwd(working_directory,MaxTextExtent);
+ (void) getcwd(working_directory,MaxTextExtent);
{
int
status;
diff --git a/magick/draw.c b/magick/draw.c
index c1703a5..1b6034c 100644
--- a/magick/draw.c
+++ b/magick/draw.c
@@ -2315,9 +2315,6 @@
name[MaxTextExtent],
type[MaxTextExtent];
- ElementInfo
- element;
-
SegmentInfo
segment;
@@ -2327,28 +2324,23 @@
(void) CopyMagickString(type,token,MaxTextExtent);
GetMagickToken(q,&q,token);
segment.x1=StringToDouble(token);
- element.cx=StringToDouble(token);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
segment.y1=StringToDouble(token);
- element.cy=StringToDouble(token);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
segment.x2=StringToDouble(token);
- element.major=StringToDouble(token);
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
segment.y2=StringToDouble(token);
- element.minor=StringToDouble(token);
if (LocaleCompare(type,"radial") == 0)
{
GetMagickToken(q,&q,token);
if (*token == ',')
GetMagickToken(q,&q,token);
- element.angle=StringToDouble(token);
}
for (p=q; *q != '\0'; )
{
@@ -2875,10 +2867,7 @@
t=token;
for (s=token; *s != '\0'; s=t)
{
- double
- value;
-
- value=strtod(s,&t);
+ (void) strtod(s,&t);
if (s == t)
{
t++;
diff --git a/magick/enhance.c b/magick/enhance.c
index 6270ec1..e84ec73 100644
--- a/magick/enhance.c
+++ b/magick/enhance.c
@@ -2996,9 +2996,6 @@
*histogram,
intensity;
- MagickSizeType
- number_pixels;
-
ssize_t
black,
white,
@@ -3039,7 +3036,6 @@
/*
Find the histogram boundaries by locating the black and white point levels.
*/
- number_pixels=(MagickSizeType) image->columns*image->rows;
intensity=0.0;
for (black=0; black < (ssize_t) MaxMap; black++)
{
diff --git a/magick/fx.c b/magick/fx.c
index 18dbb1b..05d2437 100644
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -4614,6 +4614,7 @@
j=0;
depth=stegano_image->depth;
k=image->offset;
+ status=MagickTrue;
watermark_view=AcquireCacheView(watermark);
stegano_view=AcquireCacheView(stegano_image);
for (i=(ssize_t) depth-1; (i >= 0) && (j < (ssize_t) depth); i--)
@@ -4675,6 +4676,11 @@
watermark_view=DestroyCacheView(watermark_view);
if (stegano_image->storage_class == PseudoClass)
(void) SyncImage(stegano_image);
+ if (status == MagickFalse)
+ {
+ stegano_image=DestroyImage(stegano_image);
+ return((Image *) NULL);
+ }
return(stegano_image);
}
@@ -4771,6 +4777,7 @@
/*
Copy left image to red channel and right image to blue channel.
*/
+ status=MagickTrue;
for (y=0; y < (ssize_t) stereo_image->rows; y++)
{
register const PixelPacket
@@ -4813,6 +4820,11 @@
status=MagickFalse;
}
}
+ if (status == MagickFalse)
+ {
+ stereo_image=DestroyImage(stereo_image);
+ return((Image *) NULL);
+ }
return(stereo_image);
}
diff --git a/magick/geometry.c b/magick/geometry.c
index 892c09b..4e7c7b3 100644
--- a/magick/geometry.c
+++ b/magick/geometry.c
@@ -90,9 +90,6 @@
pedantic_geometry[MaxTextExtent],
*q;
- double
- value;
-
MagickStatusType
flags;
@@ -188,9 +185,9 @@
if (*p == '\0')
return(flags);
q=p;
- value=strtod(p,&q);
+ (void) strtod(p,&q);
if (LocaleNCompare(p,"0x",2) == 0)
- value=(double) strtol(p,&q,10);
+ (void) strtol(p,&q,10);
if ((((int) *q) == -41) || (*q == 'x') || (*q == 'X') || (*q == '\0'))
{
/*
@@ -548,13 +545,10 @@
char
*p;
- double
- value;
-
if (geometry == (const char *) NULL)
return(MagickFalse);
p=(char *) geometry;
- value=strtod(geometry,&p);
+ (void) strtod(geometry,&p);
if (p == geometry)
return(MagickFalse);
if (strspn(geometry,"0123456789-, ") != strlen(geometry))
diff --git a/magick/histogram.c b/magick/histogram.c
index ff62b82..aa16c01 100644
--- a/magick/histogram.c
+++ b/magick/histogram.c
@@ -1161,6 +1161,7 @@
HistogramCompare);
GetMagickPixelPacket(image,&pixel);
p=histogram;
+ status=MagickTrue;
for (i=0; i < (ssize_t) number_colors; i++)
{
SetMagickPixelPacket(image,&p->pixel,&p->index,&pixel);
@@ -1199,6 +1200,8 @@
}
(void) fflush(file);
histogram=(ColorPacket *) RelinquishMagickMemory(histogram);
+ if (status == MagickFalse)
+ return(0);
return(number_colors);
}
@@ -1260,6 +1263,7 @@
register PixelPacket
*restrict q;
+ status=MagickTrue;
p=node_info->list;
for (i=0; i < (ssize_t) node_info->number_unique; i++)
{
@@ -1287,6 +1291,8 @@
status=MagickFalse;
}
cube_info->progress++;
+ if (status == MagickFalse)
+ return;
}
}
diff --git a/magick/image-view.c b/magick/image-view.c
index ed37a13..b4fedce 100644
--- a/magick/image-view.c
+++ b/magick/image-view.c
@@ -220,7 +220,6 @@
Image
*destination_image,
- *duplex_image,
*source_image;
MagickBooleanType
@@ -237,7 +236,6 @@
if (transfer == (DuplexTransferImageViewMethod) NULL)
return(MagickFalse);
source_image=source->image;
- duplex_image=duplex->image;
destination_image=destination->image;
if (SetImageStorageClass(destination_image,DirectClass) == MagickFalse)
return(MagickFalse);
@@ -255,17 +253,10 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict duplex_indexes,
- *restrict indexes;
-
register const PixelPacket
*restrict duplex_pixels,
*restrict pixels;
- register IndexPacket
- *restrict destination_indexes;
-
register PixelPacket
*restrict destination_pixels;
@@ -278,7 +269,6 @@
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(source->view);
duplex_pixels=GetCacheViewVirtualPixels(duplex->view,duplex->extent.x,y,
duplex->extent.width,1,duplex->exception);
if (duplex_pixels == (const PixelPacket *) NULL)
@@ -286,7 +276,6 @@
status=MagickFalse;
continue;
}
- duplex_indexes=GetCacheViewVirtualIndexQueue(duplex->view);
destination_pixels=GetCacheViewAuthenticPixels(destination->view,
destination->extent.x,y,destination->extent.width,1,exception);
if (destination_pixels == (PixelPacket *) NULL)
@@ -294,7 +283,6 @@
status=MagickFalse;
continue;
}
- destination_indexes=GetCacheViewAuthenticIndexQueue(destination->view);
if (transfer(source,duplex,destination,y,id,context) == MagickFalse)
status=MagickFalse;
sync=SyncCacheViewAuthenticPixels(destination->view,exception);
@@ -568,9 +556,6 @@
const int
id = GetOpenMPThreadId();
- register const IndexPacket
- *indexes;
-
register const PixelPacket
*pixels;
@@ -583,7 +568,6 @@
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(source->view);
if (get(source,y,id,context) == MagickFalse)
status=MagickFalse;
if (source_image->progress_monitor != (MagickProgressMonitor) NULL)
@@ -913,9 +897,6 @@
MagickBooleanType
sync;
- register IndexPacket
- *restrict indexes;
-
register PixelPacket
*restrict pixels;
@@ -930,7 +911,6 @@
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(destination->view);
if (set(destination,y,id,context) == MagickFalse)
status=MagickFalse;
sync=SyncCacheViewAuthenticPixels(destination->view,exception);
@@ -1081,15 +1061,9 @@
MagickBooleanType
sync;
- register const IndexPacket
- *restrict indexes;
-
register const PixelPacket
*restrict pixels;
- register IndexPacket
- *restrict destination_indexes;
-
register PixelPacket
*restrict destination_pixels;
@@ -1102,7 +1076,6 @@
status=MagickFalse;
continue;
}
- indexes=GetCacheViewVirtualIndexQueue(source->view);
destination_pixels=GetCacheViewAuthenticPixels(destination->view,
destination->extent.x,y,destination->extent.width,1,exception);
if (destination_pixels == (PixelPacket *) NULL)
@@ -1110,7 +1083,6 @@
status=MagickFalse;
continue;
}
- destination_indexes=GetCacheViewAuthenticIndexQueue(destination->view);
if (transfer(source,destination,y,id,context) == MagickFalse)
status=MagickFalse;
sync=SyncCacheViewAuthenticPixels(destination->view,exception);
@@ -1216,9 +1188,6 @@
const int
id = GetOpenMPThreadId();
- register IndexPacket
- *restrict indexes;
-
register PixelPacket
*restrict pixels;
@@ -1232,7 +1201,6 @@
status=MagickFalse;
continue;
}
- indexes=GetCacheViewAuthenticIndexQueue(source->view);
if (update(source,y,id,context) == MagickFalse)
status=MagickFalse;
if (SyncCacheViewAuthenticPixels(source->view,exception) == MagickFalse)
diff --git a/magick/image.c b/magick/image.c
index 122009d..e147292 100644
--- a/magick/image.c
+++ b/magick/image.c
@@ -1717,6 +1717,7 @@
value;
value=(ssize_t) strtol(q,&q,10);
+ (void) value;
}
switch (*q)
{
diff --git a/magick/magick-config.h b/magick/magick-config.h
index 9423687..b52f40d 100644
--- a/magick/magick-config.h
+++ b/magick/magick-config.h
@@ -465,11 +465,6 @@
#define MAGICKCORE_HAVE_LSTAT 1
#endif
-/* define if the compiler implements L"widestring" */
-#ifndef MAGICKCORE_HAVE_LSTRING
-#define MAGICKCORE_HAVE_LSTRING /**/
-#endif
-
/* Define this if a modern libltdl is already installed */
#ifndef MAGICKCORE_HAVE_LTDL
#define MAGICKCORE_HAVE_LTDL 1
@@ -1124,6 +1119,11 @@
#define MAGICKCORE_LT_LIBEXT "a"
#endif
+/* The archive prefix */
+#ifndef MAGICKCORE_LT_LIBPREFIX
+#define MAGICKCORE_LT_LIBPREFIX "lib"
+#endif
+
/* Define to the extension used for runtime loadable modules, say, ".so". */
#ifndef MAGICKCORE_LT_MODULE_EXT
#define MAGICKCORE_LT_MODULE_EXT ".so"
@@ -1403,9 +1403,7 @@
#endif
/* Number of bits in a file offset, on hosts where this is settable. */
-#ifndef MAGICKCORE__FILE_OFFSET_BITS
-#define MAGICKCORE__FILE_OFFSET_BITS 64
-#endif
+/* #undef _FILE_OFFSET_BITS */
/* enable run-time bounds-checking */
/* #undef _FORTIFY_SOURCE */
diff --git a/magick/montage.c b/magick/montage.c
index 90f7354..61e109f 100644
--- a/magick/montage.c
+++ b/magick/montage.c
@@ -719,6 +719,7 @@
x_offset+=extract_info.x;
y_offset+=(ssize_t) title_offset+extract_info.y;
max_height=0;
+ status=MagickTrue;
for (tile=0; tile < MagickMin((ssize_t) tiles_per_page,(ssize_t) number_images); tile++)
{
/*
@@ -870,6 +871,7 @@
image=DestroyImage(image);
tiles++;
}
+ (void) status;
if ((i+1) < (ssize_t) images_per_page)
{
/*
diff --git a/magick/profile.c b/magick/profile.c
index 4c073c5..da24a3f 100644
--- a/magick/profile.c
+++ b/magick/profile.c
@@ -998,7 +998,6 @@
progress;
size_t
- length,
source_channels,
target_channels;
@@ -1191,7 +1190,6 @@
/*
Transform image as dictated by the source & target image profiles.
*/
- length=(size_t) image->columns;
source_pixels=AcquirePixelThreadSet(image->columns,source_channels);
target_pixels=AcquirePixelThreadSet(image->columns,target_channels);
if ((source_pixels == (unsigned short **) NULL) ||
diff --git a/magick/statistic.c b/magick/statistic.c
index bdf2905..e1c9c74 100644
--- a/magick/statistic.c
+++ b/magick/statistic.c
@@ -507,9 +507,6 @@
const int
id = GetOpenMPThreadId();
- MagickPixelPacket
- pixel;
-
register IndexPacket
*restrict evaluate_indexes;
@@ -532,7 +529,6 @@
continue;
}
evaluate_indexes=GetCacheViewAuthenticIndexQueue(evaluate_view);
- pixel=zero;
evaluate_pixel=evaluate_pixels[id];
for (x=0; x < (ssize_t) evaluate_image->columns; x++)
{
@@ -616,9 +612,6 @@
const int
id = GetOpenMPThreadId();
- MagickPixelPacket
- pixel;
-
register IndexPacket
*restrict evaluate_indexes;
@@ -642,7 +635,6 @@
continue;
}
evaluate_indexes=GetCacheViewAuthenticIndexQueue(evaluate_view);
- pixel=zero;
evaluate_pixel=evaluate_pixels[id];
for (x=0; x < (ssize_t) evaluate_image->columns; x++)
evaluate_pixel[x]=zero;
diff --git a/magick/threshold.c b/magick/threshold.c
index e4ca606..9c7db01 100644
--- a/magick/threshold.c
+++ b/magick/threshold.c
@@ -1037,6 +1037,7 @@
content = p;
}
value=(double) strtol(content,&p,10);
+ (void) value;
if (p != content)
{
(void) ThrowMagickException(exception,GetMagickModule(),OptionError,
diff --git a/magick/token.c b/magick/token.c
index 20666c4..5a6b61c 100644
--- a/magick/token.c
+++ b/magick/token.c
@@ -227,6 +227,7 @@
*q;
value=strtod(p,&q);
+ (void) value;
if ((p != q) && (*p != ','))
{
for ( ; (p < q) && (*p != ','); p++)
diff --git a/magick/transform.c b/magick/transform.c
index 99dfbc6..63b950b 100644
--- a/magick/transform.c
+++ b/magick/transform.c
@@ -1416,7 +1416,6 @@
*splice_image;
MagickBooleanType
- proceed,
status;
MagickOffsetType
@@ -1425,9 +1424,6 @@
RectangleInfo
splice_geometry;
- register ssize_t
- i;
-
ssize_t
y;
@@ -1512,7 +1508,6 @@
Splice image.
*/
status=MagickTrue;
- i=0;
progress=0;
image_view=AcquireCacheView(image);
splice_view=AcquireCacheView(splice_image);
@@ -1576,8 +1571,6 @@
}
if (SyncCacheViewAuthenticPixels(splice_view,exception) == MagickFalse)
status=MagickFalse;
- proceed=SetImageProgress(image,SpliceImageTag,(MagickOffsetType) y,
- splice_image->rows);
if (image->progress_monitor != (MagickProgressMonitor) NULL)
{
MagickBooleanType
diff --git a/magick/utility.c b/magick/utility.c
index 1993ae1..e3ac1ea 100644
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -691,7 +691,6 @@
char ***arguments)
{
char
- *cwd,
home_directory[MaxTextExtent],
**vector;
@@ -776,7 +775,7 @@
GetPathComponent(option,SubimagePath,subimage);
ExpandFilename(path);
if (*home_directory == '\0')
- cwd=getcwd(home_directory,MaxTextExtent-1);
+ (void) getcwd(home_directory,MaxTextExtent-1);
filelist=ListFiles(*path == '\0' ? home_directory : path,filename,
&number_files);
}
@@ -938,11 +937,8 @@
*/
MagickExport MagickBooleanType GetExecutionPath(char *path,const size_t extent)
{
- char
- *cwd;
-
*path='\0';
- cwd=getcwd(path,(unsigned long) extent);
+ (void) getcwd(path,(unsigned long) extent);
#if defined(MAGICKCORE_HAVE_GETPID) && defined(MAGICKCORE_HAVE_READLINK) && defined(PATH_MAX)
{
char
diff --git a/magick/version.h b/magick/version.h
index da1535f..642c87d 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -33,8 +33,8 @@
#define MagickLibAddendum "-8"
#define MagickLibInterface 4
#define MagickLibMinInterface 4
-#define MagickReleaseDate "2011-02-16"
-#define MagickChangeDate "20110215"
+#define MagickReleaseDate "2011-02-19"
+#define MagickChangeDate "20110218"
#define MagickAuthoritativeURL "http://www.imagemagick.org"
#if defined(MAGICKCORE_OPENMP_SUPPORT)
#define MagickOpenMPFeature "OpenMP "
diff --git a/magick/widget.c b/magick/widget.c
index 96abe1b..5cce4c5 100644
--- a/magick/widget.c
+++ b/magick/widget.c
@@ -4227,7 +4227,6 @@
#define UpButtonText "Up"
char
- *cwd,
**filelist,
home_directory[MaxTextExtent],
primary_selection[MaxTextExtent],
@@ -4301,7 +4300,7 @@
(void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",action);
XSetCursorState(display,windows,MagickTrue);
XCheckRefreshWindows(display,windows);
- cwd=getcwd(home_directory,MaxTextExtent);
+ (void) getcwd(home_directory,MaxTextExtent);
(void) CopyMagickString(working_path,home_directory,MaxTextExtent);
filelist=ListFiles(working_path,glob_pattern,&files);
if (filelist == (char **) NULL)
diff --git a/magick/xml-tree.c b/magick/xml-tree.c
index c057e5c..20d1765 100644
--- a/magick/xml-tree.c
+++ b/magick/xml-tree.c
@@ -2213,9 +2213,6 @@
register ssize_t
i;
- size_t
- length;
-
assert(xml_info != (XMLTreeInfo *) NULL);
assert((xml_info->signature == MagickSignature) ||
(((XMLTreeRoot *) xml_info)->signature == MagickSignature));
@@ -2246,7 +2243,7 @@
"UnableToAcquireString");
xml_info->attributes[i]=ConstantString(tag);
xml_info->attributes[i+2]=(char *) NULL;
- length=strlen(xml_info->attributes[i+1]);
+ (void) strlen(xml_info->attributes[i+1]);
}
/*
Add new value to an existing attribute.
diff --git a/magick/xwindow.c b/magick/xwindow.c
index 142c42a..5daffbf 100644
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -3437,7 +3437,6 @@
XrmDatabase database,const char *client_name,XResourceInfo *resource_info)
{
char
- *cwd,
*resource_value;
/*
@@ -3526,7 +3525,7 @@
(char *) "Center");
resource_info->gravity=(GravityType) ParseMagickOption(MagickGravityOptions,
MagickFalse,resource_value);
- cwd=getcwd(resource_info->home_directory,MaxTextExtent);
+ (void) getcwd(resource_info->home_directory,MaxTextExtent);
resource_info->icon_geometry=XGetResourceClass(database,client_name,
"iconGeometry",(char *) NULL);
resource_value=XGetResourceClass(database,client_name,"iconic",