Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-24 11:54:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed the value type for reading stuff from a bit_cursor_c from unsigned long to int64_t.

Browse Source
This commit is contained in:
Moritz Bunkus 2004-12-31 14:20:15 +00:00
parent 1a07b5b044
commit 25890d1ac6
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/common/common.h
View File

@ -300,7 +300,7 @@ public:
return out_of_data;
}
bool get_bits(unsigned int n, unsigned long &r) {
bool get_bits(unsigned int n, uint64_t &r) {
// returns false if less bits are available than asked for
r = 0;
@ -333,28 +333,35 @@ public:
return true;
}
bool get_bits(unsigned int n, int64_t &r) {
uint64_t t;
bool b = get_bits(n, t);
r = (int64_t)t;
return b;
}
bool get_bits(unsigned int n, int &r) {
unsigned long t;
uint64_t t;
bool b = get_bits(n, t);
r = (int)t;
return b;
}
bool get_bits(unsigned int n, unsigned int &r) {
unsigned long t;
uint64_t t;
bool b = get_bits(n, t);
r = (unsigned int)t;
return b;
}
bool get_bit(bool &r) {
unsigned long t;
uint64_t t;
bool b = get_bits(1, t);
r = (bool)t;
return b;
}
bool peek_bits(unsigned int n, unsigned long &r) {
bool peek_bits(unsigned int n, uint64_t &r) {
int tmp_bits_valid;
const unsigned char *tmp_byte_position;
// returns false if less bits are available than asked for
@ -389,22 +396,29 @@ public:
return true;
}
bool peek_bits(unsigned int n, int64_t &r) {
uint64_t t;
bool b = peek_bits(n, t);
r = (int64_t)t;
return b;
}
bool peek_bits(unsigned int n, int &r) {
unsigned long t;
uint64_t t;
bool b = peek_bits(n, t);
r = (int)t;
return b;
}
bool peek_bits(unsigned int n, unsigned int &r) {
unsigned long t;
uint64_t t;
bool b = peek_bits(n, t);
r = (unsigned int)t;
return b;
}
bool peek_bit(bool &r) {
unsigned long t;
uint64_t t;
bool b = peek_bits(1, t);
r = (bool)t;
return b;