mirror of
https://github.com/hrydgard/ppsspp.git
synced 2024-11-23 21:39:52 +00:00
Fixed some warnings from Native project
- fastMode assigned twice in ChunkFIle constructor - added checking for fail while reading ini file (possible infinity loop) - zim_save assigned dithval twice (Please double check this) - in http_client added checking progress againt nullptr
This commit is contained in:
parent
f8f7dadba4
commit
1794ca908f
@ -8,7 +8,6 @@
|
||||
ChunkFile::ChunkFile(const char *filename, bool _read) {
|
||||
data=0;
|
||||
fn = filename;
|
||||
fastMode=false;
|
||||
numLevels=0;
|
||||
read=_read;
|
||||
pos=0;
|
||||
|
@ -531,7 +531,7 @@ bool IniFile::Load(std::istream &in) {
|
||||
// Maximum number of letters in a line
|
||||
static const int MAX_BYTES = 1024*32;
|
||||
|
||||
while (!in.eof())
|
||||
while (!(in.eof() || in.fail()))
|
||||
{
|
||||
char templine[MAX_BYTES];
|
||||
in.getline(templine, MAX_BYTES);
|
||||
|
@ -164,7 +164,7 @@ void Convert(const uint8_t *image_data, int width, int height, int pitch, int fl
|
||||
for (int y = 0; y < height; y++) {
|
||||
for (int x = 0; x < width; x++) {
|
||||
int dithval = dith[(x&3)+((y&0x3)<<2)] - 8;
|
||||
dithval = 0;
|
||||
//dithval = 0; please check this
|
||||
int r = clamp32((image_data[i * 4] + dithval/2) >> 3);
|
||||
int g = clamp64((image_data[i * 4 + 1] + dithval/4) >> 2);
|
||||
int b = clamp32((image_data[i * 4 + 2] + dithval/2) >> 3);
|
||||
|
@ -323,7 +323,8 @@ int Client::ReadResponseEntity(Buffer *readbuf, const std::vector<std::string> &
|
||||
bool result = decompress_string(compressed, &decompressed);
|
||||
if (!result) {
|
||||
ELOG("Error decompressing using zlib");
|
||||
*progress = 0.0f;
|
||||
if (progress)
|
||||
*progress = 0.0f;
|
||||
return -1;
|
||||
}
|
||||
output->Append(decompressed);
|
||||
|
Loading…
Reference in New Issue
Block a user