summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagejpeg.h
diff options
context:
space:
mode:
authorRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-09-27 15:43:53 +0300
committerRuslan Teliuk <ruslantproductengine@lindenlab.com>2016-09-27 15:43:53 +0300
commit999dc6c61ba48c5bd930e63bfc6dc7d1e494b43c (patch)
tree5c0f00f9521aa0298ff2813d5116cf4b12a04597 /indra/llimage/llimagejpeg.h
parent25c20f98a88a457b5fa865e8dc302b24378bc842 (diff)
parentfa4376b457b887130e98bd96e6bccb231e8947d2 (diff)
Merged lindenlab/viewer-neko into default
Diffstat (limited to 'indra/llimage/llimagejpeg.h')
-rw-r--r--indra/llimage/llimagejpeg.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llimage/llimagejpeg.h b/indra/llimage/llimagejpeg.h
index 2142660c81..7a849a8421 100644
--- a/indra/llimage/llimagejpeg.h
+++ b/indra/llimage/llimagejpeg.h
@@ -51,9 +51,9 @@ public:
LLImageJPEG(S32 quality = 75);
/*virtual*/ std::string getExtension() { return std::string("jpg"); }
- /*virtual*/ BOOL updateData();
- /*virtual*/ BOOL decode(LLImageRaw* raw_image, F32 decode_time);
- /*virtual*/ BOOL encode(const LLImageRaw* raw_image, F32 encode_time);
+ /*virtual*/ bool updateData();
+ /*virtual*/ bool decode(LLImageRaw* raw_image, F32 decode_time);
+ /*virtual*/ bool encode(const LLImageRaw* raw_image, F32 encode_time);
void setEncodeQuality( S32 q ) { mEncodeQuality = q; } // on a scale from 1 to 100
S32 getEncodeQuality() { return mEncodeQuality; }
@@ -73,7 +73,7 @@ public:
static void errorEmitMessage(j_common_ptr cinfo, int msg_level);
static void errorOutputMessage(j_common_ptr cinfo);
- static BOOL decompress(LLImageJPEG* imagep);
+ static bool decompress(LLImageJPEG* imagep);
protected:
U8* mOutputBuffer; // temp buffer used during encoding