summaryrefslogtreecommitdiff
path: root/indra/llimagej2coj/llimagej2coj.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-01-06 14:32:01 -0500
committerOz Linden <oz@lindenlab.com>2011-01-06 14:32:01 -0500
commit94fbf99ac2e325a75a016e2f4c3b12cf8c82fc7c (patch)
tree0f1aa2cbd03f47adf17f39e6bca8e7d5e4ac165c /indra/llimagej2coj/llimagej2coj.cpp
parentf1fd558dddf43277e024cb918c371d94d0764910 (diff)
parenta9686db3e606ec45d23265fd34a1a35498f39857 (diff)
merge changes for storm-714
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()