mirror of
https://github.com/bkaradzic/bimg.git
synced 2026-10-24 01:31:00 +00:00
Fixed warnings. (#138)
This commit is contained in:
Branimir Karadžić
committed by
GitHub
GitHub
parent
a021904836
commit
0d3cfc25b5
62
3rdparty/dav1d/dav1d-amalgamated.c
vendored
62
3rdparty/dav1d/dav1d-amalgamated.c
vendored
@@ -4,60 +4,20 @@
|
||||
#if !defined(_WIN32)
|
||||
# ifndef _GNU_SOURCE
|
||||
# define _GNU_SOURCE // posix_memalign, PTHREAD_STACK_MIN (glibc), etc.
|
||||
# endif
|
||||
# endif //
|
||||
# ifndef _FILE_OFFSET_BITS
|
||||
# define _FILE_OFFSET_BITS 64 // 64-bit off_t on 32-bit POSIX (e.g. Android)
|
||||
# endif
|
||||
#endif
|
||||
# endif //
|
||||
#endif //
|
||||
|
||||
/* macOS <sys/param.h> defines a 1-arg ALIGN() that clashes with dav1d's 2-arg
|
||||
* ALIGN(); include it first (header-guarded) and drop its macro so dav1d's wins. */
|
||||
#if defined(__APPLE__)
|
||||
# include <sys/param.h>
|
||||
# undef ALIGN
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable: 4057) // warning C4057: indirection to slightly different base types
|
||||
# pragma warning(disable: 4090) // warning C4090: different 'const' qualifiers
|
||||
# pragma warning(disable: 4100) // warning C4100: unreferenced formal parameter
|
||||
# pragma warning(disable: 4127) // warning C4127: conditional expression is constant
|
||||
# pragma warning(disable: 4152) // warning C4152: function/data pointer conversion in expression
|
||||
# pragma warning(disable: 4189) // warning C4189: local variable is initialized but not referenced
|
||||
# pragma warning(disable: 4200) // warning C4200: zero-sized array in struct/union
|
||||
# pragma warning(disable: 4201) // warning C4201: nonstandard extension: nameless struct/union
|
||||
# pragma warning(disable: 4244) // warning C4244: conversion, possible loss of data
|
||||
# pragma warning(disable: 4245) // warning C4245: conversion, signed/unsigned mismatch
|
||||
# pragma warning(disable: 4324) // warning C4324: structure was padded due to alignment specifier
|
||||
# pragma warning(disable: 4389) // warning C4389: signed/unsigned mismatch
|
||||
# pragma warning(disable: 4456) // warning C4456: declaration hides previous local declaration
|
||||
# pragma warning(disable: 4457) // warning C4457: declaration hides function parameter
|
||||
# pragma warning(disable: 4701) // warning C4701: potentially uninitialized local variable used
|
||||
# pragma warning(disable: 4702) // warning C4702: unreachable code
|
||||
# pragma warning(disable: 4703) // warning C4703: potentially uninitialized local pointer variable used
|
||||
# pragma warning(disable: 5287) // warning C5287: operands are different enum types
|
||||
#elif defined(__clang__)
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wunused-parameter"
|
||||
# pragma clang diagnostic ignored "-Wunused-function"
|
||||
# pragma clang diagnostic ignored "-Wunused-variable"
|
||||
# pragma clang diagnostic ignored "-Wsign-compare"
|
||||
# pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
||||
# pragma clang diagnostic ignored "-Wimplicit-fallthrough"
|
||||
#elif defined(__GNUC__)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
# pragma GCC diagnostic ignored "-Wunused-function"
|
||||
# pragma GCC diagnostic ignored "-Wunused-variable"
|
||||
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
|
||||
# pragma GCC diagnostic ignored "-Wsign-compare"
|
||||
# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
|
||||
# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
# pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||
# pragma GCC diagnostic ignored "-Wtype-limits"
|
||||
#endif
|
||||
#endif //
|
||||
|
||||
#include "dav1d-pragma-ignore.h"
|
||||
#include "src/cdf.c"
|
||||
#include "src/cpu.c"
|
||||
#include "src/ctx.c"
|
||||
@@ -85,13 +45,5 @@
|
||||
#include "src/wedge.c"
|
||||
|
||||
#if defined(_WIN32)
|
||||
#include "src/win32/thread.c"
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#elif defined(__clang__)
|
||||
# pragma clang diagnostic pop
|
||||
#elif defined(__GNUC__)
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
# include "src/win32/thread.c"
|
||||
#endif //
|
||||
|
||||
57
3rdparty/dav1d/dav1d-bitdepth-16.c
vendored
57
3rdparty/dav1d/dav1d-bitdepth-16.c
vendored
@@ -4,62 +4,23 @@
|
||||
#if !defined(_WIN32)
|
||||
# ifndef _GNU_SOURCE
|
||||
# define _GNU_SOURCE // posix_memalign, PTHREAD_STACK_MIN (glibc), etc.
|
||||
# endif
|
||||
# endif //
|
||||
# ifndef _FILE_OFFSET_BITS
|
||||
# define _FILE_OFFSET_BITS 64 // 64-bit off_t on 32-bit POSIX (e.g. Android)
|
||||
# endif
|
||||
#endif
|
||||
# endif //
|
||||
#endif //
|
||||
|
||||
/* macOS <sys/param.h> defines a 1-arg ALIGN() that clashes with dav1d's 2-arg
|
||||
* ALIGN(); include it first (header-guarded) and drop its macro so dav1d's wins. */
|
||||
#if defined(__APPLE__)
|
||||
# include <sys/param.h>
|
||||
# undef ALIGN
|
||||
#endif
|
||||
#endif //
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable: 4057) // warning C4057: indirection to slightly different base types
|
||||
# pragma warning(disable: 4090) // warning C4090: different 'const' qualifiers
|
||||
# pragma warning(disable: 4100) // warning C4100: unreferenced formal parameter
|
||||
# pragma warning(disable: 4127) // warning C4127: conditional expression is constant
|
||||
# pragma warning(disable: 4152) // warning C4152: function/data pointer conversion in expression
|
||||
# pragma warning(disable: 4189) // warning C4189: local variable is initialized but not referenced
|
||||
# pragma warning(disable: 4200) // warning C4200: zero-sized array in struct/union
|
||||
# pragma warning(disable: 4201) // warning C4201: nonstandard extension: nameless struct/union
|
||||
# pragma warning(disable: 4244) // warning C4244: conversion, possible loss of data
|
||||
# pragma warning(disable: 4245) // warning C4245: conversion, signed/unsigned mismatch
|
||||
# pragma warning(disable: 4324) // warning C4324: structure was padded due to alignment specifier
|
||||
# pragma warning(disable: 4389) // warning C4389: signed/unsigned mismatch
|
||||
# pragma warning(disable: 4456) // warning C4456: declaration hides previous local declaration
|
||||
# pragma warning(disable: 4457) // warning C4457: declaration hides function parameter
|
||||
# pragma warning(disable: 4701) // warning C4701: potentially uninitialized local variable used
|
||||
# pragma warning(disable: 4702) // warning C4702: unreachable code
|
||||
# pragma warning(disable: 4703) // warning C4703: potentially uninitialized local pointer variable used
|
||||
# pragma warning(disable: 5287) // warning C5287: operands are different enum types
|
||||
#elif defined(__clang__)
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wunused-parameter"
|
||||
# pragma clang diagnostic ignored "-Wunused-function"
|
||||
# pragma clang diagnostic ignored "-Wunused-variable"
|
||||
# pragma clang diagnostic ignored "-Wsign-compare"
|
||||
# pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
||||
# pragma clang diagnostic ignored "-Wimplicit-fallthrough"
|
||||
#elif defined(__GNUC__)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
# pragma GCC diagnostic ignored "-Wunused-function"
|
||||
# pragma GCC diagnostic ignored "-Wunused-variable"
|
||||
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
|
||||
# pragma GCC diagnostic ignored "-Wsign-compare"
|
||||
# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
|
||||
# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
# pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||
# pragma GCC diagnostic ignored "-Wtype-limits"
|
||||
#endif
|
||||
|
||||
#define BITDEPTH 16
|
||||
|
||||
#include "dav1d-pragma-ignore.h"
|
||||
#include "src/cdef_apply_tmpl.c"
|
||||
#include "src/cdef_tmpl.c"
|
||||
#include "src/fg_apply_tmpl.c"
|
||||
@@ -73,11 +34,3 @@
|
||||
#include "src/lr_apply_tmpl.c"
|
||||
#include "src/mc_tmpl.c"
|
||||
#include "src/recon_tmpl.c"
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#elif defined(__clang__)
|
||||
# pragma clang diagnostic pop
|
||||
#elif defined(__GNUC__)
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
50
3rdparty/dav1d/dav1d-bitdepth-8.c
vendored
50
3rdparty/dav1d/dav1d-bitdepth-8.c
vendored
@@ -17,49 +17,9 @@
|
||||
# undef ALIGN
|
||||
#endif
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable: 4057) // warning C4057: indirection to slightly different base types
|
||||
# pragma warning(disable: 4090) // warning C4090: different 'const' qualifiers
|
||||
# pragma warning(disable: 4100) // warning C4100: unreferenced formal parameter
|
||||
# pragma warning(disable: 4127) // warning C4127: conditional expression is constant
|
||||
# pragma warning(disable: 4152) // warning C4152: function/data pointer conversion in expression
|
||||
# pragma warning(disable: 4189) // warning C4189: local variable is initialized but not referenced
|
||||
# pragma warning(disable: 4200) // warning C4200: zero-sized array in struct/union
|
||||
# pragma warning(disable: 4201) // warning C4201: nonstandard extension: nameless struct/union
|
||||
# pragma warning(disable: 4244) // warning C4244: conversion, possible loss of data
|
||||
# pragma warning(disable: 4245) // warning C4245: conversion, signed/unsigned mismatch
|
||||
# pragma warning(disable: 4324) // warning C4324: structure was padded due to alignment specifier
|
||||
# pragma warning(disable: 4389) // warning C4389: signed/unsigned mismatch
|
||||
# pragma warning(disable: 4456) // warning C4456: declaration hides previous local declaration
|
||||
# pragma warning(disable: 4457) // warning C4457: declaration hides function parameter
|
||||
# pragma warning(disable: 4701) // warning C4701: potentially uninitialized local variable used
|
||||
# pragma warning(disable: 4702) // warning C4702: unreachable code
|
||||
# pragma warning(disable: 4703) // warning C4703: potentially uninitialized local pointer variable used
|
||||
# pragma warning(disable: 5287) // warning C5287: operands are different enum types
|
||||
#elif defined(__clang__)
|
||||
# pragma clang diagnostic push
|
||||
# pragma clang diagnostic ignored "-Wunused-parameter"
|
||||
# pragma clang diagnostic ignored "-Wunused-function"
|
||||
# pragma clang diagnostic ignored "-Wunused-variable"
|
||||
# pragma clang diagnostic ignored "-Wsign-compare"
|
||||
# pragma clang diagnostic ignored "-Wmissing-field-initializers"
|
||||
# pragma clang diagnostic ignored "-Wimplicit-fallthrough"
|
||||
#elif defined(__GNUC__)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
# pragma GCC diagnostic ignored "-Wunused-function"
|
||||
# pragma GCC diagnostic ignored "-Wunused-variable"
|
||||
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
|
||||
# pragma GCC diagnostic ignored "-Wsign-compare"
|
||||
# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
|
||||
# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
# pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||
# pragma GCC diagnostic ignored "-Wtype-limits"
|
||||
#endif
|
||||
|
||||
#define BITDEPTH 8
|
||||
|
||||
#include "dav1d-pragma-ignore.h"
|
||||
#include "src/cdef_apply_tmpl.c"
|
||||
#include "src/cdef_tmpl.c"
|
||||
#include "src/fg_apply_tmpl.c"
|
||||
@@ -73,11 +33,3 @@
|
||||
#include "src/lr_apply_tmpl.c"
|
||||
#include "src/mc_tmpl.c"
|
||||
#include "src/recon_tmpl.c"
|
||||
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(pop)
|
||||
#elif defined(__clang__)
|
||||
# pragma clang diagnostic pop
|
||||
#elif defined(__GNUC__)
|
||||
# pragma GCC diagnostic pop
|
||||
#endif
|
||||
|
||||
36
3rdparty/dav1d/dav1d-pragma-ignore.h
vendored
Normal file
36
3rdparty/dav1d/dav1d-pragma-ignore.h
vendored
Normal file
@@ -0,0 +1,36 @@
|
||||
#if defined(_MSC_VER)
|
||||
# pragma warning(push)
|
||||
# pragma warning(disable: 4057) // warning C4057: indirection to slightly different base types
|
||||
# pragma warning(disable: 4090) // warning C4090: different 'const' qualifiers
|
||||
# pragma warning(disable: 4100) // warning C4100: unreferenced formal parameter
|
||||
# pragma warning(disable: 4127) // warning C4127: conditional expression is constant
|
||||
# pragma warning(disable: 4152) // warning C4152: function/data pointer conversion in expression
|
||||
# pragma warning(disable: 4189) // warning C4189: local variable is initialized but not referenced
|
||||
# pragma warning(disable: 4200) // warning C4200: zero-sized array in struct/union
|
||||
# pragma warning(disable: 4201) // warning C4201: nonstandard extension: nameless struct/union
|
||||
# pragma warning(disable: 4244) // warning C4244: conversion, possible loss of data
|
||||
# pragma warning(disable: 4245) // warning C4245: conversion, signed/unsigned mismatch
|
||||
# pragma warning(disable: 4324) // warning C4324: structure was padded due to alignment specifier
|
||||
# pragma warning(disable: 4389) // warning C4389: signed/unsigned mismatch
|
||||
# pragma warning(disable: 4456) // warning C4456: declaration hides previous local declaration
|
||||
# pragma warning(disable: 4457) // warning C4457: declaration hides function parameter
|
||||
# pragma warning(disable: 4701) // warning C4701: potentially uninitialized local variable used
|
||||
# pragma warning(disable: 4702) // warning C4702: unreachable code
|
||||
# pragma warning(disable: 4703) // warning C4703: potentially uninitialized local pointer variable used
|
||||
# pragma warning(disable: 5287) // warning C5287: operands are different enum types
|
||||
#elif defined(__GNUC__) || defined(__clang__)
|
||||
# pragma GCC diagnostic push
|
||||
# pragma GCC diagnostic ignored "-Wunused-parameter"
|
||||
# pragma GCC diagnostic ignored "-Wunused-function"
|
||||
# pragma GCC diagnostic ignored "-Wunused-variable"
|
||||
# pragma GCC diagnostic ignored "-Wunused-but-set-variable"
|
||||
# pragma GCC diagnostic ignored "-Wsign-compare"
|
||||
# pragma GCC diagnostic ignored "-Wmissing-field-initializers"
|
||||
# pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
|
||||
# pragma GCC diagnostic ignored "-Wtype-limits"
|
||||
# pragma GCC diagnostic ignored "-Wshadow"
|
||||
|
||||
# if !defined(__clang__)
|
||||
# pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
|
||||
# endif //
|
||||
#endif //
|
||||
@@ -6,6 +6,11 @@
|
||||
project "bimg"
|
||||
kind "StaticLib"
|
||||
|
||||
defines {
|
||||
"ASTCENC_F16C=0",
|
||||
"ASTCENC_NEON=0",
|
||||
}
|
||||
|
||||
includedirs {
|
||||
path.join(BIMG_DIR, "include"),
|
||||
path.join(BIMG_DIR, "3rdparty/astc-encoder/include"),
|
||||
|
||||
Reference in New Issue
Block a user