Backported llimage changes from Viewer 2.0.0

1 files changed, 7 insertions, 3 deletions

diff --git a/linden/indra/llimage/llimage.h b/linden/indra/llimage/llimage.h
index be2eb08..102e779 100644
--- a/linden/indra/llimage/llimage.h
+++ b/linden/indra/llimage/llimage.h
@@ -4,7 +4,7 @@
  *
  * $LicenseInfo:firstyear=2000&license=viewergpl$
  * 
- * Copyright (c) 2000-2009, Linden Research, Inc.
+ * Copyright (c) 2000-2010, Linden Research, Inc.
  * 
  * Second Life Viewer Source Code
  * The source code in this file ("Source Code") is provided by Linden Lab
@@ -35,8 +35,9 @@
 
 #include "lluuid.h"
 #include "llstring.h"
-#include "llmemory.h"
+//#include "llmemory.h"
 #include "llthread.h"
+#include "llmemtype.h"
 
 const S32 MIN_IMAGE_MIP =  2; // 4x4, only used for expand/contract power of 2
 const S32 MAX_IMAGE_MIP = 11; // 2048x2048
@@ -130,7 +131,7 @@ public:
 
 protected:
         // special accessor to allow direct setting of mData and mDataSize by LLImageFormatted
-        void setDataAndSize(U8 *data, S32 size) { mData = data; mDataSize = size; };
+        void setDataAndSize(U8 *data, S32 size) { mData = data; mDataSize = size; }
         
 public:
         static void generateMip(const U8 *indata, U8* mipdata, int width, int height, S32 nchannels);
@@ -191,6 +192,7 @@ public:
         void contractToPowerOfTwo(S32 max_dim = MAX_IMAGE_SIZE, BOOL scale_image = TRUE);
         void biasedScaleToPowerOfTwo(S32 max_dim = MAX_IMAGE_SIZE);
         BOOL scale( S32 new_width, S32 new_height, BOOL scale_image = TRUE );
+        BOOL scaleDownWithoutBlending( S32 new_width, S32 new_height) ;
 
         // Fill the buffer with a constant color
         void fill( const LLColor4U& color );
@@ -239,6 +241,8 @@ protected:
 
         U8      fastFractionalMult(U8 a,U8 b);
 
+        void setDataAndSize(U8 *data, S32 width, S32 height, S8 components) ;
+
 public:
         static S32 sGlobalRawMemory;
         static S32 sRawImageCount;