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

[giles at ghostscript.com]

Author: giles
Date: 2008-03-07 01:42:38 -0800 (Fri, 07 Mar 2008)
New Revision: 8590

Modified:
   trunk/gs/src/sjbig2_luratech.c
Log:
Correct a default return value. Follow on to Bug 689569.

Also rename a variable to match the jbig2dec version of the same call.


Modified: trunk/gs/src/sjbig2_luratech.c
===================================================================
--- trunk/gs/src/sjbig2_luratech.c	2008-03-06 04:19:27 UTC (rev 8589)
+++ trunk/gs/src/sjbig2_luratech.c	2008-03-07 09:42:38 UTC (rev 8590)
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001-2006 Artifex Software, Inc.
+/* Copyright (C) 2001-2008 Artifex Software, Inc.
    All Rights Reserved.
   
    This software is provided AS-IS with no warranty, either express or
@@ -94,23 +94,22 @@
 
 /* store a global ctx pointer in our state structure */
 int
-s_jbig2decode_set_global_data(stream_state *ss, s_jbig2_global_data_t *gs)
+s_jbig2decode_set_global_data(stream_state *ss, s_jbig2_global_data_t *gd)
 {
     stream_jbig2decode_state *state = (stream_jbig2decode_state*)ss;
     if (state == NULL)
         return gs_error_VMerror;
     
-    state->global_struct = gs;
-    if (gs != NULL) {
-        s_jbig2decode_global_data *global = (s_jbig2decode_global_data*)(gs->data);
-
+    state->global_struct = gd;
+    if (gd != NULL) {
+        s_jbig2decode_global_data *global = (s_jbig2decode_global_data*)(gd->data);
         state->global_data = global->data;
         state->global_size = global->size;
     } else {
         state->global_data = NULL;
         state->global_size = 0;
     }
-    return gs_error_VMerror;
+    return 0;
 }
 
 /* invert the bits in a buffer */