summaryrefslogtreecommitdiff
path: root/indra/llimage/llimagej2c.cpp
diff options
context:
space:
mode:
authorJoshua Bell <josh@lindenlab.com>2011-05-16 10:09:53 -0700
committerJoshua Bell <josh@lindenlab.com>2011-05-16 10:09:53 -0700
commitcfad224f1c56556e58cfe7f3fe0606b4ab164ef8 (patch)
tree1000311071eb6b9d8a1132f860ffd980bb5f5c5b /indra/llimage/llimagej2c.cpp
parentf440cd4af6cb7cd791e5f0eddb8dc9b99a37e0b0 (diff)
parent0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff)
Merge
Diffstat (limited to 'indra/llimage/llimagej2c.cpp')
-rw-r--r--indra/llimage/llimagej2c.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimagej2c.cpp b/indra/llimage/llimagej2c.cpp
index a90df0f1c1..44e6b89dd3 100644
--- a/indra/llimage/llimagej2c.cpp
+++ b/indra/llimage/llimagej2c.cpp
@@ -144,9 +144,9 @@ BOOL LLImageJ2C::initDecode(LLImageRaw &raw_image, int discard_level, int* regio
return mImpl->initDecode(*this,raw_image,discard_level,region);
}
-BOOL LLImageJ2C::initEncode(LLImageRaw &raw_image, int blocks_size, int precincts_size)
+BOOL LLImageJ2C::initEncode(LLImageRaw &raw_image, int blocks_size, int precincts_size, int levels)
{
- return mImpl->initEncode(*this,raw_image,blocks_size,precincts_size);
+ return mImpl->initEncode(*this,raw_image,blocks_size,precincts_size,levels);
}
BOOL LLImageJ2C::decode(LLImageRaw *raw_imagep, F32 decode_time)