| OLD | NEW |
| 1 /* | 1 /* |
| 2 * The copyright in this software is being made available under the 2-clauses | 2 * The copyright in this software is being made available under the 2-clauses |
| 3 * BSD License, included below. This software may be subject to other third | 3 * BSD License, included below. This software may be subject to other third |
| 4 * party and contributor rights, including patent rights, and no such rights | 4 * party and contributor rights, including patent rights, and no such rights |
| 5 * are granted under this license. | 5 * are granted under this license. |
| 6 * | 6 * |
| 7 * Copyright (c) 2005, Herve Drolon, FreeImage Team | 7 * Copyright (c) 2005, Herve Drolon, FreeImage Team |
| 8 * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR | 8 * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR |
| 9 * Copyright (c) 2012, CS Systemes d'Information, France | 9 * Copyright (c) 2012, CS Systemes d'Information, France |
| 10 * All rights reserved. | 10 * All rights reserved. |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 ========================================================== | 95 ========================================================== |
| 96 */ | 96 */ |
| 97 #include "openjpeg.h" | 97 #include "openjpeg.h" |
| 98 | 98 |
| 99 /* | 99 /* |
| 100 ========================================================== | 100 ========================================================== |
| 101 OpenJPEG modules | 101 OpenJPEG modules |
| 102 ========================================================== | 102 ========================================================== |
| 103 */ | 103 */ |
| 104 | 104 |
| 105 /* Ignore GCC attributes if this is not GCC */ | |
| 106 #ifndef __GNUC__ | |
| 107 #define __attribute__(x) /* __attribute__(x) */ | |
| 108 #endif | |
| 109 | |
| 110 | |
| 111 /* Are restricted pointers available? (C99) */ | 105 /* Are restricted pointers available? (C99) */ |
| 112 #if (__STDC_VERSION__ != 199901L) | 106 #if (__STDC_VERSION__ != 199901L) |
| 113 /* Not a C99 compiler */ | 107 /* Not a C99 compiler */ |
| 114 #ifdef __GNUC__ | 108 #ifdef __GNUC__ |
| 115 #define restrict __restrict__ | 109 #define restrict __restrict__ |
| 116 #else | 110 #else |
| 117 #define restrict /* restrict */ | 111 #define restrict /* restrict */ |
| 118 #endif | 112 #endif |
| 119 #endif | 113 #endif |
| 120 | 114 |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 207 #ifdef USE_JPWL | 201 #ifdef USE_JPWL |
| 208 #include "openjpwl/jpwl.h" | 202 #include "openjpwl/jpwl.h" |
| 209 #endif /* USE_JPWL */ | 203 #endif /* USE_JPWL */ |
| 210 /* <<JPWL */ | 204 /* <<JPWL */ |
| 211 | 205 |
| 212 /* V2 */ | 206 /* V2 */ |
| 213 #include "opj_codec.h" | 207 #include "opj_codec.h" |
| 214 | 208 |
| 215 | 209 |
| 216 #endif /* OPJ_INCLUDES_H */ | 210 #endif /* OPJ_INCLUDES_H */ |
| OLD | NEW |