Changeset 326 for ImageMagick/trunk/coders/dds.c

Timestamp:

10/06/09 12:19:48 (5 months ago)

Author:

cristy

Message:

 

Files:

• ImageMagick/trunk/coders/dds.c (modified) (8 diffs)

ImageMagick/trunk/coders/dds.c

@@ -129 +129 @@
 typedef struct _DDSInfo
 {
-        unsigned long
-                flags,
-                height,
-                width,
-                pitchOrLinearSize,
-                depth,
-                mipmapcount,
+  unsigned long
+    flags,
+    height,
+    width,
+    pitchOrLinearSize,
+    depth,
+    mipmapcount,
     ddscaps1,
     ddscaps2;
@@ -248 +248 @@
 
   DDSInfo
-        dds_info;
+    dds_info;
   
   DDSDecoder
@@ -278 +278 @@
   */
   if (ReadDDSInfo(image, &dds_info) != MagickTrue) {
-          ThrowReaderException(CorruptImageError,"ImproperImageHeader");
+    ThrowReaderException(CorruptImageError,"ImproperImageHeader");
   }
   
@@ -409 +409 @@
 static MagickBooleanType ReadDDSInfo(Image *image, DDSInfo *dds_info)
 {
-        unsigned long
+  unsigned long
     hdr_size,
     required;
-        
-        /* Seek to start of header */
-        (void) SeekBlob(image, 4, SEEK_SET);
-        
-        /* Check header field */
-        hdr_size = ReadBlobLSBLong(image);
-        if (hdr_size != 124)
-                return MagickFalse;
-        
-        /* Fill in DDS info struct */
-        dds_info->flags = ReadBlobLSBLong(image);
-  
-        /* Check required flags */
-        required=(unsigned long) (DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT);
+  
+  /* Seek to start of header */
+  (void) SeekBlob(image, 4, SEEK_SET);
+  
+  /* Check header field */
+  hdr_size = ReadBlobLSBLong(image);
+  if (hdr_size != 124)
+    return MagickFalse;
+  
+  /* Fill in DDS info struct */
+  dds_info->flags = ReadBlobLSBLong(image);
+  
+  /* Check required flags */
+  required=(unsigned long) (DDSD_WIDTH | DDSD_HEIGHT | DDSD_PIXELFORMAT);
   if ((dds_info->flags & required) != required)
-                return MagickFalse;
-  
-        dds_info->height = ReadBlobLSBLong(image);
-        dds_info->width = ReadBlobLSBLong(image);
-        dds_info->pitchOrLinearSize = ReadBlobLSBLong(image);
-        dds_info->depth = ReadBlobLSBLong(image);
-        dds_info->mipmapcount = ReadBlobLSBLong(image);
-  
-        (void) SeekBlob(image, 44, SEEK_CUR);   /* reserved region of 11 DWORDs */
+    return MagickFalse;
+  
+  dds_info->height = ReadBlobLSBLong(image);
+  dds_info->width = ReadBlobLSBLong(image);
+  dds_info->pitchOrLinearSize = ReadBlobLSBLong(image);
+  dds_info->depth = ReadBlobLSBLong(image);
+  dds_info->mipmapcount = ReadBlobLSBLong(image);
+  
+  (void) SeekBlob(image, 44, SEEK_CUR);   /* reserved region of 11 DWORDs */
   
   /* Read pixel format structure */
@@ -450 +450 @@
   dds_info->pixelformat.alpha_bitmask = ReadBlobLSBLong(image);
   
-        dds_info->ddscaps1 = ReadBlobLSBLong(image);
-        dds_info->ddscaps2 = ReadBlobLSBLong(image);
-        (void) SeekBlob(image, 12, SEEK_CUR); /* 3 reserved DWORDs */
-  
-        return MagickTrue;
+  dds_info->ddscaps1 = ReadBlobLSBLong(image);
+  dds_info->ddscaps2 = ReadBlobLSBLong(image);
+  (void) SeekBlob(image, 12, SEEK_CUR); /* 3 reserved DWORDs */
+  
+  return MagickTrue;
 }
 
@@ -502 +502 @@
     j,
     y;
-        
+  
   PixelPacket
     *q;
@@ -513 +513 @@
     code;
   
-        unsigned short
+  unsigned short
     c0,
     c1;
-        
+  
   unsigned long
     bits;
@@ -527 +527 @@
       /* Get 4x4 patch of pixels to write on */
       q = QueueAuthenticPixels(image, x, y, Min(4, dds_info->width - x),
-                             Min(4, dds_info->height - y),exception);
+                       Min(4, dds_info->height - y),exception);
       
       if (q == (PixelPacket *) NULL)