jbig2dec

Update of /cvsroot/jbig2dec/jbig2dec
In directory usw-pr-cvs1:/tmp/cvs-serv2923

Modified Files:
	jbig2_image.c jbig2_text.c 
Log Message:
Code cleanup (obsuscation?) Turn off excessive debugging output.


Index: jbig2_image.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_image.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- jbig2_image.c	3 Jul 2002 21:51:09 -0000	1.14
+++ jbig2_image.c	4 Jul 2002 12:08:02 -0000	1.15
@@ -61,13 +61,13 @@
 int jbig2_image_compose(Jbig2Ctx *ctx, Jbig2Image *dst, Jbig2Image *src, 
 			int x, int y, Jbig2ComposeOp op)
 {
+    int i, j;
     int w, h;
     int leftbyte, rightbyte;
-    int leftbits, rightbits;
-    int i, j;
+    int shift;
     uint8_t *s, *ss;
     uint8_t *d, *dd;
-    uint8_t mask, highmask;
+    uint8_t mask, rightmask;
     
     if (op != JBIG2_COMPOSE_OR) {
         jbig2_error(ctx, JBIG2_SEVERITY_WARNING, -1,
@@ -95,23 +95,20 @@
     }
 
     leftbyte = x >> 3;
-    leftbits = x & 7;
     rightbyte = (x + w - 1) >> 3;
-    rightbits = (x + w) & 7;
-    fprintf(stderr, "left byte:bits %d:%d right byte:bits %d:%d\n",
-        leftbyte, leftbits, rightbyte, rightbits);
-
+    shift = x & 7;
+    
     /* general OR case */    
     s = ss;
     d = dd = dst->data + y*dst->stride + leftbyte;
     if (leftbyte == rightbyte) {
 	mask = 0x100 - (0x100 >> w);
         for (j = 0; j < h; j++) {
-            *d |= (*s & mask) >> leftbits;
+            *d |= (*s & mask) >> shift;
             d += dst->stride;
             s += src->stride;
         }
-    } else if (leftbits == 0) {
+    } else if (shift == 0) {
         for (j = 0; j < h; j++) {
 	    for (i = leftbyte; i <= rightbyte; i++)
 		*d++ |= *s++;
@@ -119,24 +116,22 @@
             s = (ss += src->stride);
 	}
     } else {
-	mask = 0x100 - (1 << leftbits);
+	mask = 0x100 - (1 << shift);
 	if (((w + 7) >> 3) < ((x + w + 7) >> 3) - (x >> 3))
-	    highmask = (0x100 - (0x100 >> rightbits)) >> (8 - leftbits);
+	    rightmask = (0x100 - (0x100 >> ((x + w) & 7))) >> (8 - shift);
 	else
-	    highmask = 0x100 - (0x100 >> (w & 7));
+	    rightmask = 0x100 - (0x100 >> (w & 7));
         for (j = 0; j < h; j++) {
-	    *d++ |= (*s & mask) >> leftbits;
+	    *d++ |= (*s & mask) >> shift;
             for(i = leftbyte; i < rightbyte - 1; i++) {
-		*d |= ((s[0] & ~mask) << (8 - leftbits)) |
-		    ((s[1] & mask) >> leftbits);
-		s++;
-		d++;
+		*d++ |= ((*s & ~mask) << (8 - shift)) |
+		    ((*(++s) & mask) >> shift);
 	    }
 	    if (((w + 7) >> 3) < ((x + w + 7) >> 3) - (x >> 3))
-		*d |= (s[0] & highmask) << (8 - leftbits);
+		*d |= (s[0] & rightmask) << (8 - shift);
 	    else
-		*d |= ((s[0] & ~mask) << (8 - leftbits)) |
-		    ((s[1] & highmask) >> leftbits);
+		*d |= ((s[0] & ~mask) << (8 - shift)) |
+		    ((s[1] & rightmask) >> shift);
 	    d = (dd += dst->stride);
 	    s = (ss += src->stride);
 	}

Index: jbig2_text.c
===================================================================
RCS file: /cvsroot/jbig2dec/jbig2dec/jbig2_text.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- jbig2_text.c	3 Jul 2002 00:08:40 -0000	1.8
+++ jbig2_text.c	4 Jul 2002 12:08:03 -0000	1.9
@@ -264,10 +264,12 @@
 	    }
         
 	    /* (3c.ix) */
+#ifdef DEBUG
 	    jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,
 			"composing glyph id %d: %dx%d @ (%d,%d) symbol %d/%d", 
 			ID, IB->width, IB->height, x, y, NINSTANCES + 1,
 			params->SBNUMINSTANCES);
+#endif
 	    jbig2_image_compose(ctx, image, IB, x, y, params->SBCOMBOP);
         
 	    /* (3c.x) */