ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix various warnings in filters and headers (#1241) 

Bug: #1003
This commit is contained in:
Fabrice de Gans 2024-03-10 17:33:11 -07:00 committed by GitHub
parent 69769c1bef
commit 13a16eb79c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/ffmpeg.h
View File

@ -3,10 +3,6 @@
// simplified interface for recording audio and/or video from emulator // simplified interface for recording audio and/or video from emulator
// required for ffmpeg
#define __STDC_LIMIT_MACROS
#define __STDC_CONSTANT_MACROS
extern "C" { extern "C" {
/* From: http://redino.net/blog/2013/12/uint64_c-defined-including-libavformatavformat-h-vs-2008/ */ /* From: http://redino.net/blog/2013/12/uint64_c-defined-including-libavformatavformat-h-vs-2008/ */

24
src/filters/hq/c/hq_shared.h
View File

@ -81,7 +81,7 @@ inline bool Diff(unsigned int YUV1, unsigned int YUV2)
// hq3x, hq4x // hq3x, hq4x
#define Interp2_32(pc, c1, c2, c3) \ #define Interp2_32(pc, c1, c2, c3) \
(*((unsigned int *)(pc)) = \ (*((unsigned int *)(pc)) = \
(((c1) == (c2)) == (c3)) \ (((c1) == (c2)) && ((c2) == (c3))) \
? c1 \ ? c1 \
: ((((((c1)&0x00FF00) * 2) + ((c2)&0x00FF00) + ((c3)&0x00FF00)) & 0x0003FC00) + \ : ((((((c1)&0x00FF00) * 2) + ((c2)&0x00FF00) + ((c3)&0x00FF00)) & 0x0003FC00) + \
(((((c1)&0xFF00FF) * 2) + ((c2)&0xFF00FF) + ((c3)&0xFF00FF)) & 0x03FC03FC)) >> \ (((((c1)&0xFF00FF) * 2) + ((c2)&0xFF00FF) + ((c3)&0xFF00FF)) & 0x03FC03FC)) >> \
@ -99,7 +99,7 @@ inline bool Diff(unsigned int YUV1, unsigned int YUV2)
// hq3x, not used by hq4x // hq3x, not used by hq4x
#define Interp4_32(pc, c1, c2, c3) \ #define Interp4_32(pc, c1, c2, c3) \
(*((unsigned int *)(pc)) = \ (*((unsigned int *)(pc)) = \
(((c1) == (c2)) == (c3)) \ (((c1) == (c2)) && ((c2) == (c3))) \
? c1 \ ? c1 \
: ((((((c1)&0x00FF00) * 2) + ((((c2)&0x00FF00) + ((c3)&0x00FF00)) * 7)) & \ : ((((((c1)&0x00FF00) * 2) + ((((c2)&0x00FF00) + ((c3)&0x00FF00)) * 7)) & \
0x000FF000) + \ 0x000FF000) + \
@ -119,7 +119,7 @@ inline bool Diff(unsigned int YUV1, unsigned int YUV2)
// hq4x // hq4x
#define Interp6_32(pc, c1, c2, c3) \ #define Interp6_32(pc, c1, c2, c3) \
(*((unsigned int *)(pc)) = \ (*((unsigned int *)(pc)) = \
(((c1) == (c2)) == (c3)) \ (((c1) == (c2)) && ((c2) == (c3))) \
? c1 \ ? c1 \
: ((((((c1)&0x00FF00) * 5) + (((c2)&0x00FF00) * 2) + ((c3)&0x00FF00)) & \ : ((((((c1)&0x00FF00) * 5) + (((c2)&0x00FF00) * 2) + ((c3)&0x00FF00)) & \
0x0007F800) + \ 0x0007F800) + \
@ -131,7 +131,7 @@ inline bool Diff(unsigned int YUV1, unsigned int YUV2)
// hq4x // hq4x
#define Interp7_32(pc, c1, c2, c3) \ #define Interp7_32(pc, c1, c2, c3) \
(*((unsigned int *)(pc)) = \ (*((unsigned int *)(pc)) = \
(((c1) == (c2)) == (c3)) \ (((c1) == (c2)) && ((c2) == (c3))) \
? c1 \ ? c1 \
: ((((((c1)&0x00FF00) * 6) + ((c2)&0x00FF00) + ((c3)&0x00FF00)) & 0x0007F800) + \ : ((((((c1)&0x00FF00) * 6) + ((c2)&0x00FF00) + ((c3)&0x00FF00)) & 0x0007F800) + \
(((((c1)&0xFF00FF) * 6) + ((c2)&0xFF00FF) + ((c3)&0xFF00FF)) & 0x07F807F8)) >> \ (((((c1)&0xFF00FF) * 6) + ((c2)&0xFF00FF) + ((c3)&0xFF00FF)) & 0x07F807F8)) >> \
@ -155,7 +155,7 @@ inline unsigned int RGBtoYUV_32(unsigned int c)
unsigned char r, g, b; unsigned char r, g, b;
b = c & 0x0000FF; b = c & 0x0000FF;
g = (c & 0x00FF00) >> 8; g = (c & 0x00FF00) >> 8;
r = c >> 16; r = (unsigned char)(c >> 16);
return ((r + g + b) << 14) + ((r - b + 512) << 4) + ((2 * g - r - b) >> 3) + 128; return ((r + g + b) << 14) + ((r - b + 512) << 4) + ((2 * g - r - b) >> 3) + 128;
// unoptimized: // unoptimized:
@ -185,7 +185,7 @@ inline unsigned int RGBtoYUV_32(unsigned int c)
// hq3x, hq4x // hq3x, hq4x
#define Interp2_16(pc, c1, c2, c3) \ #define Interp2_16(pc, c1, c2, c3) \
(*((unsigned short *)(pc)) = \ (*((unsigned short *)(pc)) = \
(((c1) == (c2)) == (c3)) \ (((c1) == (c2)) && ((c2) == (c3))) \
? c1 \ ? c1 \
: ((((((c1)&GMASK) * 2) + ((c2)&GMASK) + ((c3)&GMASK)) & GSHIFT2MASK) + \ : ((((((c1)&GMASK) * 2) + ((c2)&GMASK) + ((c3)&GMASK)) & GSHIFT2MASK) + \
(((((c1)&RBMASK) * 2) + ((c2)&RBMASK) + ((c3)&RBMASK)) & RBSHIFT2MASK)) >> \ (((((c1)&RBMASK) * 2) + ((c2)&RBMASK) + ((c3)&RBMASK)) & RBSHIFT2MASK)) >> \
@ -203,7 +203,7 @@ inline unsigned int RGBtoYUV_32(unsigned int c)
// hq3x, not used by hq4x // hq3x, not used by hq4x
#define Interp4_16(pc, c1, c2, c3) \ #define Interp4_16(pc, c1, c2, c3) \
(*((unsigned short *)(pc)) = \ (*((unsigned short *)(pc)) = \
(((c1) == (c2)) == (c3)) \ (((c1) == (c2)) && ((c2) == (c3))) \
? c1 \ ? c1 \
: ((((((c1)&GMASK) * 2) + ((((c2)&GMASK) + ((c3)&GMASK)) * 7)) & GSHIFT4MASK) + \ : ((((((c1)&GMASK) * 2) + ((((c2)&GMASK) + ((c3)&GMASK)) * 7)) & GSHIFT4MASK) + \
(((((c1)&RBMASK) * 2) + ((((c2)&RBMASK) + ((c3)&RBMASK)) * 7)) & \ (((((c1)&RBMASK) * 2) + ((((c2)&RBMASK) + ((c3)&RBMASK)) * 7)) & \
@ -222,7 +222,7 @@ inline unsigned int RGBtoYUV_32(unsigned int c)
// hq4x // hq4x
#define Interp6_16(pc, c1, c2, c3) \ #define Interp6_16(pc, c1, c2, c3) \
(*((unsigned short *)(pc)) = \ (*((unsigned short *)(pc)) = \
(((c1) == (c2)) == (c3)) \ (((c1) == (c2)) && ((c2) == (c3))) \
? c1 \ ? c1 \
: ((((((c1)&GMASK) * 5) + (((c2)&GMASK) * 2) + ((c3)&GMASK)) & GSHIFT3MASK) + \ : ((((((c1)&GMASK) * 5) + (((c2)&GMASK) * 2) + ((c3)&GMASK)) & GSHIFT3MASK) + \
(((((c1)&RBMASK) * 5) + (((c2)&RBMASK) * 2) + ((c3)&RBMASK)) & \ (((((c1)&RBMASK) * 5) + (((c2)&RBMASK) * 2) + ((c3)&RBMASK)) & \
@ -233,7 +233,7 @@ inline unsigned int RGBtoYUV_32(unsigned int c)
// hq4x // hq4x
#define Interp7_16(pc, c1, c2, c3) \ #define Interp7_16(pc, c1, c2, c3) \
(*((unsigned short *)(pc)) = \ (*((unsigned short *)(pc)) = \
(((c1) == (c2)) == (c3)) \ (((c1) == (c2)) && ((c2) == (c3))) \
? c1 \ ? c1 \
: ((((((c1)&GMASK) * 6) + ((c2)&GMASK) + ((c3)&GMASK)) & GSHIFT3MASK) + \ : ((((((c1)&GMASK) * 6) + ((c2)&GMASK) + ((c3)&GMASK)) & GSHIFT3MASK) + \
(((((c1)&RBMASK) * 6) + ((c2)&RBMASK) + ((c3)&RBMASK)) & RBSHIFT3MASK)) >> \ (((((c1)&RBMASK) * 6) + ((c2)&RBMASK) + ((c3)&RBMASK)) & RBSHIFT3MASK)) >> \
@ -260,9 +260,9 @@ inline unsigned int RGBtoYUV_16(unsigned short c)
g = (c & 0x03E0) >> 2; g = (c & 0x03E0) >> 2;
b = (c & 0x001F) << 3; b = (c & 0x001F) << 3;
#else #else
r = (c & 0xF800) >> 8; r = (unsigned char)((c & 0xF800) >> 8);
g = (c & 0x07E0) >> 3; g = (unsigned char)((c & 0x07E0) >> 3);
b = (c & 0x001F) << 3; b = (unsigned char)((c & 0x001F) << 3);
#endif #endif
return ((r + g + b) << 14) + ((r - b + 512) << 4) + ((2 * g - r - b) >> 3) + 128; return ((r + g + b) << 14) + ((r - b + 512) << 4) + ((2 * g - r - b) >> 3) + 128;

4
src/sdl/filters.cpp
View File

@ -16,10 +16,6 @@
// along with this program; if not, write to the Free Software Foundation, // along with this program; if not, write to the Free Software Foundation,
// Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. // Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#if (defined _MSC_VER)
#define C_CORE
#endif
#include "filters.h" #include "filters.h"
#include "../filters/interframe.hpp" #include "../filters/interframe.hpp"

2
src/wx/config/user-input.cpp
View File

@ -254,7 +254,7 @@ UserInput StringToUserInput(const wxString& string) {
// This is weird, but keycode events are sent as "uppercase", but the // This is weird, but keycode events are sent as "uppercase", but the
// accelerator parsing always considers them "lowercase", so we force // accelerator parsing always considers them "lowercase", so we force
// an uppercase conversion here. // an uppercase conversion here.
int key = accel.GetKeyCode(); key = accel.GetKeyCode();
if (key < WXK_START && wxIslower(key)) { if (key < WXK_START && wxIslower(key)) {
key = wxToupper(key); key = wxToupper(key);
} }

3
src/wx/strutils.h
View File

@ -1,9 +1,6 @@
#ifndef STRUTILS_H #ifndef STRUTILS_H
#define STRUTILS_H #define STRUTILS_H
#define __STDC_LIMIT_MACROS
#define __STDC_CONSTANT_MACROS
#include <wx/string.h> #include <wx/string.h>
#include <wx/arrstr.h> #include <wx/arrstr.h>