libchdr: Update to latest upstream

Update libchdr based from latest upstream sources. Fixes some issues as noted. - Latest upstream commit: https://github.com/rtissera/libchdr/tree/6117d59d00ef8620de4cff4d6ecae46368cae881 - Fix #301 - Specific commit that fixes above problem: rtissera/libchdr@e1acac6
libretro · Jun 5, 2020 · 9c659ff · 9c659ff
1 parent 7973b25
commit 9c659ff
Show file tree

Hide file tree

Showing 11 changed files with 2,118 additions and 2,100 deletions.
diff --git a/deps/libchdr/bitstream.c b/deps/libchdr/bitstream.c
@@ -1,6 +1,6 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
+/* license:BSD-3-Clause
+ * copyright-holders:Aaron Giles
+***************************************************************************
 
     bitstream.c
 
@@ -11,15 +11,17 @@
 #include "bitstream.h"
 #include <stdlib.h>
 
-//**************************************************************************
-//  INLINE FUNCTIONS
-//**************************************************************************
+/***************************************************************************
+ *  INLINE FUNCTIONS
+ ***************************************************************************
+ */
 
 int bitstream_overflow(struct bitstream* bitstream) { return ((bitstream->doffset - bitstream->bits / 8) > bitstream->dlength); }
 
-//-------------------------------------------------
-//  create_bitstream - constructor
-//-------------------------------------------------
+/*-------------------------------------------------
+ *  create_bitstream - constructor
+ *-------------------------------------------------
+ */
 
 struct bitstream* create_bitstream(const void *src, uint32_t srclength)
 {
@@ -33,17 +35,18 @@ struct bitstream* create_bitstream(const void *src, uint32_t srclength)
 }
 
 
-//-----------------------------------------------------
-//  bitstream_peek - fetch the requested number of bits
-//  but don't advance the input pointer
-//-----------------------------------------------------
+/*-----------------------------------------------------
+ *  bitstream_peek - fetch the requested number of bits
+ *  but don't advance the input pointer
+ *-----------------------------------------------------
+ */
 
 uint32_t bitstream_peek(struct bitstream* bitstream, int numbits)
 {
 	if (numbits == 0)
 		return 0;
 
-	// fetch data if we need more
+	/* fetch data if we need more */
 	if (numbits > bitstream->bits)
 	{
 		while (bitstream->bits <= 24)
@@ -55,15 +58,16 @@ uint32_t bitstream_peek(struct bitstream* bitstream, int numbits)
 		}
 	}
 
-	// return the data
+	/* return the data */
 	return bitstream->buffer >> (32 - numbits);
 }
 
 
-//-----------------------------------------------------
-//  bitstream_remove - advance the input pointer by the
-//  specified number of bits
-//-----------------------------------------------------
+/*-----------------------------------------------------
+ *  bitstream_remove - advance the input pointer by the
+ *  specified number of bits
+ *-----------------------------------------------------
+ */
 
 void bitstream_remove(struct bitstream* bitstream, int numbits)
 {
@@ -72,9 +76,10 @@ void bitstream_remove(struct bitstream* bitstream, int numbits)
 }
 
 
-//-----------------------------------------------------
-//  bitstream_read - fetch the requested number of bits
-//-----------------------------------------------------
+/*-----------------------------------------------------
+ *  bitstream_read - fetch the requested number of bits
+ *-----------------------------------------------------
+ */
 
 uint32_t bitstream_read(struct bitstream* bitstream, int numbits)
 {
@@ -84,9 +89,10 @@ uint32_t bitstream_read(struct bitstream* bitstream, int numbits)
 }
 
 
-//-------------------------------------------------
-//  read_offset - return the current read offset
-//-------------------------------------------------
+/*-------------------------------------------------
+ *  read_offset - return the current read offset
+ *-------------------------------------------------
+ */
 
 uint32_t bitstream_read_offset(struct bitstream* bitstream)
 {
@@ -101,9 +107,10 @@ uint32_t bitstream_read_offset(struct bitstream* bitstream)
 }
 
 
-//-------------------------------------------------
-//  flush - flush to the nearest byte
-//-------------------------------------------------
+/*-------------------------------------------------
+ *  flush - flush to the nearest byte
+ *-------------------------------------------------
+ */
 
 uint32_t bitstream_flush(struct bitstream* bitstream)
 {

diff --git a/deps/libchdr/bitstream.h b/deps/libchdr/bitstream.h
@@ -1,42 +1,43 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-/***************************************************************************
-
-    bitstream.h
-
-    Helper classes for reading/writing at the bit level.
-
-***************************************************************************/
-
-#pragma once
-
-#ifndef __BITSTREAM_H__
-#define __BITSTREAM_H__
-
-#include <stdint.h>
-
-//**************************************************************************
-//  TYPE DEFINITIONS
-//**************************************************************************
-
-// helper class for reading from a bit buffer
-struct bitstream
-{
-	uint32_t          buffer;       // current bit accumulator
-	int               bits;         // number of bits in the accumulator
-	const uint8_t *   read;         // read pointer
-	uint32_t          doffset;      // byte offset within the data
-	uint32_t          dlength;      // length of the data
-};
-
-struct bitstream* 	create_bitstream(const void *src, uint32_t srclength);
-int 				bitstream_overflow(struct bitstream* bitstream);
-uint32_t 			bitstream_read_offset(struct bitstream* bitstream);
-
-uint32_t 			bitstream_read(struct bitstream* bitstream, int numbits);
-uint32_t 			bitstream_peek(struct bitstream* bitstream, int numbits);
-void 				bitstream_remove(struct bitstream* bitstream, int numbits);
-uint32_t 			bitstream_flush(struct bitstream* bitstream);
-
-
-#endif
+/* license:BSD-3-Clause
+ * copyright-holders:Aaron Giles
+***************************************************************************
+
+    bitstream.h
+
+    Helper classes for reading/writing at the bit level.
+
+***************************************************************************/
+
+#pragma once
+
+#ifndef __BITSTREAM_H__
+#define __BITSTREAM_H__
+
+#include <stdint.h>
+
+/***************************************************************************
+ *  TYPE DEFINITIONS
+ ***************************************************************************
+ */
+
+/* helper class for reading from a bit buffer */
+struct bitstream
+{
+	uint32_t          buffer;       /* current bit accumulator */
+	int               bits;         /* number of bits in the accumulator */
+	const uint8_t *   read;         /* read pointer */
+	uint32_t          doffset;      /* byte offset within the data */
+	uint32_t          dlength;      /* length of the data */
+};
+
+struct bitstream* 	create_bitstream(const void *src, uint32_t srclength);
+int 				bitstream_overflow(struct bitstream* bitstream);
+uint32_t 			bitstream_read_offset(struct bitstream* bitstream);
+
+uint32_t 			bitstream_read(struct bitstream* bitstream, int numbits);
+uint32_t 			bitstream_peek(struct bitstream* bitstream, int numbits);
+void 				bitstream_remove(struct bitstream* bitstream, int numbits);
+uint32_t 			bitstream_flush(struct bitstream* bitstream);
+
+
+#endif