Deleting obsolete files and directories, adding v2-specific files and directories, updating existing files to v2. See README.v2 for more info

1 files changed, 3 insertions, 7 deletions

diff --git a/libopenjpeg/fix.h b/libopenjpeg/fix.h
index bcb2acb5..f4bb87f6 100644
--- a/libopenjpeg/fix.h
+++ b/libopenjpeg/fix.h
@@ -31,11 +31,8 @@
 #ifndef __FIX_H
 #define __FIX_H
 
-#if defined(_MSC_VER) || defined(__BORLANDC__)
-#define int64 __int64
-#else
-#define int64 long long
-#endif
+#include "openjpeg.h"
+#include "opj_includes.h"
 
 /**
 @file fix.h
@@ -43,7 +40,6 @@
 
 The functions in FIX.H have for goal to realize specific multiplication.
 */
-
 /** @defgroup FIX FIX - Implementation of operations of specific multiplication */
 /*@{*/
 
@@ -54,7 +50,7 @@ Multiply two fixed-precision rational numbers.
 @return Returns a * b
 */
 static INLINE int fix_mul(int a, int b) {
-    int64 temp = (int64) a * (int64) b ;
+    OPJ_INT64 temp = (OPJ_INT64) a * (OPJ_INT64) b ;
     temp += temp & 4096;
     return (int) (temp >> 13) ;
 }