xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

libdraw: fix libdraws copy of writeimage() too

Browse source
This commit is contained in:
cinap_lenrek 2011-09-04 03:40:33 +02:00
parent b5bbc62dda
commit 4749fc5ca1
1 changed files with 27 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
sys/src/libdraw/writeimage.c
View file

@ -41,22 +41,17 @@ writeimage(int fd, Image *i, int dolock)
bpl = bytesperline(r, i->depth); bpl = bytesperline(r, i->depth);
n = Dy(r)*bpl; n = Dy(r)*bpl;
data = malloc(n); data = malloc(n);
ncblock = _compblocksize(r, i->depth); if(data == 0){
outbuf = malloc(ncblock); ErrOut0:
hash = malloc(NHASH*sizeof(Hlist));
chain = malloc(NMEM*sizeof(Hlist));
if(data == 0 || outbuf == 0 || hash == 0 || chain == 0){
ErrOut:
free(data); free(data);
free(outbuf);
free(hash);
free(chain);
return -1; return -1;
} }
for(miny = r.min.y; miny != r.max.y; miny += dy){ for(miny = r.min.y; miny != r.max.y; miny += dy){
dy = r.max.y-miny; dy = r.max.y-miny;
if(dy*bpl > chunk) if(dy*bpl > chunk)
dy = chunk/bpl; dy = chunk/bpl;
if(dy <= 0)
dy = 1;
if(dolock) if(dolock)
lockdisplay(i->display); lockdisplay(i->display);
nb = unloadimage(i, Rect(r.min.x, miny, r.max.x, miny+dy), nb = unloadimage(i, Rect(r.min.x, miny, r.max.x, miny+dy),
@ -64,7 +59,29 @@ writeimage(int fd, Image *i, int dolock)
if(dolock) if(dolock)
unlockdisplay(i->display); unlockdisplay(i->display);
if(nb != dy*bpl) if(nb != dy*bpl)
goto ErrOut; goto ErrOut0;
}
ncblock = _compblocksize(r, i->depth);
if(ncblock > chunk){
sprint(hdr, "%11s %11d %11d %11d %11d ",
chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y);
if(write(fd, hdr, 5*12) != 5*12)
goto ErrOut0;
if(write(fd, data, n) != n)
goto ErrOut0;
free(data);
return 0;
}
outbuf = malloc(ncblock);
hash = malloc(NHASH*sizeof(Hlist));
chain = malloc(NMEM*sizeof(Hlist));
if(outbuf == 0 || hash == 0 || chain == 0){
ErrOut:
free(outbuf);
free(hash);
free(chain);
goto ErrOut0;
} }
sprint(hdr, "compressed\n%11s %11d %11d %11d %11d ", sprint(hdr, "compressed\n%11s %11d %11d %11d %11d ",
chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y); chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y);