Fixed DWA methods support

diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 4e039ddbbce50197a0c5416524f6ddb49f59def6..a0ab0025f1541b3d830343a2ac62ec1a3dd7b358 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -504,6 +504,8 @@ namespace Magick
   using MagickCore::B44ACompression;
   using MagickCore::B44Compression;
   using MagickCore::BZipCompression;
+  using MagickCore::DwaaCompression;
+  using MagickCore::DwabCompression;
   using MagickCore::DXT1Compression;
   using MagickCore::DXT3Compression;
   using MagickCore::DXT5Compression;
@@ -518,8 +520,6 @@ namespace Magick
   using MagickCore::LZWCompression;
   using MagickCore::PizCompression;
   using MagickCore::Pxr24Compression;
-  using MagickCore::DwaaCompression;
-  using MagickCore::DwabCompression;
   using MagickCore::RLECompression;
   using MagickCore::WebPCompression;
   using MagickCore::ZipCompression;

diff --git a/MagickCore/compress.h b/MagickCore/compress.h
index af5180fb0f7ef3bb4a757aa292afeffd481d5034..7416d3f85193a6039ecfbecbc8c1a7b1e5a5f188 100644 (file)
--- a/MagickCore/compress.h
+++ b/MagickCore/compress.h
@@ -43,13 +43,13 @@ typedef enum
   NoCompression,
   PizCompression,
   Pxr24Compression,
-  DwaaCompression,
-  DwabCompression,
   RLECompression,
   ZipCompression,
   ZipSCompression,
   ZstdCompression,
-  WebPCompression
+  WebPCompression,
+  DwaaCompression,
+  DwabCompression
 } CompressionType;
 
 typedef struct _Ascii85Info

diff --git a/MagickCore/option.c b/MagickCore/option.c
index 467f69d3b844abb1fd83cd0e69a8fb742c385a44..68f55319717a5a224e969cfbb35128005dac024c 100644 (file)
--- a/MagickCore/option.c
+++ b/MagickCore/option.c
@@ -1225,6 +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 },
     { "DXT1", DXT1Compression, UndefinedOptionFlag, MagickFalse },
     { "DXT3", DXT3Compression, UndefinedOptionFlag, MagickFalse },
     { "DXT5", DXT5Compression, UndefinedOptionFlag, MagickFalse },
@@ -1241,8 +1243,6 @@ static const OptionInfo
     { "None", NoCompression, UndefinedOptionFlag, MagickFalse },
     { "Piz", PizCompression, UndefinedOptionFlag, MagickFalse },
     { "Pxr24", Pxr24Compression, UndefinedOptionFlag, MagickFalse },
-    { "Dwaa", DwaaCompression, UndefinedOptionFlag, MagickFalse },
-    { "Dwab", DwabCompression, UndefinedOptionFlag, MagickFalse },
     { "RLE", RLECompression, UndefinedOptionFlag, MagickFalse },
     { "RunlengthEncoded", RLECompression, UndefinedOptionFlag, MagickFalse },
     { "WebP", WebPCompression, UndefinedOptionFlag, MagickFalse },

diff --git a/coders/exr.c b/coders/exr.c
index c603983bf32d84d57953e81fc619bbda3085dd81..7a6edcef33f2bed8e19191ed90fd4fb4ed2fb899 100644 (file)
--- a/coders/exr.c
+++ b/coders/exr.c
@@ -485,6 +485,14 @@ static MagickBooleanType WriteEXRImage(const ImageInfo *image_info,Image *image,
 #if defined(IMF_B44A_COMPRESSION)
   if (write_info->compression == B44ACompression)
     compression=IMF_B44A_COMPRESSION;
+#endif
+#if defined(IMF_DWAA_COMPRESSION)
+  if (write_info->compression == DwaaCompression)
+    compression=IMF_DWAA_COMPRESSION;
+#endif
+#if defined(IMF_DWAB_COMPRESSION)
+  if (write_info->compression == DwabCompression)
+    compression=IMF_DWAB_COMPRESSION;
 #endif
   channels=0;
   value=GetImageOption(image_info,"exr:color-type");