[OMPT-svn-commit] OpenMPT r20685 - in branches/OpenMPT-1.31: . include/vorbis include/vorbis/lib

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

Author: manx
Date: Mon Apr 29 10:23:20 2024
New Revision: 20685
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20685

Log:
Merged revision(s) 20682-20683 from trunk/OpenMPT:
[Var] vorbis: Silence GCC false-positive warning.
........
[Var] vorbis: Silence GCC false-positive warning.
........

Modified:
   branches/OpenMPT-1.31/   (props changed)
   branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt
   branches/OpenMPT-1.31/include/vorbis/lib/lpc.c
   branches/OpenMPT-1.31/include/vorbis/lib/psy.c

Modified: branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt
==============================================================================
--- branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt	Mon Apr 29 10:22:54 2024	(r20684)
+++ branches/OpenMPT-1.31/include/vorbis/OpenMPT.txt	Mon Apr 29 10:23:20 2024	(r20685)
@@ -4,6 +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.
+- 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: branches/OpenMPT-1.31/include/vorbis/lib/lpc.c
==============================================================================
--- branches/OpenMPT-1.31/include/vorbis/lib/lpc.c	Mon Apr 29 10:22:54 2024	(r20684)
+++ branches/OpenMPT-1.31/include/vorbis/lib/lpc.c	Mon Apr 29 10:23:20 2024	(r20685)
@@ -75,7 +75,14 @@
   /* Generate lpc coefficients from autocorr values */
 
   /* set our noise floor to about -100dB */
+#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER)  /* OpenMPT */
+#pragma GCC diagnostic push  /* OpenMPT */
+#pragma GCC diagnostic ignored "-Wmaybe-uninitialized"  /* OpenMPT */
+#endif  /* OpenMPT */
   error=aut[0] * (1. + 1e-10);
+#if defined(__GNUC__) && !defined(__clang__) && !defined(_MSC_VER)  /* OpenMPT */
+#pragma GCC diagnostic pop  /* OpenMPT */
+#endif  /* OpenMPT */
   epsilon=1e-9*aut[0]+1e-10;
 
   for(i=0;i<m;i++){

Modified: branches/OpenMPT-1.31/include/vorbis/lib/psy.c
==============================================================================
--- branches/OpenMPT-1.31/include/vorbis/lib/psy.c	Mon Apr 29 10:22:54 2024	(r20684)
+++ branches/OpenMPT-1.31/include/vorbis/lib/psy.c	Mon Apr 29 10:23:20 2024	(r20685)
@@ -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];