Do not revert to CMAP for second file. (Rob Pike).
This commit is contained in:
parent
68e139f293
commit
d1e25ee94e
1 changed files with 9 additions and 7 deletions
|
|
@ -268,16 +268,18 @@ rpt: array = Breadjpg(&b, colorspace);
|
||||||
c = nil;
|
c = nil;
|
||||||
if(jflag)
|
if(jflag)
|
||||||
goto Return;
|
goto Return;
|
||||||
if(!dflag && !inited){
|
if(!dflag){
|
||||||
|
if(!inited){
|
||||||
if(initdraw(0, 0, 0) < 0){
|
if(initdraw(0, 0, 0) < 0){
|
||||||
fprint(2, "jpg: initdraw failed: %r\n");
|
fprint(2, "jpg: initdraw failed: %r\n");
|
||||||
return "initdraw";
|
return "initdraw";
|
||||||
}
|
}
|
||||||
if(Fflag == 0)
|
if(Fflag == 0)
|
||||||
einit(Ekeyboard|Emouse);
|
einit(Ekeyboard|Emouse);
|
||||||
|
inited++;
|
||||||
|
}
|
||||||
if(defaultcolor && screen->depth>8 && outchan==CMAP8)
|
if(defaultcolor && screen->depth>8 && outchan==CMAP8)
|
||||||
outchan = RGB24;
|
outchan = RGB24;
|
||||||
inited++;
|
|
||||||
}
|
}
|
||||||
if(outchan == CMAP8)
|
if(outchan == CMAP8)
|
||||||
c = torgbv(r, !eflag);
|
c = torgbv(r, !eflag);
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue