summaryrefslogtreecommitdiff
path: root/indra/llimagej2coj/llimagej2coj.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-12-30 16:30:36 -0500
committerLoren Shih <seraph@lindenlab.com>2010-12-30 16:30:36 -0500
commite68b03260ffdf786f609ace72ba1f63ce0913b2c (patch)
treefd801ec06335331dc03638eb670a7cae2e10a471 /indra/llimagej2coj/llimagej2coj.cpp
parentfad456e2b13fab83206240d7973dd2529b53de9e (diff)
parentcc3f0d287c7edb9e4cfe18985f2758e815502440 (diff)
Automated merge up from viewer-development
Diffstat (limited to 'indra/llimagej2coj/llimagej2coj.cpp')
-rw-r--r--indra/llimagej2coj/llimagej2coj.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/indra/llimagej2coj/llimagej2coj.cpp b/indra/llimagej2coj/llimagej2coj.cpp
index 95e0997d5b..13b12c0928 100644
--- a/indra/llimagej2coj/llimagej2coj.cpp
+++ b/indra/llimagej2coj/llimagej2coj.cpp
@@ -90,6 +90,12 @@ void info_callback(const char* msg, void*)
lldebugs << "LLImageJ2COJ: " << chomp(msg) << llendl;
}
+// Divide a by 2 to the power of b and round upwards
+int ceildivpow2(int a, int b)
+{
+ return (a + (1 << b) - 1) >> b;
+}
+
LLImageJ2COJ::LLImageJ2COJ()
: LLImageJ2CImpl()