Merging r36529-38806bge_components

1 files changed, 5 insertions, 16 deletions

diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h
index dd40d21e8b3..d4e4e8a809f 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.h
+++ b/source/blender/imbuf/intern/dds/ColorBlock.h
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software Foundation,
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * Contributors: Amorilia (amorilia@gamebox.net)
+ * Contributors: Amorilia (amorilia@users.sourceforge.net)
  *
  * ***** END GPL LICENSE BLOCK *****
  */
@@ -51,26 +51,15 @@ struct ColorBlock
 	ColorBlock(const Image * img, uint x, uint y);
 	
 	void init(const Image * img, uint x, uint y);
+    void init(uint w, uint h, const uint * data, uint x, uint y);
+    void init(uint w, uint h, const float * data, uint x, uint y);
 	
-	void swizzleDXT5n();
-	void splatX();
-	void splatY();
+	void swizzle(uint x, uint y, uint z, uint w); // 0=r, 1=g, 2=b, 3=a, 4=0xFF, 5=0
 	
-	bool isSingleColor() const;
-	bool isSingleColorNoAlpha() const;
-	uint countUniqueColors() const;
-	Color32 averageColor() const;
+    bool isSingleColor(Color32 mask = Color32(0xFF, 0xFF, 0xFF, 0x00)) const;
 	bool hasAlpha() const;
 	
-	void diameterRange(Color32 * start, Color32 * end) const;
-	void luminanceRange(Color32 * start, Color32 * end) const;
-	void boundsRange(Color32 * start, Color32 * end) const;
-	void boundsRangeAlpha(Color32 * start, Color32 * end) const;
 	
-	void sortColorsByAbsoluteValue();
-
-	float volume() const;
-
 	// Accessors
 	const Color32 * colors() const;