From b5bbc62dda13b59487769fab7d715d0b8e580115 Mon Sep 17 00:00:00 2001 From: cinap_lenrek Date: Sun, 4 Sep 2011 23:51:14 +0200 Subject: libdraw: fix unloadimage() for wide images, libmemdraw: work arround width limit by outputting uncompressed image in writememimage() if compressed blocksize exceeds chunk limit --- sys/src/libmemdraw/write.c | 39 +++++++++++++++++++++++++++++---------- 1 file changed, 29 insertions(+), 10 deletions(-) (limited to 'sys/src/libmemdraw/write.c') diff --git a/sys/src/libmemdraw/write.c b/sys/src/libmemdraw/write.c index a8816ed04..cde12dfbc 100644 --- a/sys/src/libmemdraw/write.c +++ b/sys/src/libmemdraw/write.c @@ -43,26 +43,45 @@ writememimage(int fd, Memimage *i) bpl = bytesperline(r, i->depth); n = Dy(r)*bpl; data = malloc(n); - ncblock = _compblocksize(r, i->depth); - outbuf = malloc(ncblock); - hash = malloc(NHASH*sizeof(Hlist)); - chain = malloc(NMEM*sizeof(Hlist)); - if(data == 0 || outbuf == 0 || hash == 0 || chain == 0){ - ErrOut: + if(data == 0){ + ErrOut0: free(data); - free(outbuf); - free(hash); - free(chain); return -1; } for(miny = r.min.y; miny != r.max.y; miny += dy){ dy = r.max.y-miny; if(dy*bpl > CHUNK) dy = CHUNK/bpl; + if(dy <= 0) + dy = 1; nb = unloadmemimage(i, Rect(r.min.x, miny, r.max.x, miny+dy), data+(miny-r.min.y)*bpl, 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 ", chantostr(cbuf, i->chan), r.min.x, r.min.y, r.max.x, r.max.y); -- cgit v1.2.3