summaryrefslogtreecommitdiff
path: root/indra/llimagej2coj/llimagej2coj.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/llimagej2coj/llimagej2coj.cpp
parentf440cd4af6cb7cd791e5f0eddb8dc9b99a37e0b0 (diff)
parent0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff)
Merge
Diffstat (limited to 'indra/llimagej2coj/llimagej2coj.cpp')
-rw-r--r--indra/llimagej2coj/llimagej2coj.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 8288fa1f5c..d15824ce5a 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -113,7 +113,7 @@ BOOL LLImageJ2COJ::initDecode(LLImageJ2C &base, LLImageRaw &raw_image, int disca
return FALSE;
}
-BOOL LLImageJ2COJ::initEncode(LLImageJ2C &base, LLImageRaw &raw_image, int blocks_size, int precincts_size)
+BOOL LLImageJ2COJ::initEncode(LLImageJ2C &base, LLImageRaw &raw_image, int blocks_size, int precincts_size, int levels)
{
// No specific implementation for this method in the OpenJpeg case
return FALSE;