rev 382 - trunk

Author: giles
Date: 2005-01-03 20:40:18 -0800 (Mon, 03 Jan 2005)
New Revision: 382

Modified:
   trunk/jbig2_text.c
Log:
Minor cleanup: remove an unnecessary check before releasing an immediate=20
text region after decode and composite, and simply reference to the page=20
image itself.


Modified: trunk/jbig2_text.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_text.c	2005-01-04 00:53:10 UTC (rev 381)
+++ trunk/jbig2_text.c	2005-01-04 04:40:18 UTC (rev 382)
@@ -328,7 +328,7 @@
     int offset =3D 0;
     Jbig2RegionSegmentInfo region_info;
     Jbig2TextRegionParams params;
-    Jbig2Image *image, *page_image;
+    Jbig2Image *image;
     Jbig2SymbolDict **dicts;
     int n_dicts;
     uint16_t flags;
@@ -444,7 +444,6 @@
 	}
     }
=20
-    page_image =3D ctx->pages[ctx->current_page].image;
     image =3D jbig2_image_new(ctx, region_info.width, region_info.height=
);
=20
     code =3D jbig2_decode_text_region(ctx, segment, &params,
@@ -459,12 +458,12 @@
         segment->result =3D image;
     } else {
         /* otherwise composite onto the page */
+	Jbig2Image *page_image =3D ctx->pages[ctx->current_page].image;
         jbig2_error(ctx, JBIG2_SEVERITY_DEBUG, segment->number,=20
             "composing %dx%d decoded text region onto page at (%d, %d)",
             region_info.width, region_info.height, region_info.x, region=
_info.y);
         jbig2_image_compose(ctx, page_image, image, region_info.x, regio=
n_info.y, JBIG2_COMPOSE_OR);
-        if (image !=3D page_image)
-            jbig2_image_release(ctx, image);
+        jbig2_image_release(ctx, image);
     }
    =20
     /* success */           =20