summaryrefslogtreecommitdiff
path: root/src/lib
diff options
context:
space:
mode:
authorMathieu Malaterre <mathieu.malaterre@gmail.com>2014-03-14 11:59:18 +0000
committerMathieu Malaterre <mathieu.malaterre@gmail.com>2014-03-14 11:59:18 +0000
commit9d0bdf69e5b960ce817c4e63420468f3d542f296 (patch)
treec49b3fac1777c072ccfa8883a1332143f5cb0244 /src/lib
parent9194dfb94b0cb26ea1113aadc237350a4db5b030 (diff)
[trunk] Apply final missing patch from sumatrapdf team:
http://bugs.ghostscript.com/show_bug.cgi?id=694893 Update issue 231
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/openjp2/opj_intmath.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lib/openjp2/opj_intmath.h b/src/lib/openjp2/opj_intmath.h
index 73d08a28..38edf3f5 100644
--- a/src/lib/openjp2/opj_intmath.h
+++ b/src/lib/openjp2/opj_intmath.h
@@ -119,7 +119,7 @@ Divide an integer by a power of 2 and round upwards
@return Returns a divided by 2^b
*/
static INLINE OPJ_INT32 opj_int_ceildivpow2(OPJ_INT32 a, OPJ_INT32 b) {
- return (a + (1 << b) - 1) >> b;
+ return (OPJ_INT32)((a + (OPJ_INT64)(1 << b) - 1) >> b);
}
/**
Divide an integer by a power of 2 and round downwards