rev 338 - trunk

Author: giles
Date: 2004-11-24 11:35:47 -0800 (Wed, 24 Nov 2004)
New Revision: 338

Modified:
   trunk/jbig2_refinement.c
Log:
Implement an unoptimized version of refinement region template 0.
We now decode ubc test stream 042_21.jb2.


Modified: trunk/jbig2_refinement.c
===================================================================
--- trunk/jbig2_refinement.c	2004-11-24 19:29:07 UTC (rev 337)
+++ trunk/jbig2_refinement.c	2004-11-24 19:35:47 UTC (rev 338)
@@ -78,10 +78,13 @@
       CONTEXT |= jbig2_image_get_pixel(image, x - 1, y - 1) << 3; 
       CONTEXT |= jbig2_image_get_pixel(ref, x-dx+1, y-dy+1) << 4;
       CONTEXT |= jbig2_image_get_pixel(ref, x-dx+0, y-dy+1) << 5;
-      CONTEXT |= jbig2_image_get_pixel(ref, x-dx+1, y-dy+0) << 6;
-      CONTEXT |= jbig2_image_get_pixel(ref, x-dx+0, y-dy+0) << 7;
-      CONTEXT |= jbig2_image_get_pixel(ref, x-dx-1, y-dy+0) << 8;
-      CONTEXT |= jbig2_image_get_pixel(ref, x-dx+0, y-dy-1) << 9;
+      CONTEXT |= jbig2_image_get_pixel(ref, x-dx-1, y-dy+1) << 6;
+      CONTEXT |= jbig2_image_get_pixel(ref, x-dx+1, y-dy+0) << 7;
+      CONTEXT |= jbig2_image_get_pixel(ref, x-dx+0, y-dy+0) << 8;
+      CONTEXT |= jbig2_image_get_pixel(ref, x-dx-1, y-dy+0) << 9;
+      CONTEXT |= jbig2_image_get_pixel(ref, x-dx+1, y-dy-1) << 10;
+      CONTEXT |= jbig2_image_get_pixel(ref, x-dx+0, y-dy-1) << 11;
+      CONTEXT |= jbig2_image_get_pixel(ref, x-dx-1, y-dy-1) << 12;
       bit = jbig2_arith_decode(as, &GB_stats[CONTEXT]);
       jbig2_image_set_pixel(image, x, y, bit);
     }
@@ -271,7 +274,7 @@
     return jbig2_decode_refinement_template1_unopt(ctx, segment, params, 
                                              as, image, GB_stats);
   else
-    return jbig2_decode_refinement_template0(ctx, segment, params,
+    return jbig2_decode_refinement_template0_unopt(ctx, segment, params,
                                              as, image, GB_stats);
 }