(no commit message)

diff --git a/coders/xtrn.c b/coders/xtrn.c
index 18f58b43e2e3449db3c3949aec013bf694c20899..fc9f5d856388ba4d540255767fd8f17b9e4b4a71 100644 (file)
--- a/coders/xtrn.c
+++ b/coders/xtrn.c
@@ -172,27 +172,6 @@ static Image *ReadXTRNImage(const ImageInfo *image_info,
       image=BlobToImage(clone_info,*blob_data,*blob_length,exception);
       CatchException(exception);
     }
-  else if (LocaleCompare(image_info->magick,"XTRNSTREAM") == 0)
-    {
-#ifdef IMPLEMENT_THIS
-      MagickBooleanType
-        status;
-#endif
-
-      char
-        filename[MaxTextExtent];
-
-      size_t
-        (*fifo)(const Image *,const void *,const size_t);
-
-      (void) sscanf(clone_info->filename,"%lx,%lx,%s",&param1,&param2,&filename);
-      fifo=(size_t (*)(const Image *,const void *,const size_t)) param1;
-      clone_info->client_data=param2;
-#ifdef IMPLEMENT_THIS
-      status=ReadStream(clone_info,fifo,exception);
-      CatchException(exception);
-#endif
-    }
   else if (LocaleCompare(image_info->magick,"XTRNARRAY") == 0)
     {
       SAFEARRAY
@@ -204,7 +183,7 @@ static Image *ReadXTRNImage(const ImageInfo *image_info,
       size_t
         blob_length;
 
-                  long
+      long
         lBoundl,
         lBoundu;
 
@@ -239,7 +218,7 @@ static Image *ReadXTRNImage(const ImageInfo *image_info,
                   else
                     {
                       *clone_info->magick = '\0';
-                      clone_info->filename[0] = '\0';
+                      *clone_info->filename = '\0';
                     }
                   image=BlobToImage(clone_info,blob_data,blob_length,exception);
                   hr = SafeArrayUnaccessData(pSafeArray);
@@ -248,47 +227,6 @@ static Image *ReadXTRNImage(const ImageInfo *image_info,
             }
         }
     }
-  else if (LocaleCompare(image_info->magick,"XTRNBSTR") == 0)
-    {
-      BSTR
-        bstr;
-
-      char
-        *blob_data;
-
-      size_t
-        blob_length;
-
-      HRESULT
-        hr;
-
-      char
-        filename[MaxTextExtent];
-
-      filename[0] = '\0';
-      (void) sscanf(clone_info->filename,"%lx,%s",&param1,&filename);
-      hr = S_OK;
-      bstr = (BSTR) param1;
-      blob_length = SysStringLen(bstr) * 2;
-      blob_data = (char *)bstr;
-      if ((blob_data != (char *)NULL) && (blob_length>0))
-        {
-          if (filename[0] != '\0')
-            {
-              (void) CopyMagickString(clone_info->filename,filename,
-                MaxTextExtent);
-              (void) CopyMagickString(clone_info->magick,filename,
-                MaxTextExtent);
-            }
-          else
-            {
-              *clone_info->magick = '\0';
-              clone_info->filename[0] = '\0';
-            }
-          image=BlobToImage(clone_info,blob_data,blob_length,exception);
-          CatchException(exception);
-        }
-    }
   clone_info=DestroyImageInfo(clone_info);
   return(image);
 }
@@ -348,15 +286,6 @@ ModuleExport void RegisterXTRNImage(void)
   entry->module=ConstantString("XTRN");
   RegisterMagickInfo(entry);
 
-  entry=SetMagickInfo("XTRNSTREAM");
-  entry->decoder=ReadXTRNImage;
-  entry->encoder=WriteXTRNImage;
-  entry->adjoin=MagickFalse;
-  entry->stealth=MagickTrue;
-  entry->description=ConstantString("External transfer via a streaming interface");
-  entry->module=ConstantString("XTRN");
-  RegisterMagickInfo(entry);
-
   entry=SetMagickInfo("XTRNARRAY");
   entry->decoder=ReadXTRNImage;
   entry->encoder=WriteXTRNImage;
@@ -365,15 +294,6 @@ ModuleExport void RegisterXTRNImage(void)
   entry->description=ConstantString("External transfer via a smart array interface");
   entry->module=ConstantString("XTRN");
   RegisterMagickInfo(entry);
-
-  entry=SetMagickInfo("XTRNBSTR");
-  entry->decoder=ReadXTRNImage;
-  entry->encoder=WriteXTRNImage;
-  entry->adjoin=MagickFalse;
-  entry->stealth=MagickTrue;
-  entry->description=ConstantString("External transfer via a smart array interface");
-  entry->module=ConstantString("XTRN");
-  RegisterMagickInfo(entry);
 }
 \f
 /*
@@ -400,9 +320,7 @@ ModuleExport void UnregisterXTRNImage(void)
   UnregisterMagickInfo("XTRNFILE");
   UnregisterMagickInfo("XTRNIMAGE");
   UnregisterMagickInfo("XTRNBLOB");
-  UnregisterMagickInfo("XTRNSTREAM");
   UnregisterMagickInfo("XTRNARRAY");
-  UnregisterMagickInfo("XTRNBSTR");
 }
 \f
 /*
@@ -570,39 +488,6 @@ static MagickBooleanType WriteXTRNImage(const ImageInfo *image_info,Image *image
         }
       clone_info=DestroyImageInfo(clone_info);
     }
-  else if (LocaleCompare(image_info->magick,"XTRNSTREAM") == 0)
-    {
-      size_t
-        (*fifo)(const Image *,const void *,const size_t);
-
-      char
-        filename[MaxTextExtent];
-
-      clone_info=CloneImageInfo(image_info);
-      if (clone_info->filename[0])
-        {
-          (void) sscanf(clone_info->filename,"%lx,%lx,%s",
-            &param1,&param2,&filename);
-
-          fifo=(size_t (*)(const Image *,const void *,const size_t)) param1;
-          image->client_data=param2;
-
-          scene=0;
-          (void) CopyMagickString(clone_info->filename,filename,MaxTextExtent);
-          for (p=image; p != (Image *) NULL; p=GetNextImageInList(p))
-          {
-            (void) CopyMagickString(p->filename,filename,MaxTextExtent);
-            p->scene=scene++;
-          }
-          SetImageInfo(clone_info,1,&image->exception);
-          (void) CopyMagickString(image->magick,clone_info->magick,
-            MaxTextExtent);
-          status=WriteStream(clone_info,image,fifo);
-          if (status == MagickFalse)
-            CatchImageException(image);
-        }
-      clone_info=DestroyImageInfo(clone_info);
-    }
   else if (LocaleCompare(image_info->magick,"XTRNARRAY") == 0)
     {
       char

diff --git a/magick/token.c b/magick/token.c
index 517b848da45312a9628e0869253448bec81a507c..2afaf02fb9473b8d9e8d10ae7c4e2d101913ea8c 100644 (file)
--- a/magick/token.c
+++ b/magick/token.c
@@ -175,6 +175,8 @@ MagickExport void GetMagickToken(const char *start,const char **end,char *token)
   register ssize_t
     i;
 
+  assert(start != (const char *) NULL);
+  assert(token != (char *) NULL);
   i=0;
   for (p=start; *p != '\0'; )
   {