diff --git a/coders/msl.c b/coders/msl.c
index 45711d7..5eed390 100644
--- a/coders/msl.c
+++ b/coders/msl.c
@@ -7539,38 +7539,6 @@
static MagickBooleanType ProcessMSLScript(const ImageInfo *image_info,Image **image,
ExceptionInfo *exception)
{
- xmlSAXHandler
- SAXModules =
- {
- MSLInternalSubset,
- MSLIsStandalone,
- MSLHasInternalSubset,
- MSLHasExternalSubset,
- MSLResolveEntity,
- MSLGetEntity,
- MSLEntityDeclaration,
- MSLNotationDeclaration,
- MSLAttributeDeclaration,
- MSLElementDeclaration,
- MSLUnparsedEntityDeclaration,
- MSLSetDocumentLocator,
- MSLStartDocument,
- MSLEndDocument,
- MSLStartElement,
- MSLEndElement,
- MSLReference,
- MSLCharacters,
- MSLIgnorableWhitespace,
- MSLProcessingInstructions,
- MSLComment,
- MSLWarning,
- MSLError,
- MSLError,
- MSLGetParameterEntity,
- MSLCDataBlock,
- MSLExternalSubset
- };
-
char
message[MaxTextExtent];
@@ -7586,8 +7554,11 @@
MSLInfo
msl_info;
+ xmlSAXHandler
+ sax_modules;
+
xmlSAXHandlerPtr
- SAXHandler;
+ sax_handler;
/*
Open image file.
@@ -7595,7 +7566,8 @@
assert(image_info != (const ImageInfo *) NULL);
assert(image_info->signature == MagickSignature);
if (image_info->debug != MagickFalse)
- (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image_info->filename);
+ (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",
+ image_info->filename);
assert(image != (Image **) NULL);
msl_image=AcquireImage(image_info);
status=OpenBlob(image_info,msl_image,ReadBinaryBlobMode,exception);
@@ -7638,8 +7610,36 @@
if (*image != (Image *) NULL)
MSLPushImage(&msl_info,*image);
(void) xmlSubstituteEntitiesDefault(1);
- SAXHandler=(&SAXModules);
- msl_info.parser=xmlCreatePushParserCtxt(SAXHandler,&msl_info,(char *) NULL,0,
+ (void) ResetMagickMemory(&sax_modules,0,sizeof(sax_modules));
+ sax_modules.internalSubset=MSLInternalSubset;
+ sax_modules.isStandalone=MSLIsStandalone;
+ sax_modules.hasInternalSubset=MSLHasInternalSubset;
+ sax_modules.hasExternalSubset=MSLHasExternalSubset;
+ sax_modules.resolveEntity=MSLResolveEntity;
+ sax_modules.getEntity=MSLGetEntity;
+ sax_modules.entityDecl=MSLEntityDeclaration;
+ sax_modules.notationDecl=MSLNotationDeclaration;
+ sax_modules.attributeDecl=MSLAttributeDeclaration;
+ sax_modules.elementDecl=MSLElementDeclaration;
+ sax_modules.unparsedEntityDecl=MSLUnparsedEntityDeclaration;
+ sax_modules.setDocumentLocator=MSLSetDocumentLocator;
+ sax_modules.startDocument=MSLStartDocument;
+ sax_modules.endDocument=MSLEndDocument;
+ sax_modules.startElement=MSLStartElement;
+ sax_modules.endElement=MSLEndElement;
+ sax_modules.reference=MSLReference;
+ sax_modules.characters=MSLCharacters;
+ sax_modules.ignorableWhitespace=MSLIgnorableWhitespace;
+ sax_modules.processingInstruction=MSLProcessingInstructions;
+ sax_modules.comment=MSLComment;
+ sax_modules.warning=MSLWarning;
+ sax_modules.error=MSLError;
+ sax_modules.fatalError=MSLError;
+ sax_modules.getParameterEntity=MSLGetParameterEntity;
+ sax_modules.cdataBlock=MSLCDataBlock;
+ sax_modules.externalSubset=MSLExternalSubset;
+ sax_handler=(&sax_modules);
+ msl_info.parser=xmlCreatePushParserCtxt(sax_handler,&msl_info,(char *) NULL,0,
msl_image->filename);
while (ReadBlobString(msl_image,message) != (char *) NULL)
{
@@ -7662,7 +7662,9 @@
msl_info.group_info);
if (*image == (Image *) NULL)
*image=(*msl_info.image);
- return((MagickBooleanType) ((*msl_info.image)->exception.severity == UndefinedException));
+ if ((*msl_info.image)->exception.severity != UndefinedException)
+ return(MagickFalse);
+ return(MagickTrue);
}
static Image *ReadMSLImage(const ImageInfo *image_info,ExceptionInfo *exception)
diff --git a/coders/svg.c b/coders/svg.c
index a68dec0..bca0c90 100644
--- a/coders/svg.c
+++ b/coders/svg.c
@@ -2689,7 +2689,7 @@
message[MaxTextExtent];
xmlSAXHandler
- SAXModules;
+ sax_modules;
xmlSAXHandlerPtr
sax_handler;
@@ -2907,35 +2907,35 @@
(void) LogMagickEvent(CoderEvent,GetMagickModule(),"begin SAX");
xmlInitParser();
(void) xmlSubstituteEntitiesDefault(1);
- (void) ResetMagickMemory(&SAXModules,0,sizeof(SAXModules));
- SAXModules.internalSubset=SVGInternalSubset;
- SAXModules.isStandalone=SVGIsStandalone;
- SAXModules.hasInternalSubset=SVGHasInternalSubset;
- SAXModules.hasExternalSubset=SVGHasExternalSubset;
- SAXModules.resolveEntity=SVGResolveEntity;
- SAXModules.getEntity=SVGGetEntity;
- SAXModules.entityDecl=SVGEntityDeclaration;
- SAXModules.notationDecl=SVGNotationDeclaration;
- SAXModules.attributeDecl=SVGAttributeDeclaration;
- SAXModules.elementDecl=SVGElementDeclaration;
- SAXModules.unparsedEntityDecl=SVGUnparsedEntityDeclaration;
- SAXModules.setDocumentLocator=SVGSetDocumentLocator;
- SAXModules.startDocument=SVGStartDocument;
- SAXModules.endDocument=SVGEndDocument;
- SAXModules.startElement=SVGStartElement;
- SAXModules.endElement=SVGEndElement;
- SAXModules.reference=SVGReference;
- SAXModules.characters=SVGCharacters;
- SAXModules.ignorableWhitespace=SVGIgnorableWhitespace;
- SAXModules.processingInstruction=SVGProcessingInstructions;
- SAXModules.comment=SVGComment;
- SAXModules.warning=SVGWarning;
- SAXModules.error=SVGError;
- SAXModules.fatalError=SVGError;
- SAXModules.getParameterEntity=SVGGetParameterEntity;
- SAXModules.cdataBlock=SVGCDataBlock;
- SAXModules.externalSubset=SVGExternalSubset;
- sax_handler=(&SAXModules);
+ (void) ResetMagickMemory(&sax_modules,0,sizeof(sax_modules));
+ sax_modules.internalSubset=SVGInternalSubset;
+ sax_modules.isStandalone=SVGIsStandalone;
+ sax_modules.hasInternalSubset=SVGHasInternalSubset;
+ sax_modules.hasExternalSubset=SVGHasExternalSubset;
+ sax_modules.resolveEntity=SVGResolveEntity;
+ sax_modules.getEntity=SVGGetEntity;
+ sax_modules.entityDecl=SVGEntityDeclaration;
+ sax_modules.notationDecl=SVGNotationDeclaration;
+ sax_modules.attributeDecl=SVGAttributeDeclaration;
+ sax_modules.elementDecl=SVGElementDeclaration;
+ sax_modules.unparsedEntityDecl=SVGUnparsedEntityDeclaration;
+ sax_modules.setDocumentLocator=SVGSetDocumentLocator;
+ sax_modules.startDocument=SVGStartDocument;
+ sax_modules.endDocument=SVGEndDocument;
+ sax_modules.startElement=SVGStartElement;
+ sax_modules.endElement=SVGEndElement;
+ sax_modules.reference=SVGReference;
+ sax_modules.characters=SVGCharacters;
+ sax_modules.ignorableWhitespace=SVGIgnorableWhitespace;
+ sax_modules.processingInstruction=SVGProcessingInstructions;
+ sax_modules.comment=SVGComment;
+ sax_modules.warning=SVGWarning;
+ sax_modules.error=SVGError;
+ sax_modules.fatalError=SVGError;
+ sax_modules.getParameterEntity=SVGGetParameterEntity;
+ sax_modules.cdataBlock=SVGCDataBlock;
+ sax_modules.externalSubset=SVGExternalSubset;
+ sax_handler=(&sax_modules);
n=ReadBlob(image,MaxTextExtent,message);
if (n > 0)
{
