mirror of
https://github.com/panda3d/panda3d.git
synced 2025-09-30 16:58:40 -04:00
Fix clang 3.5 compile warnings/errors
This commit is contained in:
parent
44346769b4
commit
0082b7876f
@ -83,7 +83,7 @@ ppm_computecolorhash(pixel** pixels,
|
||||
int* colorsP)
|
||||
{
|
||||
colorhash_table cht;
|
||||
register pixel* pP;
|
||||
pixel* pP;
|
||||
colorhist_list chl;
|
||||
int col, row, hash;
|
||||
|
||||
@ -141,8 +141,8 @@ ppm_addtocolorhash(colorhash_table cht,
|
||||
pixel* colorP,
|
||||
int value)
|
||||
{
|
||||
register int hash;
|
||||
register colorhist_list chl;
|
||||
int hash;
|
||||
colorhist_list chl;
|
||||
|
||||
chl = (colorhist_list) malloc( sizeof(struct colorhist_list_item) );
|
||||
if ( chl == 0 )
|
||||
|
@ -585,20 +585,20 @@ get_group() {
|
||||
change_state(ST_error);
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
// Now skip past exactly one newline character and any number of
|
||||
// other whitespace characters.
|
||||
while (in!=0 && in.peek() != '\n') {
|
||||
while (in && in.peek() != '\n') {
|
||||
in.get();
|
||||
}
|
||||
in.get();
|
||||
while (in!=0 && isspace(in.peek()) && in.peek() != '\n') {
|
||||
while (in && isspace(in.peek()) && in.peek() != '\n') {
|
||||
in.get();
|
||||
}
|
||||
|
||||
getline(in, _string);
|
||||
_string = trim_right(_string);
|
||||
|
||||
|
||||
if (!in) {
|
||||
change_state(ST_error);
|
||||
return false;
|
||||
|
Loading…
x
Reference in New Issue
Block a user