[OMPT-svn-commit] OpenMPT r22985 - in trunk/OpenMPT/include/ogg: . src

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

Author: manx
Date: Fri Mar  7 18:22:40 2025
New Revision: 22985
URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=22985

Log:
[Fix] ogg: Apply <https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0>.

Modified:
   trunk/OpenMPT/include/ogg/OpenMPT.txt
   trunk/OpenMPT/include/ogg/src/bitwise.c
   trunk/OpenMPT/include/ogg/src/framing.c

Modified: trunk/OpenMPT/include/ogg/OpenMPT.txt
==============================================================================
--- trunk/OpenMPT/include/ogg/OpenMPT.txt	Fri Mar  7 18:15:08 2025	(r22984)
+++ trunk/OpenMPT/include/ogg/OpenMPT.txt	Fri Mar  7 18:22:40 2025	(r22985)
@@ -1,8 +1,10 @@
 libogg library version 1.3.5 (2021-06-04).
 The following changes have been made:
-- Obviously, unnecessary folders and files (documentation, makefiles, etc.) have
-  been removed.
-- ports/makefile/ogg/config_types.h has been added for plain Makefile builds.
-- win32/ogg.def has been modified to not override the linker library name.
-- For building, premake is used to generate Visual Studio project files.
-  See ../build/premake/ for details.
+ *  Obviously, unnecessary folders and files (documentation, makefiles, etc.)
+    have been removed.
+ *  The following commits have been applied:
+     * https://gitlab.xiph.org/xiph/ogg/-/commit/7cf42ea17aef7bc1b7b21af70724840a96c2e7d0
+ *  ports/makefile/ogg/config_types.h has been added for plain Makefile builds.
+ *  win32/ogg.def has been modified to not override the linker library name.
+ *  For building, premake is used to generate Visual Studio project files.
+    See ../build/premake/ for details.

Modified: trunk/OpenMPT/include/ogg/src/bitwise.c
==============================================================================
--- trunk/OpenMPT/include/ogg/src/bitwise.c	Fri Mar  7 18:15:08 2025	(r22984)
+++ trunk/OpenMPT/include/ogg/src/bitwise.c	Fri Mar  7 18:22:40 2025	(r22985)
@@ -284,13 +284,13 @@
 
   ret=b->ptr[0]>>b->endbit;
   if(bits>8){
-    ret|=b->ptr[1]<<(8-b->endbit);
+    ret|=(unsigned long)b->ptr[1]<<(8-b->endbit);
     if(bits>16){
-      ret|=b->ptr[2]<<(16-b->endbit);
+      ret|=(unsigned long)b->ptr[2]<<(16-b->endbit);
       if(bits>24){
-        ret|=b->ptr[3]<<(24-b->endbit);
+        ret|=(unsigned long)b->ptr[3]<<(24-b->endbit);
         if(bits>32 && b->endbit)
-          ret|=b->ptr[4]<<(32-b->endbit);
+          ret|=(unsigned long)b->ptr[4]<<(32-b->endbit);
       }
     }
   }
@@ -313,13 +313,13 @@
     else if(!bits)return(0L);
   }
 
-  ret=b->ptr[0]<<(24+b->endbit);
+  ret=(unsigned long)b->ptr[0]<<(24+b->endbit);
   if(bits>8){
-    ret|=b->ptr[1]<<(16+b->endbit);
+    ret|=(unsigned long)b->ptr[1]<<(16+b->endbit);
     if(bits>16){
-      ret|=b->ptr[2]<<(8+b->endbit);
+      ret|=(unsigned long)b->ptr[2]<<(8+b->endbit);
       if(bits>24){
-        ret|=b->ptr[3]<<(b->endbit);
+        ret|=(unsigned long)b->ptr[3]<<(b->endbit);
         if(bits>32 && b->endbit)
           ret|=b->ptr[4]>>(8-b->endbit);
       }
@@ -389,13 +389,13 @@
 
   ret=b->ptr[0]>>b->endbit;
   if(bits>8){
-    ret|=b->ptr[1]<<(8-b->endbit);
+    ret|=(unsigned long)b->ptr[1]<<(8-b->endbit);
     if(bits>16){
-      ret|=b->ptr[2]<<(16-b->endbit);
+      ret|=(unsigned long)b->ptr[2]<<(16-b->endbit);
       if(bits>24){
-        ret|=b->ptr[3]<<(24-b->endbit);
+        ret|=(unsigned long)b->ptr[3]<<(24-b->endbit);
         if(bits>32 && b->endbit){
-          ret|=b->ptr[4]<<(32-b->endbit);
+          ret|=(unsigned long)b->ptr[4]<<(32-b->endbit);
         }
       }
     }
@@ -430,13 +430,13 @@
     else if(!bits)return(0L);
   }
 
-  ret=b->ptr[0]<<(24+b->endbit);
+  ret=(unsigned long)b->ptr[0]<<(24+b->endbit);
   if(bits>8){
-    ret|=b->ptr[1]<<(16+b->endbit);
+    ret|=(unsigned long)b->ptr[1]<<(16+b->endbit);
     if(bits>16){
-      ret|=b->ptr[2]<<(8+b->endbit);
+      ret|=(unsigned long)b->ptr[2]<<(8+b->endbit);
       if(bits>24){
-        ret|=b->ptr[3]<<(b->endbit);
+        ret|=(unsigned long)b->ptr[3]<<(b->endbit);
         if(bits>32 && b->endbit)
           ret|=b->ptr[4]>>(8-b->endbit);
       }

Modified: trunk/OpenMPT/include/ogg/src/framing.c
==============================================================================
--- trunk/OpenMPT/include/ogg/src/framing.c	Fri Mar  7 18:15:08 2025	(r22984)
+++ trunk/OpenMPT/include/ogg/src/framing.c	Fri Mar  7 18:22:40 2025	(r22985)
@@ -349,12 +349,13 @@
 static int ogg_stream_flush_i(ogg_stream_state *os,ogg_page *og, int force, int nfill){
   int i;
   int vals=0;
-  int maxvals=(os->lacing_fill>255?255:os->lacing_fill);
+  int maxvals;
   int bytes=0;
   long acc=0;
   ogg_int64_t granule_pos=-1;
 
   if(ogg_stream_check(os)) return(0);
+  maxvals=(os->lacing_fill>255?255:os->lacing_fill);
   if(maxvals==0) return(0);
 
   /* construct a page */
@@ -639,12 +640,15 @@
 */
 
 long ogg_sync_pageseek(ogg_sync_state *oy,ogg_page *og){
-  unsigned char *page=oy->data+oy->returned;
+  unsigned char *page;
   unsigned char *next;
-  long bytes=oy->fill-oy->returned;
+  long bytes;
 
   if(ogg_sync_check(oy))return 0;
 
+  page=oy->data+oy->returned;
+  bytes=oy->fill-oy->returned;
+
   if(oy->headerbytes==0){
     int headerbytes,i;
     if(bytes<27)return(0); /* not enough for a header */
@@ -1086,11 +1090,11 @@
           (int)og->header[4],(int)og->header[5]);
 
   fprintf(stderr,"  granulepos: %d  serialno: %d  pageno: %ld\n",
-          (og->header[9]<<24)|(og->header[8]<<16)|
+          ((unsigned)og->header[9]<<24)|(og->header[8]<<16)|
           (og->header[7]<<8)|og->header[6],
-          (og->header[17]<<24)|(og->header[16]<<16)|
+          ((unsigned)og->header[17]<<24)|(og->header[16]<<16)|
           (og->header[15]<<8)|og->header[14],
-          ((long)(og->header[21])<<24)|(og->header[20]<<16)|
+          ((long)((unsigned)og->header[21])<<24)|(og->header[20]<<16)|
           (og->header[19]<<8)|og->header[18]);
 
   fprintf(stderr,"  checksum: %02x:%02x:%02x:%02x\n  segments: %d (",