diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-20 11:36:58 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-20 11:36:58 +0300 |
commit | 75c9fe428fa8ed1dec093de6a7b2dc6ca042f6d6 (patch) | |
tree | 7c7c2ea8da401497a63fa7f66cdbe6756b039958 /extern/libopenjpeg/cio.h | |
parent | 81a477f4dc999918ba66413a286f5a0b1c0c4e79 (diff) |
Update bundled openjpeg from 1.5.0 to 1.5.2
Solves following issues:
- Quite reasonable amount of paranoid warnings were solved by an upstream
- Upstream seems to have all fixes needed for FreeBSD and OSX already
- Brings all fixes and such from upstream
Diffstat (limited to 'extern/libopenjpeg/cio.h')
-rw-r--r-- | extern/libopenjpeg/cio.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/extern/libopenjpeg/cio.h b/extern/libopenjpeg/cio.h index ce1a13ecb3a..e62743141ca 100644 --- a/extern/libopenjpeg/cio.h +++ b/extern/libopenjpeg/cio.h @@ -31,6 +31,13 @@ #ifndef __CIO_H #define __CIO_H + +#if defined(_MSC_VER) || defined(__BORLANDC__) +#define int64 __int64 +#else +#define int64 long long +#endif + /** @file cio.h @brief Implementation of a byte input-output process (CIO) @@ -63,7 +70,7 @@ Write some bytes @param n Number of bytes to write @return Returns the number of bytes written or 0 if an error occured */ -unsigned int cio_write(opj_cio_t *cio, unsigned long long int v, int n); +unsigned int cio_write(opj_cio_t *cio, unsigned int64 v, int n); /** Read some bytes @param cio CIO handle |