[OMPT-svn-commit] OpenMPT r20683 - in trunk/OpenMPT/include/vorbis: . lib

[<sv...@op...>]

Author: manx
Date: Sun Apr 28 20:59:21 2024
New Revision: 20683
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20683

Log:
[Var] vorbis: Silence GCC false-positive warning.

Modified:
   trunk/OpenMPT/include/vorbis/OpenMPT.txt
   trunk/OpenMPT/include/vorbis/lib/psy.c

Modified: trunk/OpenMPT/include/vorbis/OpenMPT.txt
==============================================================================
--- trunk/OpenMPT/include/vorbis/OpenMPT.txt	Sun Apr 28 20:32:28 2024	(r20682)
+++ trunk/OpenMPT/include/vorbis/OpenMPT.txt	Sun Apr 28 20:59:21 2024	(r20683)
@@ -4,7 +4,7 @@
   symbian, test, vq) have been removed.
 - https://github.com/xiph/vorbis/pull/100 and
   https://github.com/xiph/vorbis/pull/101 have been applied.
-- A GCC warning in lib/lpc.c has been silenced.
+- GCC warnings in lib/lpc.c and lib/psy.c have been silenced.
 - All modifications have been marked with /* OpenMPT */.
 - For building, premake is used to generate Visual Studio project files.
   See ../build/premake/ for details.

Modified: trunk/OpenMPT/include/vorbis/lib/psy.c
==============================================================================
--- trunk/OpenMPT/include/vorbis/lib/psy.c	Sun Apr 28 20:32:28 2024	(r20682)
+++ trunk/OpenMPT/include/vorbis/lib/psy.c	Sun Apr 28 20:59:21 2024	(r20683)
@@ -711,8 +711,15 @@
 
   for(i=0;i<n;i++)work[i]=logmdct[i]-logmask[i];
 
+#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER)  /* OpenMPT */
+#pragma GCC diagnostic push  /* OpenMPT */
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"  /* OpenMPT */
+#endif  /* OpenMPT */
   bark_noise_hybridmp(n,p->bark,work,logmask,0.,
                       p->vi->noisewindowfixed);
+#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER)  /* OpenMPT */
+#pragma GCC diagnostic pop  /* OpenMPT */
+#endif  /* OpenMPT */
 
   for(i=0;i<n;i++)work[i]=logmdct[i]-work[i];