code cleanup: unused defines & some formatting.

4 files changed, 20 insertions, 21 deletions

diff --git a/source/blender/imbuf/intern/dds/BlockDXT.h b/source/blender/imbuf/intern/dds/BlockDXT.h
index 9b90b744b67..0291816cd03 100644
--- a/source/blender/imbuf/intern/dds/BlockDXT.h
+++ b/source/blender/imbuf/intern/dds/BlockDXT.h
@@ -173,24 +173,24 @@ struct AlphaBlockDXT5
 	};
 	*/
 	uint64 u;
-	uint8 alpha0() const { return u & 0xffLL; };
-	uint8 alpha1() const { return (u >> 8) & 0xffLL; };
-	uint8 bits0() const { return (u >> 16) & 0x7LL; };
-	uint8 bits1() const { return (u >> 19) & 0x7LL; };
-	uint8 bits2() const { return (u >> 22) & 0x7LL; };
-	uint8 bits3() const { return (u >> 25) & 0x7LL; };
-	uint8 bits4() const { return (u >> 28) & 0x7LL; };
-	uint8 bits5() const { return (u >> 31) & 0x7LL; };
-	uint8 bits6() const { return (u >> 34) & 0x7LL; };
-	uint8 bits7() const { return (u >> 37) & 0x7LL; };
-	uint8 bits8() const { return (u >> 40) & 0x7LL; };
-	uint8 bits9() const { return (u >> 43) & 0x7LL; };
-	uint8 bitsA() const { return (u >> 46) & 0x7LL; };
-	uint8 bitsB() const { return (u >> 49) & 0x7LL; };
-	uint8 bitsC() const { return (u >> 52) & 0x7LL; };
-	uint8 bitsD() const { return (u >> 55) & 0x7LL; };
-	uint8 bitsE() const { return (u >> 58) & 0x7LL; };
-	uint8 bitsF() const { return (u >> 61) & 0x7LL; };
+	uint8 alpha0() const { return u & 0xffLL; }
+	uint8 alpha1() const { return (u >> 8) & 0xffLL; }
+	uint8 bits0() const { return (u >> 16) & 0x7LL; }
+	uint8 bits1() const { return (u >> 19) & 0x7LL; }
+	uint8 bits2() const { return (u >> 22) & 0x7LL; }
+	uint8 bits3() const { return (u >> 25) & 0x7LL; }
+	uint8 bits4() const { return (u >> 28) & 0x7LL; }
+	uint8 bits5() const { return (u >> 31) & 0x7LL; }
+	uint8 bits6() const { return (u >> 34) & 0x7LL; }
+	uint8 bits7() const { return (u >> 37) & 0x7LL; }
+	uint8 bits8() const { return (u >> 40) & 0x7LL; }
+	uint8 bits9() const { return (u >> 43) & 0x7LL; }
+	uint8 bitsA() const { return (u >> 46) & 0x7LL; }
+	uint8 bitsB() const { return (u >> 49) & 0x7LL; }
+	uint8 bitsC() const { return (u >> 52) & 0x7LL; }
+	uint8 bitsD() const { return (u >> 55) & 0x7LL; }
+	uint8 bitsE() const { return (u >> 58) & 0x7LL; }
+	uint8 bitsF() const { return (u >> 61) & 0x7LL; }
 	
 	void evaluatePalette(uint8 alpha[8]) const;
 	void evaluatePalette8(uint8 alpha[8]) const;
diff --git a/source/blender/imbuf/intern/dds/Stream.h b/source/blender/imbuf/intern/dds/Stream.h
index 7fed4ca89e7..a1ac49b58da 100644
--- a/source/blender/imbuf/intern/dds/Stream.h
+++ b/source/blender/imbuf/intern/dds/Stream.h
@@ -35,7 +35,7 @@ struct Stream
 	unsigned char *mem; // location in memory
 	unsigned int size;  // size
 	unsigned int pos;   // current position
-	Stream(unsigned char *m, unsigned int s) : mem(m), size(s), pos(0) {};
+	Stream(unsigned char *m, unsigned int s) : mem(m), size(s), pos(0) {}
 	unsigned int seek(unsigned int p);
 };
 
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index 692ba3c49ea..d94f6368298 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -41,7 +41,7 @@
 
 #include "openjpeg.h"
 
-#define JP2_FILEHEADER_SIZE 14
+// #define JP2_FILEHEADER_SIZE 14  /* UNUSED */
 
 static char JP2_HEAD[] = {0x0, 0x0, 0x0, 0x0C, 0x6A, 0x50, 0x20, 0x20, 0x0D, 0x0A, 0x87, 0x0A};
 static char J2K_HEAD[] = {0xFF, 0x4F, 0xFF, 0x51, 0x00};
diff --git a/source/blender/imbuf/intern/radiance_hdr.c b/source/blender/imbuf/intern/radiance_hdr.c
index 72cec0e3749..03ed1bb8008 100644
--- a/source/blender/imbuf/intern/radiance_hdr.c
+++ b/source/blender/imbuf/intern/radiance_hdr.c
@@ -65,7 +65,6 @@
 #define BLU 2
 #define EXP 3
 #define COLXS 128
-#define STR_MAX 540
 typedef unsigned char RGBE[4];
 typedef float fCOLOR[3];