Fixed exr's DWAA/B cases

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index a0ab0025f1541b3d830343a2ac62ec1a3dd7b358..abec2c4886afac561c3310d88f39c0b033aaea91 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -504,8 +504,8 @@ namespace Magick
   using MagickCore::B44ACompression;
   using MagickCore::B44Compression;
   using MagickCore::BZipCompression;
-  using MagickCore::DwaaCompression;
-  using MagickCore::DwabCompression;
+  using MagickCore::DWAACompression;
+  using MagickCore::DWABCompression;
   using MagickCore::DXT1Compression;
   using MagickCore::DXT3Compression;
   using MagickCore::DXT5Compression;

diff --git a/MagickCore/compress.h b/MagickCore/compress.h
index 7416d3f85193a6039ecfbecbc8c1a7b1e5a5f188..c093952588410edbd160e36764f3a0825d0109ed 100644 (file)
--- a/MagickCore/compress.h
+++ b/MagickCore/compress.h
@@ -48,8 +48,8 @@ typedef enum
   ZipSCompression,
   ZstdCompression,
   WebPCompression,
-  DwaaCompression,
-  DwabCompression
+  DWAACompression,
+  DWABCompression
 } CompressionType;
 
 typedef struct _Ascii85Info

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 68f55319717a5a224e969cfbb35128005dac024c..36379623a579a8969e980d65c6bee55a3925f041 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1225,8 +1225,8 @@ static const OptionInfo
     { "B44A", B44ACompression, UndefinedOptionFlag, MagickFalse },
     { "B44", B44Compression, UndefinedOptionFlag, MagickFalse },
     { "BZip", BZipCompression, UndefinedOptionFlag, MagickFalse },
-    { "Dwaa", DwaaCompression, UndefinedOptionFlag, MagickFalse },
-    { "Dwab", DwabCompression, UndefinedOptionFlag, MagickFalse },
+    { "DWAA", DWAACompression, UndefinedOptionFlag, MagickFalse },
+    { "DWAB", DWABCompression, UndefinedOptionFlag, MagickFalse },
     { "DXT1", DXT1Compression, UndefinedOptionFlag, MagickFalse },
     { "DXT3", DXT3Compression, UndefinedOptionFlag, MagickFalse },
     { "DXT5", DXT5Compression, UndefinedOptionFlag, MagickFalse },

diff --git a/coders/exr.c b/coders/exr.c
index 36033f7b84d10bf441fe1c732ce52ce829f67b1e..e5b79ed7ba58c726b8447d94bd8a07bf3e9f0c46 100644 (file)
--- a/coders/exr.c
+++ b/coders/exr.c
@@ -230,11 +230,11 @@ static Image *ReadEXRImage(const ImageInfo *image_info,ExceptionInfo *exception)
 #endif
 #if defined(IMF_DWAA_COMPRESSION)
   if (compression == IMF_DWAA_COMPRESSION)
-    image->compression=DwaaCompression;
+    image->compression=DWAACompression;
 #endif
 #if defined(IMF_DWAB_COMPRESSION)
   if (compression == IMF_DWAB_COMPRESSION)
-    image->compression=DwabCompression;
+    image->compression=DWABCompression;
 #endif
   if (image_info->ping != MagickFalse)
     {
@@ -495,11 +495,11 @@ static MagickBooleanType WriteEXRImage(const ImageInfo *image_info,Image *image,
     compression=IMF_B44A_COMPRESSION;
 #endif
 #if defined(IMF_DWAA_COMPRESSION)
-  if (write_info->compression == DwaaCompression)
+  if (write_info->compression == DWAACompression)
     compression=IMF_DWAA_COMPRESSION;
 #endif
 #if defined(IMF_DWAB_COMPRESSION)
-  if (write_info->compression == DwabCompression)
+  if (write_info->compression == DWABCompression)
     compression=IMF_DWAB_COMPRESSION;
 #endif
   channels=0;