diff options
| author | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-09-21 12:10:20 +0200 |
|---|---|---|
| committer | Eirik Aavitsland <eirik.aavitsland@qt.io> | 2018-09-28 14:11:44 +0000 |
| commit | e63dba14fb9f46bad1518dcf121c82b100940e28 (patch) | |
| tree | c7a3468073a9c623d8f6659166962dd743107dc5 /src/3rdparty/libjpeg/src/jinclude.h | |
| parent | ecfa33e751115919ddb47a6f641a2b1842c96788 (diff) | |
Update bundled libjpeg-turbo to version 2.0.0
New, manually created configuration files (jconfig.h / jconfigint.h)
for building in Qt are now placed outside the src directory.
[ChangeLog][Third-Party Code] libjpeg-turbo was updated to version 2.0.0
Done-with: André Klitzing <aklitzing@gmail.com>
Change-Id: I77e34419ebe2f70038b9b80cdf13876055c2a35f
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'src/3rdparty/libjpeg/src/jinclude.h')
| -rw-r--r-- | src/3rdparty/libjpeg/src/jinclude.h | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/src/3rdparty/libjpeg/src/jinclude.h b/src/3rdparty/libjpeg/src/jinclude.h index d461a1aa16..c1bcf7d9da 100644 --- a/src/3rdparty/libjpeg/src/jinclude.h +++ b/src/3rdparty/libjpeg/src/jinclude.h @@ -61,14 +61,18 @@ #ifdef NEED_BSD_STRINGS #include <strings.h> -#define MEMZERO(target,size) bzero((void *)(target), (size_t)(size)) -#define MEMCOPY(dest,src,size) bcopy((const void *)(src), (void *)(dest), (size_t)(size)) +#define MEMZERO(target, size) \ + bzero((void *)(target), (size_t)(size)) +#define MEMCOPY(dest, src, size) \ + bcopy((const void *)(src), (void *)(dest), (size_t)(size)) #else /* not BSD, assume ANSI/SysV string lib */ #include <string.h> -#define MEMZERO(target,size) memset((void *)(target), 0, (size_t)(size)) -#define MEMCOPY(dest,src,size) memcpy((void *)(dest), (const void *)(src), (size_t)(size)) +#define MEMZERO(target, size) \ + memset((void *)(target), 0, (size_t)(size)) +#define MEMCOPY(dest, src, size) \ + memcpy((void *)(dest), (const void *)(src), (size_t)(size)) #endif @@ -78,7 +82,7 @@ * CAUTION: argument order is different from underlying functions! */ -#define JFREAD(file,buf,sizeofbuf) \ - ((size_t) fread((void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) -#define JFWRITE(file,buf,sizeofbuf) \ - ((size_t) fwrite((const void *) (buf), (size_t) 1, (size_t) (sizeofbuf), (file))) +#define JFREAD(file, buf, sizeofbuf) \ + ((size_t)fread((void *)(buf), (size_t)1, (size_t)(sizeofbuf), (file))) +#define JFWRITE(file, buf, sizeofbuf) \ + ((size_t)fwrite((const void *)(buf), (size_t)1, (size_t)(sizeofbuf), (file))) |