[iortcw] 186/497: All: Update libogg to 1.3.2
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 5be611ac2c48eeabe017c37b0fe6598ad34b122d
Author: m4n4t4...@gmail.com
Date: Tue Aug 26 09:55:20 2014 +
All: Update libogg to 1.3.2
---
MP/Makefile| 2 +-
.../include/ogg/config_types.h | 0
.../include/ogg/ogg.h | 0
.../code/libogg-1.3.2}/include/ogg/os_types.h | 4 +-
.../{libogg-1.3.1 => libogg-1.3.2}/src/bitwise.c | 265 +++--
.../{libogg-1.3.1 => libogg-1.3.2}/src/framing.c | 0
SP/Makefile| 2 +-
.../include/ogg/config_types.h | 0
.../include/ogg/ogg.h | 0
.../code/libogg-1.3.2}/include/ogg/os_types.h | 4 +-
.../{libogg-1.3.1 => libogg-1.3.2}/src/bitwise.c | 265 +++--
.../{libogg-1.3.1 => libogg-1.3.2}/src/framing.c | 0
12 files changed, 502 insertions(+), 40 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index 6843bdd..45cff21 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -283,7 +283,7 @@ BLIBDIR=$(MOUNT_DIR)/botlib
NDIR=$(MOUNT_DIR)/null
UIDIR=$(MOUNT_DIR)/ui
JPDIR=$(MOUNT_DIR)/jpeg-8c
-OGGDIR=$(MOUNT_DIR)/libogg-1.3.1
+OGGDIR=$(MOUNT_DIR)/libogg-1.3.2
VORBISDIR=$(MOUNT_DIR)/libvorbis-1.3.4
OPUSDIR=$(MOUNT_DIR)/opus-1.1
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.6
diff --git a/MP/code/libogg-1.3.1/include/ogg/config_types.h
b/MP/code/libogg-1.3.2/include/ogg/config_types.h
similarity index 100%
rename from MP/code/libogg-1.3.1/include/ogg/config_types.h
rename to MP/code/libogg-1.3.2/include/ogg/config_types.h
diff --git a/MP/code/libogg-1.3.1/include/ogg/ogg.h
b/MP/code/libogg-1.3.2/include/ogg/ogg.h
similarity index 100%
rename from MP/code/libogg-1.3.1/include/ogg/ogg.h
rename to MP/code/libogg-1.3.2/include/ogg/ogg.h
diff --git a/SP/code/libogg-1.3.1/include/ogg/os_types.h
b/MP/code/libogg-1.3.2/include/ogg/os_types.h
similarity index 97%
rename from SP/code/libogg-1.3.1/include/ogg/os_types.h
rename to MP/code/libogg-1.3.2/include/ogg/os_types.h
index d6691b7..8bf8210 100644
--- a/SP/code/libogg-1.3.1/include/ogg/os_types.h
+++ b/MP/code/libogg-1.3.2/include/ogg/os_types.h
@@ -11,7 +11,7 @@
function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h 17712 2010-12-03 17:10:02Z xiphmont $
+ last mod: $Id: os_types.h 19098 2014-02-26 19:06:45Z giles $
/
#ifndef _OS_TYPES_H
@@ -24,7 +24,7 @@
#define _ogg_realloc realloc
#define _ogg_freefree
-#if defined(_WIN32)
+#if defined(_WIN32)
# if defined(__CYGWIN__)
#include
diff --git a/MP/code/libogg-1.3.1/src/bitwise.c
b/MP/code/libogg-1.3.2/src/bitwise.c
similarity index 75%
rename from MP/code/libogg-1.3.1/src/bitwise.c
rename to MP/code/libogg-1.3.2/src/bitwise.c
index 68aca67..145901d 100644
--- a/MP/code/libogg-1.3.1/src/bitwise.c
+++ b/MP/code/libogg-1.3.2/src/bitwise.c
@@ -5,13 +5,13 @@
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2014 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
function: packing variable sized words into an octet stream
- last mod: $Id: bitwise.c 18051 2011-08-04 17:56:39Z giles $
+ last mod: $Id: bitwise.c 19149 2014-05-27 16:26:23Z giles $
/
@@ -187,8 +187,22 @@ static void oggpack_writecopy_helper(oggpack_buffer *b,
unsigned char *ptr=(unsigned char *)source;
long bytes=bits/8;
+ long pbytes=(b->endbit+bits)/8;
bits-=bytes*8;
+ /* expand storage up-front */
+ if(b->endbyte+pbytes>=b->storage){
+void *ret;
+if(!b->ptr) goto err;
+if(b->storage>b->endbyte+pbytes+BUFFER_INCREMENT) goto err;
+b->storage=b->endbyte+pbytes+BUFFER_INCREMENT;
+ret=_ogg_realloc(b->buffer,b->storage);
+if(!ret) goto err;
+b->buffer=ret;
+b->ptr=b->buffer+b->endbyte;
+ }
+
+ /* copy whole octets */
if(b->endbit){
int i;
/* unaligned copy. Do it the hard way. */
@@ -196,23 +210,13 @@ static void oggpack_writecopy_helper(oggpack_buffer *b,
w(b,(unsigned long)(ptr[i]),8);
}else{
/* aligned block copy */
-if(b->endbyte+bytes+1>=b->storage){
- void *ret;
- if(!b->ptr) goto err;
- if(b->endbyte+bytes+BUFFER_INCR
[iortcw] 186/497: All: Update libogg to 1.3.2
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to annotated tag 1.42d
in repository iortcw.
commit 5be611ac2c48eeabe017c37b0fe6598ad34b122d
Author: m4n4t4...@gmail.com
Date: Tue Aug 26 09:55:20 2014 +
All: Update libogg to 1.3.2
---
MP/Makefile| 2 +-
.../include/ogg/config_types.h | 0
.../include/ogg/ogg.h | 0
.../code/libogg-1.3.2}/include/ogg/os_types.h | 4 +-
.../{libogg-1.3.1 => libogg-1.3.2}/src/bitwise.c | 265 +++--
.../{libogg-1.3.1 => libogg-1.3.2}/src/framing.c | 0
SP/Makefile| 2 +-
.../include/ogg/config_types.h | 0
.../include/ogg/ogg.h | 0
.../code/libogg-1.3.2}/include/ogg/os_types.h | 4 +-
.../{libogg-1.3.1 => libogg-1.3.2}/src/bitwise.c | 265 +++--
.../{libogg-1.3.1 => libogg-1.3.2}/src/framing.c | 0
12 files changed, 502 insertions(+), 40 deletions(-)
diff --git a/MP/Makefile b/MP/Makefile
index 6843bdd..45cff21 100644
--- a/MP/Makefile
+++ b/MP/Makefile
@@ -283,7 +283,7 @@ BLIBDIR=$(MOUNT_DIR)/botlib
NDIR=$(MOUNT_DIR)/null
UIDIR=$(MOUNT_DIR)/ui
JPDIR=$(MOUNT_DIR)/jpeg-8c
-OGGDIR=$(MOUNT_DIR)/libogg-1.3.1
+OGGDIR=$(MOUNT_DIR)/libogg-1.3.2
VORBISDIR=$(MOUNT_DIR)/libvorbis-1.3.4
OPUSDIR=$(MOUNT_DIR)/opus-1.1
OPUSFILEDIR=$(MOUNT_DIR)/opusfile-0.6
diff --git a/MP/code/libogg-1.3.1/include/ogg/config_types.h
b/MP/code/libogg-1.3.2/include/ogg/config_types.h
similarity index 100%
rename from MP/code/libogg-1.3.1/include/ogg/config_types.h
rename to MP/code/libogg-1.3.2/include/ogg/config_types.h
diff --git a/MP/code/libogg-1.3.1/include/ogg/ogg.h
b/MP/code/libogg-1.3.2/include/ogg/ogg.h
similarity index 100%
rename from MP/code/libogg-1.3.1/include/ogg/ogg.h
rename to MP/code/libogg-1.3.2/include/ogg/ogg.h
diff --git a/SP/code/libogg-1.3.1/include/ogg/os_types.h
b/MP/code/libogg-1.3.2/include/ogg/os_types.h
similarity index 97%
rename from SP/code/libogg-1.3.1/include/ogg/os_types.h
rename to MP/code/libogg-1.3.2/include/ogg/os_types.h
index d6691b7..8bf8210 100644
--- a/SP/code/libogg-1.3.1/include/ogg/os_types.h
+++ b/MP/code/libogg-1.3.2/include/ogg/os_types.h
@@ -11,7 +11,7 @@
function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os_types.h 17712 2010-12-03 17:10:02Z xiphmont $
+ last mod: $Id: os_types.h 19098 2014-02-26 19:06:45Z giles $
/
#ifndef _OS_TYPES_H
@@ -24,7 +24,7 @@
#define _ogg_realloc realloc
#define _ogg_freefree
-#if defined(_WIN32)
+#if defined(_WIN32)
# if defined(__CYGWIN__)
#include
diff --git a/MP/code/libogg-1.3.1/src/bitwise.c
b/MP/code/libogg-1.3.2/src/bitwise.c
similarity index 75%
rename from MP/code/libogg-1.3.1/src/bitwise.c
rename to MP/code/libogg-1.3.2/src/bitwise.c
index 68aca67..145901d 100644
--- a/MP/code/libogg-1.3.1/src/bitwise.c
+++ b/MP/code/libogg-1.3.2/src/bitwise.c
@@ -5,13 +5,13 @@
* GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
* IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
* *
- * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2010 *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2014 *
* by the Xiph.Org Foundation http://www.xiph.org/ *
* *
function: packing variable sized words into an octet stream
- last mod: $Id: bitwise.c 18051 2011-08-04 17:56:39Z giles $
+ last mod: $Id: bitwise.c 19149 2014-05-27 16:26:23Z giles $
/
@@ -187,8 +187,22 @@ static void oggpack_writecopy_helper(oggpack_buffer *b,
unsigned char *ptr=(unsigned char *)source;
long bytes=bits/8;
+ long pbytes=(b->endbit+bits)/8;
bits-=bytes*8;
+ /* expand storage up-front */
+ if(b->endbyte+pbytes>=b->storage){
+void *ret;
+if(!b->ptr) goto err;
+if(b->storage>b->endbyte+pbytes+BUFFER_INCREMENT) goto err;
+b->storage=b->endbyte+pbytes+BUFFER_INCREMENT;
+ret=_ogg_realloc(b->buffer,b->storage);
+if(!ret) goto err;
+b->buffer=ret;
+b->ptr=b->buffer+b->endbyte;
+ }
+
+ /* copy whole octets */
if(b->endbit){
int i;
/* unaligned copy. Do it the hard way. */
@@ -196,23 +210,13 @@ static void oggpack_writecopy_helper(oggpack_buffer *b,
w(b,(unsigned long)(ptr[i]),8);
}else{
/* aligned block copy */
-if(b->endbyte+bytes+1>=b->storage){
- void *ret;
- if(!b->ptr) goto err;
- if(b->endbyte+bytes+BUFFER_INCR
