13 |
|
#include <signal.h> |
14 |
|
#include <string.h> |
15 |
|
|
16 |
– |
#include "standard.h" |
16 |
|
#include "platform.h" |
17 |
+ |
#include "standard.h" |
18 |
|
#include "color.h" |
19 |
|
#include "view.h" |
20 |
|
#include "paths.h" |
490 |
|
if (obarsize > 0) { |
491 |
|
scoutbar = (COLOR **)malloc(obarsize*sizeof(COLOR *)); |
492 |
|
greybar = (float **)malloc(obarsize*sizeof(float *)); |
493 |
< |
if (scoutbar == NULL | greybar == NULL) |
493 |
> |
if ((scoutbar == NULL) | (greybar == NULL)) |
494 |
|
goto memerr; |
495 |
|
for (i = 0; i < obarsize; i++) { |
496 |
|
scoutbar[i] = (COLOR *)malloc(ncols*sizeof(COLOR)); |
497 |
|
greybar[i] = (float *)malloc(ncols*sizeof(float)); |
498 |
< |
if (scoutbar[i] == NULL | greybar[i] == NULL) |
498 |
> |
if ((scoutbar[i] == NULL) | (greybar[i] == NULL)) |
499 |
|
goto memerr; |
500 |
|
} |
501 |
|
} else { |