[gs-cvs] rev 8295 - trunk/gs/src

[giles at ghostscript.com]

Author: giles
Date: 2007-10-15 17:36:28 -0700 (Mon, 15 Oct 2007)
New Revision: 8295

Modified:
   trunk/gs/src/sjpx.c
Log:
Don't override the memory set by the caller in the JPXDecode stream.


Modified: trunk/gs/src/sjpx.c
===================================================================
--- trunk/gs/src/sjpx.c	2007-10-16 00:36:27 UTC (rev 8294)
+++ trunk/gs/src/sjpx.c	2007-10-16 00:36:28 UTC (rev 8295)
@@ -52,7 +52,11 @@
     stream_jpxd_state *const state = (stream_jpxd_state *) ss;
     int status = 0;
 
-    state->jpx_memory = ss->memory ? ss->memory->non_gc_memory : gs_lib_ctx_get_non_gc_memory_t();
+    if (state->jpx_memory == NULL) {
+      state->jpx_memory = ss->memory ?
+		ss->memory->non_gc_memory : 
+		gs_lib_ctx_get_non_gc_memory_t();
+    }
 
     status = jas_init();
     jas_set_error_cb(s_jpx_jas_error_cb);