13 files changed, 97 insertions, 22 deletions

diff --git a/source/blender/imbuf/IMB_imbuf_types.h b/source/blender/imbuf/IMB_imbuf_types.h
index 2cb1dfe149a..dcb5cdd7d32 100644
--- a/source/blender/imbuf/IMB_imbuf_types.h
+++ b/source/blender/imbuf/IMB_imbuf_types.h
@@ -50,6 +50,13 @@ struct ImMetaData;
 #define IB_MIPMAP_LEVELS	20
 #define IB_FILENAME_SIZE	1024
 
+typedef struct DDSData {
+	unsigned int fourcc; /* DDS fourcc info */
+	unsigned int nummipmaps; /* The number of mipmaps in the dds file */
+	unsigned char *data; /* The compressed image data */
+	unsigned int size; /* The size of the compressed data */
+} DDSData;
+
 /**
  * \ingroup imbuf
  * This is the abstraction of an image.  ImBuf is the basic type used for all
@@ -119,6 +126,9 @@ typedef struct ImBuf {
 	unsigned char *encodedbuffer;     /* Compressed image only used with png currently */
 	unsigned int   encodedsize;       /* Size of data written to encodedbuffer */
 	unsigned int   encodedbuffersize; /* Size of encodedbuffer */
+
+	/* information for compressed textures */
+	struct DDSData dds_data;
 } ImBuf;
 
 /* Moved from BKE_bmfont_types.h because it is a userflag bit mask. */
@@ -215,6 +225,28 @@ typedef struct ImBuf {
 #define IB_PROFILE_SRGB			2
 #define IB_PROFILE_CUSTOM		3
 
+/* dds */
+#ifdef WITH_DDS
+#ifndef MAKEFOURCC
+#define MAKEFOURCC(ch0, ch1, ch2, ch3)\
+	((unsigned long)(unsigned char)(ch0) | \
+	((unsigned long)(unsigned char)(ch1) << 8) | \
+	((unsigned long)(unsigned char)(ch2) << 16) | \
+	((unsigned long)(unsigned char)(ch3) << 24))
+#endif //MAKEFOURCC
+
+/*
+ * FOURCC codes for DX compressed-texture pixel formats
+ */
+
+#define FOURCC_DDS   (MAKEFOURCC('D','D','S',' '))
+#define FOURCC_DXT1  (MAKEFOURCC('D','X','T','1'))
+#define FOURCC_DXT2  (MAKEFOURCC('D','X','T','2'))
+#define FOURCC_DXT3  (MAKEFOURCC('D','X','T','3'))
+#define FOURCC_DXT4  (MAKEFOURCC('D','X','T','4'))
+#define FOURCC_DXT5  (MAKEFOURCC('D','X','T','5'))
+
+#endif // DDS
 extern const char *imb_ext_image[];
 extern const char *imb_ext_image_qt[];
 extern const char *imb_ext_movie[];
diff --git a/source/blender/imbuf/intern/allocimbuf.c b/source/blender/imbuf/intern/allocimbuf.c
index 319e3f27bd8..68a094c26d0 100644
--- a/source/blender/imbuf/intern/allocimbuf.c
+++ b/source/blender/imbuf/intern/allocimbuf.c
@@ -162,6 +162,8 @@ void IMB_freeImBuf(ImBuf *ibuf)
 			IMB_freezbuffloatImBuf(ibuf);
 			freeencodedbufferImBuf(ibuf);
 			IMB_metadata_free(ibuf);
+			if (ibuf->dds_data.data != NULL)
+				free(ibuf->dds_data.data); /* dds_data.data is allocated by DirectDrawSurface::readData(), so don't use MEM_freeN! */
 			MEM_freeN(ibuf);
 		}
 	}
@@ -351,7 +353,7 @@ ImBuf *IMB_allocImBuf(unsigned int x, unsigned int y, uchar planes, unsigned int
 		ibuf->planes = planes;
 		ibuf->ftype = TGA;
 		ibuf->channels = 4;  /* float option, is set to other values when buffers get assigned */
-		ibuf->ppm[0] = ibuf->ppm[1] = 150.0 / 0.0254; /* 150dpi -> pixels-per-meter */
+		ibuf->ppm[0] = ibuf->ppm[1] = IMB_DPI_DEFAULT / 0.0254; /* IMB_DPI_DEFAULT -> pixels-per-meter */
 		
 		if (flags & IB_rect) {
 			if (imb_addrectImBuf(ibuf) == FALSE) {
diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c
index a908d4aa3b8..f0c2d754333 100644
--- a/source/blender/imbuf/intern/anim_movie.c
+++ b/source/blender/imbuf/intern/anim_movie.c
@@ -64,7 +64,7 @@
 #include <io.h>
 #endif
 
-#include "BLI_blenlib.h" /* BLI_remlink BLI_filesize BLI_addtail
+#include "BLI_blenlib.h" /* BLI_remlink BLI_file_descriptor_size BLI_addtail
                           * BLI_countlist BLI_stringdec */
 #include "BLI_utildefines.h"
 #include "BLI_math_base.h"
diff --git a/source/blender/imbuf/intern/cineon/cineon_dpx.c b/source/blender/imbuf/intern/cineon/cineon_dpx.c
index 8e996b97622..182e0a7e29d 100644
--- a/source/blender/imbuf/intern/cineon/cineon_dpx.c
+++ b/source/blender/imbuf/intern/cineon/cineon_dpx.c
@@ -83,7 +83,7 @@ static ImBuf *imb_load_dpx_cineon(unsigned char *mem, int use_cineon, int size,
 	
 	logImageGetSize(image, &width, &height, &depth);
 	
-	if (depth != 3) { /*need to do greyscale loading eventually.*/
+	if (depth != 3) { /*need to do grayscale loading eventually.*/
 		logImageClose(image);
 		return NULL;
 	}
diff --git a/source/blender/imbuf/intern/cineon/dpxfile.h b/source/blender/imbuf/intern/cineon/dpxfile.h
index 8846c7418d5..e1d95268a80 100644
--- a/source/blender/imbuf/intern/cineon/dpxfile.h
+++ b/source/blender/imbuf/intern/cineon/dpxfile.h
@@ -62,7 +62,7 @@ typedef struct {
 		R32		 ref_high_quantity;/* reference high quantity represented */
 		U8		 designator1;
 		U8		 transfer_characteristics;
-		U8		 colourimetry;
+		U8		 colorimetry;
 		U8		 bits_per_pixel;
 		U16		 packing;
 		U16		 encoding;
diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c
index a4b8c9d3f36..c1138225e93 100644
--- a/source/blender/imbuf/intern/cineon/dpxlib.c
+++ b/source/blender/imbuf/intern/cineon/dpxlib.c
@@ -53,7 +53,7 @@ fillDpxChannelInfo(DpxFile* dpx, DpxChannelInformation* chan, int des) {
 	chan->ref_high_quantity = htonf(2.046);
 	chan->designator1 = des;
 	chan->transfer_characteristics = 0;
-	chan->colourimetry = 0;
+	chan->colorimetry = 0;
 	chan->bits_per_pixel = 10;
 	chan->packing = htons(1);
 	chan->encoding = 0;
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
index 438988fbe48..82f355e1bb2 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
@@ -1016,6 +1016,10 @@ uint DirectDrawSurface::mipmapCount() const
 	else return 1;
 }
 
+uint DirectDrawSurface::fourCC() const
+{
+	return header.pf.fourcc;
+}
 
 uint DirectDrawSurface::width() const
 {
@@ -1131,6 +1135,29 @@ void DirectDrawSurface::mipmap(Image * img, uint face, uint mipmap)
 	}
 }
 
+// It was easier to copy this function from upstream than to resync.
+// This should be removed if a resync ever occurs.
+void* DirectDrawSurface::readData(uint &rsize)
+{
+	uint header_size = 128; // sizeof(DDSHeader);
+	if (header.hasDX10Header())
+	{
+		header_size += 20; // sizeof(DDSHeader10);
+	}
+
+	uint size = stream.size - header_size;
+	rsize = size;
+
+	unsigned char *data = new unsigned char[size];
+
+	stream.seek(header_size);
+	mem_read(stream, data, size);
+
+	// Maybe check if size == rsize? assert() isn't in this scope...
+
+	return data;
+}
+
 void DirectDrawSurface::readLinearImage(Image * img)
 {
 	
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
index ddae8826620..a851533b1f3 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
@@ -158,6 +158,7 @@ public:
 	bool hasAlpha() const;
 	
 	uint mipmapCount() const;
+	uint fourCC() const;
 	uint width() const;
 	uint height() const;
 	uint depth() const;
@@ -171,6 +172,7 @@ public:
         void setUserVersion(int version);
 	
 	void mipmap(Image * img, uint f, uint m);
+	void* readData(uint &size);
 	//	void mipmap(FloatImage * img, uint f, uint m);
 	
 	void printInfo() const;
diff --git a/source/blender/imbuf/intern/dds/dds_api.cpp b/source/blender/imbuf/intern/dds/dds_api.cpp
index 071d94c2076..fba326f7865 100644
--- a/source/blender/imbuf/intern/dds/dds_api.cpp
+++ b/source/blender/imbuf/intern/dds/dds_api.cpp
@@ -123,6 +123,8 @@ struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags)
 
 	ibuf->ftype = DDS;
 	ibuf->profile = IB_PROFILE_SRGB;
+	ibuf->dds_data.fourcc = dds.fourCC();
+	ibuf->dds_data.nummipmaps = dds.mipmapCount();
 
 	if ((flags & IB_test) == 0) {
 		if (!imb_addrectImBuf(ibuf)) return(ibuf);
@@ -136,10 +138,18 @@ struct ImBuf *imb_load_dds(unsigned char *mem, size_t size, int flags)
 			cp[0] = pixel.r; /* set R component of col */
 			cp[1] = pixel.g; /* set G component of col */
 			cp[2] = pixel.b; /* set B component of col */
-			if (bits_per_pixel == 32)
+			if (dds.hasAlpha())
 				cp[3] = pixel.a; /* set A component of col */
 			rect[i] = col;
 		}
+
+		if (ibuf->dds_data.fourcc != FOURCC_DDS)
+			ibuf->dds_data.data = (unsigned char*)dds.readData(ibuf->dds_data.size);
+		else {
+			ibuf->dds_data.data = NULL;
+			ibuf->dds_data.size = 0;
+		}
+
 		IMB_flipy(ibuf);
 	}
 
diff --git a/source/blender/imbuf/intern/imbuf.h b/source/blender/imbuf/intern/imbuf.h
index 47b4b7b6a58..999aae81cb7 100644
--- a/source/blender/imbuf/intern/imbuf.h
+++ b/source/blender/imbuf/intern/imbuf.h
@@ -72,5 +72,7 @@ typedef unsigned char uchar;
 #define TRUE 1
 #define FALSE 0
 
+#define IMB_DPI_DEFAULT 72.0f
+
 #endif	/* __IMBUF_H__ */
 
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index 0ccd2680461..8b2e27ae1f3 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -313,7 +313,7 @@ int IMB_proxy_size_to_array_index(IMB_Proxy_Size pr_size)
 {
 	switch (pr_size) {
 		case IMB_PROXY_NONE: /* if we got here, something is broken anyways,
-		                        so sane defaults... */
+		                      * so sane defaults... */
 			return 0;
 		case IMB_PROXY_25:
 			return 0;
@@ -333,7 +333,7 @@ int IMB_timecode_to_array_index(IMB_Timecode_Type tc)
 {
 	switch (tc) {
 		case IMB_TC_NONE: /* if we got here, something is broken anyways,
-		                     so sane defaults... */
+		                   * so sane defaults... */
 			return 0;
 		case IMB_TC_RECORD_RUN:
 			return 0;
@@ -906,11 +906,11 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context,
 			                pts_time_base * frame_rate + 0.5f);
 
 			/* decoding starts *always* on I-Frames,
-			   so: P-Frames won't work, even if all the
-			   information is in place, when we seek
-			   to the I-Frame presented *after* the P-Frame,
-			   but located before the P-Frame within
-			   the stream */
+			 * so: P-Frames won't work, even if all the
+			 * information is in place, when we seek
+			 * to the I-Frame presented *after* the P-Frame,
+			 * but located before the P-Frame within
+			 * the stream */
 
 			if (pts < seek_pos_pts) {
 				s_pos = last_seek_pos;
@@ -966,7 +966,7 @@ static AviMovie *alloc_proxy_output_avi(
 	double framerate;
 	AviMovie *avi;
 	short frs_sec = 25;      /* it doesn't really matter for proxies,
-	                            but sane defaults help anyways...*/
+	                          * but sane defaults help anyways...*/
 	float frs_sec_base = 1.0;
 
 	IMB_anim_get_fps(anim, &frs_sec, &frs_sec_base);
diff --git a/source/blender/imbuf/intern/jp2.c b/source/blender/imbuf/intern/jp2.c
index 053d88c8c32..3008c233718 100644
--- a/source/blender/imbuf/intern/jp2.c
+++ b/source/blender/imbuf/intern/jp2.c
@@ -175,13 +175,13 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
 	h = image->comps[0].h;
 	
 	switch (image->numcomps) {
-		case 1: /* Greyscale */
+		case 1: /* Grayscale */
 		case 3: /* Color */
 			planes = 24;
 			use_alpha = FALSE;
 			break;
-		default: /* 2 or 4 - Greyscale or Color + alpha */
-			planes = 32; /* greyscale + alpha */
+		default: /* 2 or 4 - Grayscale or Color + alpha */
+			planes = 32; /* grayscale + alpha */
 			use_alpha = TRUE;
 			break;
 	}
@@ -220,7 +220,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
 			r = image->comps[0].data;
 			a = (use_alpha) ? image->comps[1].data : NULL;
 
-			/* greyscale 12bits+ */
+			/* grayscale 12bits+ */
 			if (use_alpha) {
 				a = image->comps[1].data;
 				PIXEL_LOOPER_BEGIN(rect_float) {
@@ -272,7 +272,7 @@ struct ImBuf *imb_jp2_decode(unsigned char *mem, size_t size, int flags)
 			r = image->comps[0].data;
 			a = (use_alpha) ? image->comps[1].data : NULL;
 
-			/* greyscale */
+			/* grayscale */
 			if (use_alpha) {
 				a = image->comps[3].data;
 				PIXEL_LOOPER_BEGIN(rect_uchar) {
diff --git a/source/blender/imbuf/intern/tiff.c b/source/blender/imbuf/intern/tiff.c
index 556ec64e59a..615b420429a 100644
--- a/source/blender/imbuf/intern/tiff.c
+++ b/source/blender/imbuf/intern/tiff.c
@@ -36,7 +36,7 @@
  * high-level routine that loads all images as 32-bit RGBA, handling all the
  * required conversions between many different TIFF types internally.
  * 
- * Saving supports RGB, RGBA and BW (greyscale) images correctly, with
+ * Saving supports RGB, RGBA and BW (grayscale) images correctly, with
  * 8 bits per channel in all cases.  The "deflate" compression algorithm is
  * used to compress images.
  */
@@ -765,7 +765,7 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags)
 		             PHOTOMETRIC_RGB);
 	}
 	else if (samplesperpixel == 1) {
-		/* greyscale images, 1 channel */
+		/* grayscale images, 1 channel */
 		TIFFSetField(image, TIFFTAG_PHOTOMETRIC,
 		             PHOTOMETRIC_MINISBLACK);
 	}
@@ -811,7 +811,7 @@ int imb_savetiff(ImBuf *ibuf, const char *name, int flags)
 		yres = (float)(ibuf->ppm[1] * 0.0254);
 	}
 	else {
-		xres = yres = 150.0f;
+		xres = yres = IMB_DPI_DEFAULT;
 	}
 
 	TIFFSetField(image, TIFFTAG_XRESOLUTION,     xres);