From 2fdb73d39449dd86694b9cceca3a309bafd4bc8a Mon Sep 17 00:00:00 2001 From: Flavio Perez Date: Thu, 8 Aug 2019 15:42:07 +0200 Subject: [PATCH] Fixed exr's DWAA/B cases --- Magick++/lib/Magick++/Include.h | 4 ++-- MagickCore/compress.h | 4 ++-- MagickCore/option.c | 4 ++-- coders/exr.c | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h index a0ab0025f..abec2c488 100644 --- 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 7416d3f85..c09395258 100644 --- 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 68f553197..36379623a 100644 --- 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 36033f7b8..e5b79ed7b 100644 --- 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; -- 2.40.0