rev 355 - trunk

Author: giles
Date: 2004-12-05 21:36:28 -0800 (Sun, 05 Dec 2004)
New Revision: 355

Modified:
   trunk/jbig2_generic.c
Log:
Correct the test for the nominal generic region template 0 AT pixel=20
positions. The previous change invoked the optimized routine for the=20
wrong template, causing a regression with ubc test stream 042_10.=20


Modified: trunk/jbig2_generic.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jbig2_generic.c	2004-12-05 04:15:42 UTC (rev 354)
+++ trunk/jbig2_generic.c	2004-12-06 05:36:28 UTC (rev 355)
@@ -488,9 +488,9 @@
=20
   if (!params->MMR && params->GBTEMPLATE =3D=3D 0) {
     if (gbat[0] =3D=3D +3 && gbat[1] =3D=3D -1 &&
-        gbat[2] =3D=3D -3 && gbat[4] =3D=3D -1 &&
+        gbat[2] =3D=3D -3 && gbat[3] =3D=3D -1 &&
         gbat[4] =3D=3D +2 && gbat[5] =3D=3D -2 &&
-        gbat[6] =3D=3D +2 && gbat[7] =3D=3D -2)
+        gbat[6] =3D=3D -2 && gbat[7] =3D=3D -2)
       return jbig2_decode_generic_template0(ctx, segment, params,
                                           as, image, GB_stats);
     else