diff options
Diffstat (limited to 'extern/libopenjpeg/opj_includes.h')
| -rw-r--r-- | extern/libopenjpeg/opj_includes.h | 99 |
1 files changed, 70 insertions, 29 deletions
diff --git a/extern/libopenjpeg/opj_includes.h b/extern/libopenjpeg/opj_includes.h index e9194fd9886..d9238b1bfd5 100644 --- a/extern/libopenjpeg/opj_includes.h +++ b/extern/libopenjpeg/opj_includes.h @@ -1,5 +1,12 @@ /* + * 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 + * Copyright (c) 2008, 2011-2012, Centre National d'Etudes Spatiales (CNES), FR + * Copyright (c) 2012, CS Systemes d'Information, France * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -27,6 +34,12 @@ #define OPJ_INCLUDES_H /* + * This must be included before any system headers, + * since they can react to macro defined there + */ +#include "opj_config_private.h" + +/* ========================================================== Standard includes used by the library ========================================================== @@ -40,6 +53,41 @@ #include <stdio.h> #include <stdarg.h> #include <ctype.h> +#include <assert.h> + +/* + Use fseeko() and ftello() if they are available since they use + 'off_t' rather than 'long'. It is wrong to use fseeko() and + ftello() only on systems with special LFS support since some systems + (e.g. FreeBSD) support a 64-bit off_t by default. +*/ +#if defined(OPJ_HAVE_FSEEKO) && !defined(fseek) +# define fseek fseeko +# define ftell ftello +#endif + + +#if defined(WIN32) && !defined(Windows95) && !defined(__BORLANDC__) && \ + !(defined(_MSC_VER) && _MSC_VER < 1400) && \ + !(defined(__MINGW32__) && __MSVCRT_VERSION__ < 0x800) + /* + Windows '95 and Borland C do not support _lseeki64 + Visual Studio does not support _fseeki64 and _ftelli64 until the 2005 release. + Without these interfaces, files over 2GB in size are not supported for Windows. + */ +# define OPJ_FSEEK(stream,offset,whence) _fseeki64(stream,/* __int64 */ offset,whence) +# define OPJ_FSTAT(fildes,stat_buff) _fstati64(fildes,/* struct _stati64 */ stat_buff) +# define OPJ_FTELL(stream) /* __int64 */ _ftelli64(stream) +# define OPJ_STAT_STRUCT_T struct _stati64 +# define OPJ_STAT(path,stat_buff) _stati64(path,/* struct _stati64 */ stat_buff) +#else +# define OPJ_FSEEK(stream,offset,whence) fseek(stream,offset,whence) +# define OPJ_FSTAT(fildes,stat_buff) fstat(fildes,stat_buff) +# define OPJ_FTELL(stream) ftell(stream) +# define OPJ_STAT_STRUCT_T struct stat +# define OPJ_STAT(path,stat_buff) stat(path,stat_buff) +#endif + /* ========================================================== @@ -59,22 +107,6 @@ #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 ... -*/ -#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>) */ -#endif /* INLINE */ /* Are restricted pointers available? (C99) */ #if (__STDC_VERSION__ != 199901L) @@ -86,54 +118,63 @@ Most compilers implement their own version of this keyword ... #endif #endif -/* MSVC and Borland C do not have lrintf */ -#if defined(_MSC_VER) || defined(__BORLANDC__) +/* MSVC before 2013 and Borland C do not have lrintf */ +#if defined(_MSC_VER) && (_MSC_VER < 1800) || defined(__BORLANDC__) static INLINE long lrintf(float f){ -#ifdef _M_IX86 - long int i; +#ifdef _M_X64 + return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f)); +#else + int i; _asm{ fld f fistp i }; + return i; -#else - return (long)((f>0.0f) ? (f + 0.5f):(f -0.5f)); -#endif /* _M_IX86 */ +#endif } #endif -#include "j2k_lib.h" +#include "opj_inttypes.h" +#include "opj_clock.h" #include "opj_malloc.h" +#include "function_list.h" #include "event.h" #include "bio.h" #include "cio.h" #include "image.h" +#include "invert.h" #include "j2k.h" #include "jp2.h" -#include "jpt.h" #include "mqc.h" #include "raw.h" #include "bio.h" -#include "tgt.h" + #include "pi.h" +#include "tgt.h" #include "tcd.h" #include "t1.h" #include "dwt.h" #include "t2.h" #include "mct.h" -#include "int.h" -#include "fix.h" +#include "opj_intmath.h" +#ifdef USE_JPIP #include "cidx_manager.h" #include "indexbox_manager.h" +#endif /* JPWL>> */ #ifdef USE_JPWL -#include "./jpwl/jpwl.h" +#include "openjpwl/jpwl.h" #endif /* USE_JPWL */ /* <<JPWL */ +/* V2 */ +#include "opj_codec.h" + + #endif /* OPJ_INCLUDES_H */ |