From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 22 Sep 2009 18:10:17 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10652
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3961568fff881d0d549df52c0a28884e1734391f;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index b146ad755..3f3bd2d83 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-09-22  6.5.6-4 Cristy  <quetzlzacatenango@image...>
+  * Don't compile Huffman2DEncodeImage() unless the TIFF delegate library
+    is enabled.
+
 2009-09-21  6.5.6-3 Cristy  <quetzlzacatenango@image...>
   * Deprecate LevelImageColors(), replace with LevelColorsImage().
 
diff --git a/coders/cals.c b/coders/cals.c
index 39da76da2..154f2d62d 100644
--- a/coders/cals.c
+++ b/coders/cals.c
@@ -159,6 +159,7 @@ static inline size_t WriteCALSLSBLong(FILE *file,const unsigned int value)
   return(fwrite(buffer,1,4,file));
 }
 
+#if defined(MAGICKCORE_TIFF_DELEGATE)
 static Image *Huffman2DDecodeImage(const ImageInfo *image_info,Image *image,
   ExceptionInfo *exception)
 {
@@ -239,6 +240,17 @@ static Image *Huffman2DDecodeImage(const ImageInfo *image_info,Image *image,
   (void) RelinquishUniqueFileResource(filename);
   return(huffman_image);
 }
+#else
+static Image *Huffman2DDecodeImage(const ImageInfo *magick_unused(image_info),
+  Image *image,ExceptionInfo *exception)
+{
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickSignature);
+  (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError,
+    "DelegateLibrarySupportNotBuiltIn","`%s' (TIFF)",image->filename);
+  return((Image *) NULL);
+}
+#endif
 
 static Image *ReadCALSImage(const ImageInfo *image_info,
   ExceptionInfo *exception)
@@ -442,6 +454,7 @@ ModuleExport void UnregisterCALSImage(void)
 %
 */
 
+#if defined(MAGICKCORE_TIFF_DELEGATE)
 static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   Image *image,Image *inject_image)
 {
@@ -567,6 +580,24 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   (void) RelinquishUniqueFileResource(filename);
   return(MagickTrue);
 }
+#else
+static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
+  Image *image,Image *inject_image)
+{
+  assert(image_info != (const ImageInfo *) NULL);
+  assert(image_info->signature == MagickSignature);
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  assert(inject_image != (Image *) NULL);
+  assert(inject_image->signature == MagickSignature);
+  (void) ThrowMagickException(&image->exception,GetMagickModule(),
+    MissingDelegateError,"DelegateLibrarySupportNotBuiltIn","`%s' (TIFF)",
+    image->filename);
+  return(MagickFalse);
+}
+#endif
 
 static ssize_t WriteCALSRecord(Image *image,const char *data)
 {
diff --git a/coders/pdf.c b/coders/pdf.c
index b195da4b5..13bfb24f0 100644
--- a/coders/pdf.c
+++ b/coders/pdf.c
@@ -851,6 +851,7 @@ static char *EscapeParenthesis(const char *text)
   return(buffer);
 }
 
+#if defined(MAGICKCORE_TIFF_DELEGATE)
 static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   Image *image,Image *inject_image)
 {
@@ -976,6 +977,24 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   (void) RelinquishUniqueFileResource(filename);
   return(MagickTrue);
 }
+#else
+static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
+  Image *image,Image *inject_image)
+{
+  assert(image_info != (const ImageInfo *) NULL);
+  assert(image_info->signature == MagickSignature);
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  assert(inject_image != (Image *) NULL);
+  assert(inject_image->signature == MagickSignature);
+  (void) ThrowMagickException(&image->exception,GetMagickModule(),
+    MissingDelegateError,"DelegateLibrarySupportNotBuiltIn","`%s' (TIFF)",
+    image->filename);
+  return(MagickFalse);
+}
+#endif
 
 static MagickBooleanType WritePDFImage(const ImageInfo *image_info,Image *image)
 {
diff --git a/coders/ps2.c b/coders/ps2.c
index 26e6b8435..74be992ff 100644
--- a/coders/ps2.c
+++ b/coders/ps2.c
@@ -180,6 +180,7 @@ ModuleExport void UnregisterPS2Image(void)
 %
 */
 
+#if defined(MAGICKCORE_TIFF_DELEGATE)
 static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   Image *image,Image *inject_image)
 {
@@ -305,6 +306,24 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   (void) RelinquishUniqueFileResource(filename);
   return(MagickTrue);
 }
+#else
+static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
+  Image *image,Image *inject_image)
+{
+  assert(image_info != (const ImageInfo *) NULL);
+  assert(image_info->signature == MagickSignature);
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  assert(inject_image != (Image *) NULL);
+  assert(inject_image->signature == MagickSignature);
+  (void) ThrowMagickException(&image->exception,GetMagickModule(),
+    MissingDelegateError,"DelegateLibrarySupportNotBuiltIn","`%s' (TIFF)",
+    image->filename);
+  return(MagickFalse);
+}
+#endif
 
 static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
 {
@@ -837,9 +856,7 @@ static MagickBooleanType WritePS2Image(const ImageInfo *image_info,Image *image)
                 (void) HuffmanEncodeImage(image_info,image,image);
                 break;
               }
-#if defined(MAGICKCORE_TIFF_DELEGATE)
             (void) Huffman2DEncodeImage(image_info,image,image);
-#endif
             break;
           }
           case JPEGCompression:
diff --git a/coders/ps3.c b/coders/ps3.c
index 303853f3b..401a3f51c 100644
--- a/coders/ps3.c
+++ b/coders/ps3.c
@@ -194,6 +194,7 @@ ModuleExport void UnregisterPS3Image(void)
 %
 */
 
+#if defined(MAGICKCORE_TIFF_DELEGATE)
 static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   Image *image,Image *inject_image)
 {
@@ -319,6 +320,24 @@ static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
   (void) RelinquishUniqueFileResource(filename);
   return(MagickTrue);
 }
+#else
+static MagickBooleanType Huffman2DEncodeImage(const ImageInfo *image_info,
+  Image *image,Image *inject_image)
+{
+  assert(image_info != (const ImageInfo *) NULL);
+  assert(image_info->signature == MagickSignature);
+  assert(image != (Image *) NULL);
+  assert(image->signature == MagickSignature);
+  if (image->debug != MagickFalse)
+    (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
+  assert(inject_image != (Image *) NULL);
+  assert(inject_image->signature == MagickSignature);
+  (void) ThrowMagickException(&image->exception,GetMagickModule(),
+    MissingDelegateError,"DelegateLibrarySupportNotBuiltIn","`%s' (TIFF)",
+    image->filename);
+  return(MagickFalse);
+}
+#endif
 
 static MagickBooleanType SerializeImage(const ImageInfo *image_info,
   Image *image,unsigned char **pixels,size_t *length)
diff --git a/magick/random.c b/magick/random.c
index b459fc078..ba0c61c1e 100644
--- a/magick/random.c
+++ b/magick/random.c
@@ -341,6 +341,7 @@ MagickExport void DestroyRandomReservoir(void)
 %
 */
 
+#if !defined(__WINDOWS__)
 static ssize_t ReadRandom(int file,unsigned char *source,size_t length)
 {
   register unsigned char
@@ -366,6 +367,7 @@ static ssize_t ReadRandom(int file,unsigned char *source,size_t length)
   }
   return(offset);
 }
+#endif
 
 static StringInfo *GenerateEntropicChaos(RandomInfo *random_info)
 {