Skip to content

Commit 247bd2f

Browse files
JeromeMartinezJeromeMartinez
authored
Merge pull request #339 from g-maxime/semicolon
Update bundled ZenLib to 0.4.41
2 parents 0e5a7c3 + 093fea5 commit 247bd2f

26 files changed

+1731
-710
lines changed

‎Source/ZenLib/BitStream.h‎

Lines changed: 32 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,32 @@ namespace ZenLib
3030
class BitStream
3131
{
3232
public:
33-
BitStream () {Buffer=NULL;
34-
Buffer_Size=Buffer_Size_Init=Buffer_Size_BeforeLastCall=0;
35-
LastByte_Size=0;
36-
BufferUnderRun=true;
37-
BookMark=false;}
38-
BitStream (const int8u* Buffer_, size_t Size_) {Buffer=Buffer_;
39-
Buffer_Size=Buffer_Size_Init=Buffer_Size_BeforeLastCall=Size_*8; //Size is in bits
40-
LastByte_Size=0;
41-
BufferUnderRun=Buffer_Size?false:true;
42-
BookMark=false;}
33+
BitStream () { Buffer = NULL;
34+
Buffer_Size = 0;
35+
Buffer_Size_Init = 0;
36+
Buffer_Size_BeforeLastCall = 0;
37+
LastByte = 0;
38+
LastByte_Size = 0;
39+
BufferUnderRun = true;
40+
BookMark = false;
41+
Buffer_BookMark = 0;
42+
Buffer_Size_BookMark = 0;
43+
LastByte_BookMark = 0;
44+
LastByte_Size_BookMark = 0;
45+
BufferUnderRun_BookMark = false; }
46+
BitStream (const int8u* Buffer_, size_t Size_) { Buffer = Buffer_;
47+
Buffer_Size = Size_ * 8; //Size is in bits
48+
Buffer_Size_Init = Size_ * 8; //Size is in bits
49+
Buffer_Size_BeforeLastCall = Size_ * 8; //Size is in bits
50+
LastByte = 0;
51+
LastByte_Size = 0;
52+
BufferUnderRun = (Buffer_Size ? false : true);
53+
BookMark = false;
54+
Buffer_BookMark = 0;
55+
Buffer_Size_BookMark = 0;
56+
LastByte_BookMark = 0;
57+
LastByte_Size_BookMark = 0;
58+
BufferUnderRun_BookMark = false; }
4359
virtual ~BitStream () {};
4460

4561
virtual void Attach(const int8u* Buffer_, size_t Size_)
@@ -98,14 +114,17 @@ class BitStream
98114
ToReturn |= ((size_t)*Buffer) << NewBits;
99115
Buffer++;
100116
Buffer_Size-=8;
117+
[[fallthrough]];
101118
case 2 : NewBits-=8;
102119
ToReturn |= ((size_t)*Buffer) << NewBits;
103120
Buffer++;
104121
Buffer_Size-=8;
122+
[[fallthrough]];
105123
case 1 : NewBits-=8;
106124
ToReturn |= ((size_t)*Buffer) << NewBits;
107125
Buffer++;
108126
Buffer_Size-=8;
127+
[[fallthrough]];
109128
case 0 :
110129
LastByte=*Buffer;
111130
Buffer++;
@@ -191,12 +210,15 @@ class BitStream
191210
case 3 : NewBits-=8;
192211
Buffer++;
193212
Buffer_Size-=8;
213+
[[fallthrough]];
194214
case 2 : NewBits-=8;
195215
Buffer++;
196216
Buffer_Size-=8;
217+
[[fallthrough]];
197218
case 1 : NewBits-=8;
198219
Buffer++;
199220
Buffer_Size-=8;
221+
[[fallthrough]];
200222
case 0 :
201223
LastByte=*Buffer;
202224
Buffer++;

‎Source/ZenLib/BitStream_Fast.h‎

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,16 @@ namespace ZenLib
3030
class BitStream_Fast
3131
{
3232
public:
33-
BitStream_Fast () {Buffer=NULL;
34-
Buffer_Size=Buffer_Size_Init=0;
35-
BufferUnderRun=false;}
36-
BitStream_Fast (const int8u* Buffer_, size_t Size_) {Buffer=Buffer_;
37-
Buffer_Size=Buffer_Size_Init=Size_*8; //Size is in bits
38-
BufferUnderRun=false;}
33+
BitStream_Fast () { Buffer = NULL;
34+
Buffer_Size = 0;
35+
Buffer_Size_Init = 0;
36+
LastByte = 0;
37+
BufferUnderRun = false; }
38+
BitStream_Fast (const int8u* Buffer_, size_t Size_) { Buffer = Buffer_;
39+
Buffer_Size = Size_ * 8; //Size is in bits
40+
Buffer_Size_Init = Size_ * 8; //Size is in bits
41+
LastByte = 0;
42+
BufferUnderRun = false; }
3943
~BitStream_Fast () {}
4044

4145
void Attach(const int8u* Buffer_, size_t Size_)
@@ -182,11 +186,12 @@ class BitStream_Fast
182186
{
183187
case 3 : NewBits-=8;
184188
ToReturn|=*(Buffer++)<<NewBits;
189+
[[fallthrough]];
185190
case 2 : NewBits-=8;
186191
ToReturn|=*(Buffer++)<<NewBits;
192+
[[fallthrough]];
187193
case 1 : NewBits-=8;
188194
ToReturn|=*(Buffer++)<<NewBits;
189-
default: ;
190195
}
191196
LastByte=*(Buffer++);
192197
Buffer_Size-=HowMany;
@@ -358,13 +363,14 @@ class BitStream_Fast
358363
case 3 : NewBits-=8;
359364
ToReturn|=*Buffer<<NewBits;
360365
Buffer++;
366+
[[fallthrough]];
361367
case 2 : NewBits-=8;
362368
ToReturn|=*Buffer<<NewBits;
363369
Buffer++;
370+
[[fallthrough]];
364371
case 1 : NewBits-=8;
365372
ToReturn|=*Buffer<<NewBits;
366373
Buffer++;
367-
default: ;
368374
}
369375
ToReturn|=((*Buffer)>>((Buffer_Size-HowMany)%8))&Mask[NewBits];
370376

@@ -403,6 +409,13 @@ class BitStream_Fast
403409
return Buffer_Size%8;
404410
}
405411

412+
inline void Resize(size_t Size_) //Size_ is the new count of remaining bits, must have the same alignment as Remain()
413+
{
414+
if (BufferUnderRun && Size_>Buffer_Size)
415+
BufferUnderRun=false;
416+
Buffer_Size=Size_;
417+
}
418+
406419
private :
407420
const int8u* Buffer;
408421
size_t Buffer_Size;

‎Source/ZenLib/BitStream_LE.h‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,19 @@ namespace ZenLib
2626
class BitStream_LE : public BitStream
2727
{
2828
public:
29-
BitStream_LE () :BitStream() {};
30-
BitStream_LE (const int8u* Buffer_, size_t Size_) :BitStream(Buffer_, Size_) {};
29+
BitStream_LE() : BitStream(),
30+
endbyte(0),
31+
endbit(0),
32+
buffer(NULL),
33+
ptr(NULL),
34+
ptr_BeforeLastCall(NULL),
35+
storage(0) {
36+
};
37+
38+
BitStream_LE (const int8u* Buffer_, size_t Size_) : BitStream(Buffer_, Size_),
39+
ptr_BeforeLastCall(NULL) {
40+
Attach(Buffer_, Size_);
41+
};
3142

3243
void Attach(const int8u* Buffer_, size_t Size_)
3344
{
@@ -102,6 +113,8 @@ class BitStream_LE : public BitStream
102113

103114
void Byte_Align()
104115
{
116+
if (endbit)
117+
Get(endbit);
105118
};
106119

107120
size_t Offset_Get()

‎Source/ZenLib/Conf.h‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,21 @@
5555
#endif
5656
#endif
5757

58+
//---------------------------------------------------------------------------
59+
//Windows UWP
60+
#if defined(WIN32) || defined(WIN64)
61+
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_APP)
62+
#ifndef WINDOWS_UWP
63+
#define WINDOWS_UWP
64+
#endif
65+
#endif
66+
#if defined(WINAPI_FAMILY) && (WINAPI_FAMILY==WINAPI_FAMILY_GAMES)
67+
#ifndef WINDOWS_GAMES
68+
#define WINDOWS_GAMES
69+
#endif
70+
#endif
71+
#endif
72+
5873
//---------------------------------------------------------------------------
5974
//Unix (Linux, HP, Sun, BeOS...)
6075
#if defined(UNIX) || defined(_UNIX) || defined(__UNIX__) \
@@ -193,7 +208,7 @@
193208
//---------------------------------------------------------------------------
194209
//(-1) is known to be the MAX of an unsigned int but GCC complains about it
195210
#ifdef __cplusplus
196-
#include <new> //for size_t
211+
#include <cstddef> //for size_t
197212
#else /* __cplusplus */
198213
#include <stddef.h> //for size_t
199214
#endif /* __cplusplus */

0 commit comments

Comments
 (0)