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

[giles at ghostscript.com]

Author: giles
Date: 2008-03-31 16:53:28 -0700 (Mon, 31 Mar 2008)
New Revision: 8616

Modified:
   trunk/gs/src/sjpx_luratech.c
Log:
Don't override the memory pointer set by the client when initializing 
the luratech jpx decoder.


Modified: trunk/gs/src/sjpx_luratech.c
===================================================================
--- trunk/gs/src/sjpx_luratech.c	2008-03-31 23:08:41 UTC (rev 8615)
+++ trunk/gs/src/sjpx_luratech.c	2008-03-31 23:53:28 UTC (rev 8616)
@@ -165,9 +165,13 @@
 s_jpxd_init(stream_state * ss)
 {
     stream_jpxd_state *const state = (stream_jpxd_state *) ss;
+ 
+    if (state->jpx_memory == NULL) {
+      state->jpx_memory = ss->memory ?
+		ss->memory->non_gc_memory : 
+		gs_lib_ctx_get_non_gc_memory_t();
+    }
 
-    state->jpx_memory = ss->memory ? ss->memory->non_gc_memory : gs_lib_ctx_get_non_gc_memory_t();
-
     state->handle = (JP2_Decomp_Handle)NULL;
 
     state->inbuf = NULL;