diff options
| author | Richard Linden <none@none> | 2011-05-13 17:02:49 -0700 |
|---|---|---|
| committer | Richard Linden <none@none> | 2011-05-13 17:02:49 -0700 |
| commit | 1e6d1879a01d57e8949add79fa4f3ef5d11c1c43 (patch) | |
| tree | 1f769d4c8375e23576ecb01457979deeeba34c24 /indra/llimagej2coj/llimagej2coj.cpp | |
| parent | e8ede07451c65aea898bc3f58a980b6b0d9af302 (diff) | |
| parent | 039b6baf065a87d747647fb0477c799a9949ebf2 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/llimagej2coj/llimagej2coj.cpp')
| -rw-r--r-- | indra/llimagej2coj/llimagej2coj.cpp | 2 |
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; |