diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-04-07 04:25:42 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-04-07 04:25:42 +0300 |
commit | 9510137d1237f0bb493313cb65a79479ec77e4ce (patch) | |
tree | efd8fb78bea8b41b84dd053c7251eb2587aed0ef /source/blender/imbuf/intern/dds | |
parent | e2eeb46a1bda8cf49a70e78a45d12fede27a1af9 (diff) |
Cleanup: brace placement /w structs
Diffstat (limited to 'source/blender/imbuf/intern/dds')
-rw-r--r-- | source/blender/imbuf/intern/dds/BlockDXT.h | 24 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/ColorBlock.h | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/DirectDrawSurface.cpp | 3 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/DirectDrawSurface.h | 12 | ||||
-rw-r--r-- | source/blender/imbuf/intern/dds/Stream.h | 3 |
5 files changed, 15 insertions, 30 deletions
diff --git a/source/blender/imbuf/intern/dds/BlockDXT.h b/source/blender/imbuf/intern/dds/BlockDXT.h index 7e5a1e504b8..6aae9c9817c 100644 --- a/source/blender/imbuf/intern/dds/BlockDXT.h +++ b/source/blender/imbuf/intern/dds/BlockDXT.h @@ -64,8 +64,7 @@ #include <Stream.h> /// DXT1 block. -struct BlockDXT1 -{ +struct BlockDXT1 { Color16 col0; Color16 col1; union { @@ -98,8 +97,7 @@ inline bool BlockDXT1::isFourColorMode() const /// DXT3 alpha block with explicit alpha. -struct AlphaBlockDXT3 -{ +struct AlphaBlockDXT3 { union { struct { uint alpha0 : 4; @@ -130,8 +128,7 @@ struct AlphaBlockDXT3 /// DXT3 block. -struct BlockDXT3 -{ +struct BlockDXT3 { AlphaBlockDXT3 alpha; BlockDXT1 color; @@ -144,8 +141,7 @@ struct BlockDXT3 /// DXT5 alpha block. -struct AlphaBlockDXT5 -{ +struct AlphaBlockDXT5 { // uint64 unions do not compile on all platforms #if 0 union { @@ -208,8 +204,7 @@ struct AlphaBlockDXT5 /// DXT5 block. -struct BlockDXT5 -{ +struct BlockDXT5 { AlphaBlockDXT5 alpha; BlockDXT1 color; @@ -221,8 +216,7 @@ struct BlockDXT5 }; /// ATI1 block. -struct BlockATI1 -{ +struct BlockATI1 { AlphaBlockDXT5 alpha; void decodeBlock(ColorBlock * block) const; @@ -232,8 +226,7 @@ struct BlockATI1 }; /// ATI2 block. -struct BlockATI2 -{ +struct BlockATI2 { AlphaBlockDXT5 x; AlphaBlockDXT5 y; @@ -244,8 +237,7 @@ struct BlockATI2 }; /// CTX1 block. -struct BlockCTX1 -{ +struct BlockCTX1 { uint8 col0[2]; uint8 col1[2]; union { diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h index 730a19d84fd..8d5031aa603 100644 --- a/source/blender/imbuf/intern/dds/ColorBlock.h +++ b/source/blender/imbuf/intern/dds/ColorBlock.h @@ -41,8 +41,7 @@ #include <Image.h> /// Uncompressed 4x4 color block. -struct ColorBlock -{ +struct ColorBlock { ColorBlock(); ColorBlock(const uint * linearImage); ColorBlock(const ColorBlock & block); diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp index 028026527dc..15c8d86d61c 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp @@ -496,8 +496,7 @@ void mem_read(Stream & mem, DDSHeader & header) namespace { -struct FormatDescriptor -{ +struct FormatDescriptor { uint format; uint bitcount; uint rmask; diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h index 3d308ba1ff1..44c27a98c1d 100644 --- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h +++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h @@ -63,8 +63,7 @@ #include <ColorBlock.h> #include <Image.h> -struct DDSPixelFormat -{ +struct DDSPixelFormat { uint size; uint flags; uint fourcc; @@ -75,8 +74,7 @@ struct DDSPixelFormat uint amask; }; -struct DDSCaps -{ +struct DDSCaps { uint caps1; uint caps2; uint caps3; @@ -84,8 +82,7 @@ struct DDSCaps }; /// DDS file header for DX10. -struct DDSHeader10 -{ +struct DDSHeader10 { uint dxgiFormat; uint resourceDimension; uint miscFlag; @@ -94,8 +91,7 @@ struct DDSHeader10 }; /// DDS file header. -struct DDSHeader -{ +struct DDSHeader { uint fourcc; uint size; uint flags; diff --git a/source/blender/imbuf/intern/dds/Stream.h b/source/blender/imbuf/intern/dds/Stream.h index a1ac49b58da..6557fb4f063 100644 --- a/source/blender/imbuf/intern/dds/Stream.h +++ b/source/blender/imbuf/intern/dds/Stream.h @@ -30,8 +30,7 @@ #ifndef __STREAM_H__ #define __STREAM_H__ -struct Stream -{ +struct Stream { unsigned char *mem; // location in memory unsigned int size; // size unsigned int pos; // current position |