opj_mj2_extract: Avoid segfault for long filenames

[openjpeg.git] / src / lib / openmj2 / opj_includes.h

diff --git a/src/lib/openmj2/opj_includes.h b/src/lib/openmj2/opj_includes.h
index e483390c751d2d51aa1bc7b33900d0bd4d098d31..340e8a911011ba0c81c6441d93f9d08f600e72ea 100644 (file)
--- a/src/lib/openmj2/opj_includes.h
+++ b/src/lib/openmj2/opj_includes.h
@@ -1,4 +1,9 @@
 /*
+ * 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.
+ *
  * Copyright (c) 2005, Herve Drolon, FreeImage Team
  * All rights reserved.
  *
@@ -56,49 +61,50 @@
 
 /* Ignore GCC attributes if this is not GCC */
 #ifndef __GNUC__
-       #define __attribute__(x) /* __attribute__(x) */
+#define __attribute__(x) /* __attribute__(x) */
 #endif
 
 /*
-The inline keyword is supported by C99 but not by C90. 
-Most compilers implement their own version of this keyword ... 
+The inline keyword is supported by C99 but not by C90.
+Most compilers implement their own version of this keyword ...
 */
 #ifndef INLINE
-       #if defined(_MSC_VER)
-               #define INLINE __forceinline
-       #elif defined(__GNUC__)
-               #define INLINE __inline__
-       #elif defined(__MWERKS__)
-               #define INLINE inline
-       #else 
-               /* add other compilers here ... */
-               #define INLINE 
-       #endif /* defined(<Compiler>) */
+#if defined(_MSC_VER)
+#define INLINE __forceinline
+#elif defined(__GNUC__)
+#define INLINE __inline__
+#elif defined(__MWERKS__)
+#define INLINE inline
+#else
+/* add other compilers here ... */
+#define INLINE
+#endif /* defined(<Compiler>) */
 #endif /* INLINE */
 
 /* Are restricted pointers available? (C99) */
 #if (__STDC_VERSION__ != 199901L)
-       /* Not a C99 compiler */
-       #ifdef __GNUC__
-               #define restrict __restrict__
-       #else
-               #define restrict /* restrict */
-       #endif
+/* Not a C99 compiler */
+#ifdef __GNUC__
+#define restrict __restrict__
+#else
+#define restrict /* restrict */
+#endif
 #endif
 
 /* MSVC and Borland C do not have lrintf */
 #if defined(_MSC_VER) || defined(__BORLANDC__)
-static INLINE long lrintf(float f){
+static INLINE long lrintf(float f)
+{
 #ifdef _M_X64
-    return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f));
+    return (long)((f > 0.0f) ? (f + 0.5f) : (f - 0.5f));
 #else
     int i;
- 
+
     _asm{
         fld f
         fistp i
     };
- 
+
     return i;
 #endif
 }