averello/ImageMagick-mirror
1
0
Fork 0
mirror of https://github.com/ImageMagick/ImageMagick.git synced 2026-06-12 15:37:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert local changes that should not have been committed yet.

Browse Source
This commit is contained in:
Dirk Lemstra
2021-09-04 16:08:20 +02:00
parent e007d45b06
commit b9d8ebf930
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coders/dds.c
+15 -15
View File
@@ -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)