fix ref822 again: remove uniqarray(), fix case with many entries in 'n'.

[plan9front.git] / sys / src / cmd / rotate.c

diff --git a/sys/src/cmd/rotate.c b/sys/src/cmd/rotate.c
index a9f4d0158d54a5cfd1b412196be5f2063b3793d8..f595b982652ff30fc36a5de8155c0d1a756895bf 100644 (file)
--- a/sys/src/cmd/rotate.c
+++ b/sys/src/cmd/rotate.c
@@ -10,27 +10,13 @@ rot90(Memimage *m)
        ulong chan;
        uchar *s, *d;
        Memimage *w;
-       char buf[12];
 
-       bpp = m->depth/8;
+       bpp = (m->depth+7)/8;
        chan = m->chan;
        switch(chan){
-       default:
-               sysfatal("can't handle channel type %s", chantostr(buf, chan));
-       case RGB15:
-               bpp = 2;
-       case CMAP8:
-       case GREY8:
-       case RGB16:
-       case RGB24:
-       case RGBA32:
-       case ARGB32:
-       case XRGB32:
-               break;
        case GREY1:
        case GREY2:
        case GREY4:
-               bpp = 1;
                if((w = allocmemimage(m->r, GREY8)) == nil)
                        sysfatal("allocmemimage: %r");
                memimagedraw(w, w->r, m, m->r.min, nil, ZP, S);
@@ -41,7 +27,8 @@ rot90(Memimage *m)
 
        dx = Dx(m->r);
        dy = Dy(m->r);
-       if((w = allocmemimage(Rect(m->r.min.x, m->r.min.y, dy, dx), m->chan)) == nil)
+       if((w = allocmemimage(Rect(m->r.min.x, m->r.min.y, 
+               m->r.min.x+dy, m->r.min.y+dx), m->chan)) == nil)
                sysfatal("allocmemimage: %r");
        line = w->width*sizeof(ulong);
        for(y=0; y<dy; y++){
@@ -97,7 +84,7 @@ upsidedown(Memimage *m)
 void
 usage(void)
 {
-       fprint(2, "usage: %s -r degree [ file ]\n", argv0);
+       fprint(2, "usage: %s [ -r degree ] [ -u | -l ] [ file ]\n", argv0);
        exits("usage");
 }