summaryrefslogtreecommitdiff
path: root/src/lib/openjp3d/fix.h
diff options
context:
space:
mode:
authorAntonin Descampe <antonin@gmail.com>2016-01-25 23:22:06 +0100
committerAntonin Descampe <antonin@gmail.com>2016-01-25 23:22:06 +0100
commit0febbff19e05cb1a6c2613eee76ad46a669c96cd (patch)
treeb6442d01348e2ba6404d0fd6abcc4eb6d6cc1390 /src/lib/openjp3d/fix.h
parentbede1568b197021bb576b935422af6c1d0a79e21 (diff)
processed all c/h files through astyle with opj_astyle.cfgcodingstyle
Diffstat (limited to 'src/lib/openjp3d/fix.h')
-rw-r--r--src/lib/openjp3d/fix.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/openjp3d/fix.h b/src/lib/openjp3d/fix.h
index ea05403c..a6e85e93 100644
--- a/src/lib/openjp3d/fix.h
+++ b/src/lib/openjp3d/fix.h
@@ -1,6 +1,6 @@
/*
- * The copyright in this software is being made available under the 2-clauses
- * BSD License, included below. This software may be subject to other third
+ * The copyright in this software is being made available under the 2-clauses
+ * BSD License, included below. This software may be subject to other third
* party and contributor rights, including patent rights, and no such rights
* are granted under this license.
*
@@ -57,7 +57,8 @@ Multiply two fixed-precision rational numbers.
@param b
@return Returns a * b
*/
-static int fix_mul(int a, int b) {
+static int fix_mul(int a, int b)
+{
int64 temp = (int64) a * (int64) b >> 12;
return (int) ((temp >> 1) + (temp & 1)) ;
}