fte
/
quakespasm
mirror of https://github.com/Shpoike/Quakespasm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lodepng: fixed MSVC C4334 warnings in 64 bit builds 

1>D:\sezero\quakespasm-git\Quake\lodepng.c(689,54): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
1>D:\sezero\quakespasm-git\Quake\lodepng.c(708,39): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)
1>D:\sezero\quakespasm-git\Quake\lodepng.c(5467,33): warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?)

c.f.: https://github.com/lvandeve/lodepng/pull/142
This commit is contained in:
Ozkan Sezer 2022-03-26 05:00:32 +03:00
parent a4b630a8ce
commit fb87b63d19
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Quake/lodepng.c
View File

@ -346,7 +346,7 @@ static void lodepng_set32bitInt(unsigned char* buffer, unsigned value) {
#ifdef LODEPNG_COMPILE_DISK
#ifdef LODEPNG_COMPILE_DECODER
#ifdef LODEPNG_COMPILE_DECODER /**/
/* returns negative value on error. This should be pure C compatible, so no fstat. */
static long lodepng_filesize(const char* filename) {
FILE* file;
@ -391,7 +391,7 @@ unsigned lodepng_load_file(unsigned char** out, size_t* outsize, const char* fil
return lodepng_buffer_file(*out, (size_t)size, filename);
}
#endif /*LODEPNG_COMPILE_DECODER*/
#endif /**/
/*write given buffer to the file, overwriting the file, it doesn't append to it.*/
unsigned lodepng_save_file(const unsigned char* buffer, size_t buffersize, const char* filename) {
@ -686,7 +686,7 @@ static unsigned HuffmanTree_makeTable(HuffmanTree* tree) {
size = headsize;
for(i = 0; i < headsize; ++i) {
unsigned l = maxlens[i];
if(l > FIRSTBITS) size += (1u << (l - FIRSTBITS));
if(l > FIRSTBITS) size += (((size_t)1) << (l - FIRSTBITS));
}
tree->table_len = (unsigned char*)lodepng_malloc(size * sizeof(*tree->table_len));
tree->table_value = (unsigned short*)lodepng_malloc(size * sizeof(*tree->table_value));
@ -705,7 +705,7 @@ static unsigned HuffmanTree_makeTable(HuffmanTree* tree) {
if(l <= FIRSTBITS) continue;
tree->table_len[i] = l;
tree->table_value[i] = pointer;
pointer += (1u << (l - FIRSTBITS));
pointer += (((size_t)1) << (l - FIRSTBITS));
}
lodepng_free(maxlens);
@ -5464,7 +5464,7 @@ static size_t ilog2i(size_t i) {
l = ilog2(i);
/* approximate i*log2(i): l is integer logarithm, ((i - (1u << l)) << 1u)
linearly approximates the missing fractional part multiplied by i */
return i * l + ((i - (1u << l)) << 1u);
return i * l + ((i - (((size_t)1) << l)) << 1u);
}
static unsigned filter(unsigned char* out, const unsigned char* in, unsigned w, unsigned h,
@ -6299,14 +6299,14 @@ const char* lodepng_error_text(unsigned code) {
namespace lodepng {
#ifdef LODEPNG_COMPILE_DISK
#ifdef LODEPNG_COMPILE_DECODER
#ifdef LODEPNG_COMPILE_DECODER /**/
unsigned load_file(std::vector<unsigned char>& buffer, const std::string& filename) {
long size = lodepng_filesize(filename.c_str());
if(size < 0) return 78;
buffer.resize((size_t)size);
return size == 0 ? 0 : lodepng_buffer_file(&buffer[0], (size_t)size, filename.c_str());
}
#endif /*LODEPNG_COMPILE_DECODER*/
#endif /**/
/*write given buffer to the file, overwriting the file, it doesn't append to it.*/
unsigned save_file(const std::vector<unsigned char>& buffer, const std::string& filename) {