| 47 |
|
|
| 48 |
|
char errmsg[128]; |
| 49 |
|
|
| 50 |
< |
COLR *inline; |
| 50 |
> |
COLR *inl; |
| 51 |
|
|
| 52 |
|
int xmax, ymax; |
| 53 |
|
|
| 203 |
|
h->ras_maptype = RMT_EQUAL_RGB; |
| 204 |
|
h->ras_maplength = 256*3; |
| 205 |
|
/* allocate scanline */ |
| 206 |
< |
inline = (COLR *)emalloc(xmax*sizeof(COLR)); |
| 206 |
> |
inl = (COLR *)emalloc(xmax*sizeof(COLR)); |
| 207 |
|
|
| 208 |
|
return(p); |
| 209 |
|
} |
| 277 |
|
if (inpic->bytes_line == 0) { |
| 278 |
|
if (inpic->pos.y[y] == 0) { |
| 279 |
|
while (inpic->nexty < y) { |
| 280 |
< |
if (freadcolrs(inline, xmax, inpic->fp) < 0) |
| 280 |
> |
if (freadcolrs(inl, xmax, inpic->fp) < 0) |
| 281 |
|
quiterr("read error in picreadline3"); |
| 282 |
|
inpic->pos.y[++inpic->nexty] = ftell(inpic->fp); |
| 283 |
|
} |
| 287 |
|
quiterr("seek error in picreadline3"); |
| 288 |
|
} else if (inpic->bytes_line == 0 && inpic->pos.y[inpic->nexty] == 0) |
| 289 |
|
inpic->pos.y[inpic->nexty] = ftell(inpic->fp); |
| 290 |
< |
if (freadcolrs(inline, xmax, inpic->fp) < 0) /* read scanline */ |
| 290 |
> |
if (freadcolrs(inl, xmax, inpic->fp) < 0) /* read scanline */ |
| 291 |
|
quiterr("read error in picreadline3"); |
| 292 |
|
inpic->nexty = y+1; |
| 293 |
|
/* convert scanline */ |
| 294 |
< |
normcolrs(inline, xmax, 0); |
| 294 |
> |
normcolrs(inl, xmax, 0); |
| 295 |
|
for (i = 0; i < xmax; i++) { |
| 296 |
< |
l3[i].r = inline[i][RED]; |
| 297 |
< |
l3[i].g = inline[i][GRN]; |
| 298 |
< |
l3[i].b = inline[i][BLU]; |
| 296 |
> |
l3[i].r = inl[i][RED]; |
| 297 |
> |
l3[i].g = inl[i][GRN]; |
| 298 |
> |
l3[i].b = inl[i][BLU]; |
| 299 |
|
} |
| 300 |
|
} |
| 301 |
|
|
