From b9d8ebf930f22b375ffe09b59b33e6eb7e8ad44c Mon Sep 17 00:00:00 2001
From: Dirk Lemstra <dirk@lemstra.org>
Date: Sat, 4 Sep 2021 16:08:20 +0200
Subject: [PATCH] Revert local changes that should not have been committed yet.

---
 coders/dds.c | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/coders/dds.c b/coders/dds.c
index ab4c201132..ed4eb7a9c2 100644
--- a/coders/dds.c
+++ b/coders/dds.c
@@ -315,11 +315,11 @@ typedef struct _DDSSingleColorLookup
 } DDSSingleColorLookup;
 
 typedef MagickBooleanType
-  DDSDecoder(const ImageInfo *,Image *,const DDSInfo *,const MagickBooleanType,
+  DDSDecoder(const ImageInfo *,Image *,DDSInfo *,const MagickBooleanType,
     ExceptionInfo *);
 
 typedef MagickBooleanType
-  DDSPixelDecoder(Image *,const DDSInfo *,ExceptionInfo *);
+  DDSPixelDecoder(Image *,DDSInfo *,ExceptionInfo *);
 
 static const DDSSingleColorLookup DDSLookup_5_4[] =
 {
@@ -1195,7 +1195,7 @@ static MagickBooleanType SetDXT1Pixels(Image *image,ssize_t x,ssize_t y,
 }
 
 static MagickBooleanType ReadMipmaps(const ImageInfo *image_info,Image *image,
-  const DDSInfo *dds_info,DDSPixelDecoder decoder,ExceptionInfo *exception)
+  DDSInfo *dds_info,DDSPixelDecoder decoder,ExceptionInfo *exception)
 {
   MagickBooleanType
     status;
@@ -1285,7 +1285,7 @@ static void CalculateColors(unsigned short c0, unsigned short c1,
 }
 
 static MagickBooleanType ReadDXT1Pixels(Image *image,
-  const DDSInfo *magick_unused(dds_info),ExceptionInfo *exception)
+  DDSInfo *magick_unused(dds_info),ExceptionInfo *exception)
 {
   DDSColors
     colors;
@@ -1349,7 +1349,7 @@ static MagickBooleanType ReadDXT1Pixels(Image *image,
 /*
   Skip the mipmap images for compressed (DXTn) dds files
 */
-static MagickBooleanType SkipDXTMipmaps(Image *image,const DDSInfo *dds_info,
+static MagickBooleanType SkipDXTMipmaps(Image *image,DDSInfo *dds_info,
   int texel_size,ExceptionInfo *exception)
 {
   /*
@@ -1396,7 +1396,7 @@ static MagickBooleanType SkipDXTMipmaps(Image *image,const DDSInfo *dds_info,
 }
 
 static MagickBooleanType ReadDXT1(const ImageInfo *image_info,Image *image,
-  const DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
+  DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
   ExceptionInfo *exception)
 {
   if (ReadDXT1Pixels(image,dds_info,exception) == MagickFalse)
@@ -1409,7 +1409,7 @@ static MagickBooleanType ReadDXT1(const ImageInfo *image_info,Image *image,
 }
 
 static MagickBooleanType ReadDXT3Pixels(Image *image,
-  const DDSInfo *magick_unused(dds_info),ExceptionInfo *exception)
+  DDSInfo *magick_unused(dds_info),ExceptionInfo *exception)
 {
   DDSColors
     colors;
@@ -1497,7 +1497,7 @@ static MagickBooleanType ReadDXT3Pixels(Image *image,
 }
 
 static MagickBooleanType ReadDXT3(const ImageInfo *image_info,Image *image,
-  const DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
+  DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
   ExceptionInfo *exception)
 {
   if (ReadDXT3Pixels(image,dds_info,exception) == MagickFalse)
@@ -1510,7 +1510,7 @@ static MagickBooleanType ReadDXT3(const ImageInfo *image_info,Image *image,
 }
 
 static MagickBooleanType ReadDXT5Pixels(Image *image,
-  const DDSInfo *magick_unused(dds_info),ExceptionInfo *exception)
+  DDSInfo *magick_unused(dds_info),ExceptionInfo *exception)
 {
   DDSColors
     colors;
@@ -1612,7 +1612,7 @@ static MagickBooleanType ReadDXT5Pixels(Image *image,
 }
 
 static MagickBooleanType ReadDXT5(const ImageInfo *image_info,Image *image,
-  const DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
+  DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
   ExceptionInfo *exception)
 {
   if (ReadDXT5Pixels(image,dds_info,exception) == MagickFalse)
@@ -1625,7 +1625,7 @@ static MagickBooleanType ReadDXT5(const ImageInfo *image_info,Image *image,
 }
 
 static MagickBooleanType ReadUncompressedRGBPixels(Image *image,
-  const DDSInfo *dds_info,ExceptionInfo *exception)
+  DDSInfo *dds_info,ExceptionInfo *exception)
 {
   Quantum
     *q;
@@ -1684,7 +1684,7 @@ static MagickBooleanType ReadUncompressedRGBPixels(Image *image,
 /*
   Skip the mipmap images for uncompressed (RGB or RGBA) dds files
 */
-static MagickBooleanType SkipRGBMipmaps(Image *image,const DDSInfo *dds_info,
+static MagickBooleanType SkipRGBMipmaps(Image *image,DDSInfo *dds_info,
   int pixel_size,ExceptionInfo *exception)
 {
   /*
@@ -1731,7 +1731,7 @@ static MagickBooleanType SkipRGBMipmaps(Image *image,const DDSInfo *dds_info,
 }
 
 static MagickBooleanType ReadUncompressedRGB(const ImageInfo *image_info,
-  Image *image,const DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
+  Image *image,DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
   ExceptionInfo *exception)
 {
   if (dds_info->pixelformat.rgb_bitcount == 8 || 
@@ -1753,7 +1753,7 @@ static MagickBooleanType ReadUncompressedRGB(const ImageInfo *image_info,
 }
 
 static MagickBooleanType ReadUncompressedRGBAPixels(Image *image,
-  const DDSInfo *dds_info,ExceptionInfo *exception)
+  DDSInfo *dds_info,ExceptionInfo *exception)
 {
   Quantum
     *q;
@@ -1861,7 +1861,7 @@ static MagickBooleanType ReadUncompressedRGBAPixels(Image *image,
 }
 
 static MagickBooleanType ReadUncompressedRGBA(const ImageInfo *image_info,
-  Image *image,const DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
+  Image *image,DDSInfo *dds_info,const MagickBooleanType read_mipmaps,
   ExceptionInfo *exception)
 {
   if (ReadUncompressedRGBAPixels(image,dds_info,exception) == MagickFalse)