Move the pdfmark processing out of pcjob.c and into a new file.

3 files changed, 267 insertions, 222 deletions

diff --git a/pcl/pcl/pcjob.c b/pcl/pcl/pcjob.c
index 166c0f0f3..530a8f67f 100644
--- a/pcl/pcl/pcjob.c
+++ b/pcl/pcl/pcjob.c
@@ -29,6 +29,8 @@
 #include "pcpage.h"
 #include "pjtop.h"
 #include <stdlib.h>             /* for atof() */
+#include "gzstate.h"
+#include "plparams.h"
 
 /* Commands */
 
@@ -287,227 +289,6 @@ pcl_pjl_res(pcl_state_t * pcs)
     return atof(pres);
 }
 
-static int pdfmark_write_list(pcl_state_t * pcs, gs_param_string_array *array_list)
-{
-    gs_c_param_list list;
-    int code;
-
-    gs_c_param_list_write(&list, pcs->memory);
-    gs_param_list_set_persistent_keys((gs_param_list *) &list, false);
-    gs_c_param_list_write_more(&list);
-    code = param_write_string_array((gs_param_list *)&list, "pdfmark", array_list);
-    if (code < 0)
-        return code;
-
-    gs_c_param_list_read(&list);
-    code = gs_state_putdeviceparams(pcs->pgs, (gs_param_list *)&list);
-
-    return code;
-}
-
-static int process_pdfmark(pcl_state_t * pcs, char *pdfmark)
-{
-    char *p, *type, *start, *copy, *stream_data = 0L;
-    int tokens = 0, code = 0;
-    gs_param_string *parray;
-    gs_param_string_array array_list;
-    bool putdict = false;
-
-    /* Our parsing will alter the string contents, so copy it and perform the parsing on the copy */
-    copy = (char *)gs_alloc_bytes(pcs->memory, strlen(pdfmark) + 1, "working buffer for pdfmark processing");
-    if (copy == 0)
-        return -1;
-    strcpy(copy, pdfmark);
-
-    start = copy + 1;
-    if (*pdfmark != '[') {
-        gs_free_object(pcs->memory, copy, "working buffer for pdfmark processing");
-        return -1;
-    }
-
-    p = start;
-    while (*p != 0x00){
-        if(*p == '(') {
-            while (*p != ')' && *p != 0x00) {
-                if (*p == '\\')
-                    p++;
-                p++;
-            }
-            if (*p != ')') {
-                gs_free_object(pcs->memory, copy, "working buffer for pdfmark processing");
-                return -1;
-            }
-        } else {
-            if (*p == ' ') {
-                tokens++;
-            }
-        }
-        p++;
-    }
-
-    if (*(p-1) != ' ')
-        tokens++;
-
-    /* We need an extra one for a dummy CTM */
-    tokens++;
-
-    parray = (gs_param_string *)gs_alloc_bytes(pcs->memory, tokens * sizeof(gs_param_string), "temporary pdfmark array");
-    if (!parray) {
-        gs_free_object(pcs->memory, copy, "working buffer for pdfmark processing");
-        return -1;
-    }
-
-    tokens = 0;
-    while (*start == ' ')
-        start++;
-    p = start;
-
-    while (*p != 0x00){
-        if(*p == '(') {
-            while (*p != ')' && *p != 0x00) {
-                if (*p == '\\')
-                    p++;
-                p++;
-            }
-            if (*p != ')') {
-                gs_free_object(pcs->memory, copy, "working buffer for pdfmark processing");
-                return -1;
-            }
-        } else {
-            if (*p == ' ') {
-                if (strncmp(start, "<<", 2) == 0) {
-                    putdict = true;
-                } else {
-                    if (strncmp(start, ">>", 2) != 0) {
-                        *p = 0x00;
-                        parray[tokens].data = (const byte *)start;
-                        parray[tokens].size = strlen(start);
-                        parray[tokens++].persistent = false;
-                    }
-                }
-                start = ++p;
-            } else
-                p++;
-        }
-    }
-    if (*(p-1) != ' ') {
-        parray[tokens].data = (const byte *)start;
-        parray[tokens].size = strlen(start);
-        parray[tokens++].persistent = false;
-    }
-
-    /* Move last entry up one and add a dummy CTM where it used to be */
-    parray[tokens].data = parray[tokens - 1].data;
-    parray[tokens].size = parray[tokens - 1].size;
-    parray[tokens].persistent = parray[tokens - 1].persistent;
-    parray[tokens - 1].data = (const byte *)"[0 0 0 0 0 0]";
-    parray[tokens - 1].size = 13;
-    parray[tokens - 1].persistent = false;
-
-    /* Features are name objects (ie they start with a '/') but putdeviceparams wants them
-     * as strings without the #/#, so we need to strip that here.
-     */
-    if (parray[tokens].data[0] != '/') {
-        gs_free_object(pcs->memory, copy, "working buffer for pdfmark processing");
-        gs_free_object(pcs->memory, parray, "temporary pdfmark array");
-        return -1;
-    } else {
-        parray[tokens].data++;
-        parray[tokens].size--;
-    }
-
-    /* We need to convert a 'PUT' with a dictonayr into a 'PUTDICT', this is normally done
-     * in PostScript
-     */
-    if (putdict && strncmp((const char *)(parray[tokens].data), "PUT", 3) == 0) {
-        parray[tokens].data = (const byte *)".PUTDICT";
-        parray[tokens].size = 8;
-        parray[tokens].persistent = false;
-    }
-    /* We also need some means to handle file data. Normally ths is done by creating a
-     * PostScript file object and doing a 'PUT', but we can't do that, so we define a
-     * special variety of 'PUT' called 'PUTFILE' and we handle that here.
-     */
-    if (strncmp((const char *)(parray[tokens].data), "PUTFILE", 7) == 0) {
-        FILE *f;
-        char *filename;
-        int bytes;
-
-        if (parray[tokens - 2].data[0] != '(') {
-            gs_free_object(pcs->memory, copy, "working buffer for pdfmark processing");
-            gs_free_object(pcs->memory, parray, "temporary pdfmark array");
-            return -1;
-        }
-        filename = (char *)&(parray[tokens - 2].data[1]);
-        filename[strlen(filename) - 1] = 0x00;
-
-        f = gp_fopen((const char *)filename, "rb");
-        if (!f) {
-            gs_free_object(pcs->memory, copy, "working buffer for pdfmark processing");
-            gs_free_object(pcs->memory, parray, "temporary pdfmark array");
-            return -1;
-        }
-
-        gp_fseek_64(f, 0, SEEK_END);
-        bytes = gp_ftell_64(f);
-        parray[tokens - 2].data = (const byte *)gs_alloc_bytes(pcs->memory, bytes, "PJL pdfmark, stream");
-        if (!parray[tokens - 2].data) {
-            gs_free_object(pcs->memory, copy, "working buffer for pdfmark processing");
-            gs_free_object(pcs->memory, parray, "temporary pdfmark array");
-            return -1;
-        }
-        stream_data = (char *)(parray[tokens - 2].data);
-
-        gp_fseek_64(f, 0, SEEK_SET);
-        fread(stream_data, 1, bytes, f);
-        fclose(f);
-        parray[tokens - 2].size = bytes;
-
-        parray[tokens].data = (const byte *)".PUTSTREAM";
-        parray[tokens].size = 10;
-        parray[tokens].persistent = false;
-    }
-
-    array_list.data = parray;
-    array_list.persistent = 0;
-    array_list.size = ++tokens;
-
-    code = pdfmark_write_list(pcs, &array_list);
-
-    if (stream_data)
-        gs_free_object(pcs->memory, stream_data, "PJL pdfmark, stream");
-    gs_free_object(pcs->memory, copy, "working buffer for pdfmark processing");
-    gs_free_object(pcs->memory, parray, "temporary pdfmark array");
-
-    return code;
-}
-
-static int pcl_pjl_pdfmark(pcl_state_t * pcs, char *pdfmark)
-{
-    char *pdfmark_start, *token_start, end, *p;
-
-    p = token_start = pdfmark_start = pdfmark + 1;
-
-    do {
-        while (*p != ' ' && *p != '"' && *p != 0x00)
-            p++;
-        if((p - token_start) != 7 || strncmp(token_start, "pdfmark", 7) != 0){
-            if (*p != 0x00)
-                token_start = ++p;
-            else
-                break;
-        } else {
-            token_start--;
-            end = *token_start;
-            *token_start = 0x00;
-            process_pdfmark(pcs, pdfmark_start);
-            *token_start = end;
-            token_start = pdfmark_start = ++p;
-        }
-    } while (*p != 0x00);
-    return 0;
-}
-
 static void
 pcjob_do_reset(pcl_state_t * pcs, pcl_reset_type_t type)
 {
@@ -560,7 +341,7 @@ pcjob_do_reset(pcl_state_t * pcs, pcl_reset_type_t type)
             pres = pjl_proc_get_envvar(pcs->pjls, "pdfmark");
 
             if (strlen(pres) > 0) {
-                pcl_pjl_pdfmark(pcs, pres);
+                pcl_pjl_pdfmark(pcs->memory, pcs->pgs->device, pres);
             }
         }
     }
diff --git a/pcl/pl/plparams.c b/pcl/pl/plparams.c
new file mode 100644
index 000000000..5f8e78e14
--- /dev/null
+++ b/pcl/pl/plparams.c
@@ -0,0 +1,245 @@
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
+
+   This software is provided AS-IS with no warranty, either express or
+   implied.
+
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
+
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
+
+
+/* plparams.c -  PJL handling of common device parameters */
+
+#include "std.h"
+#include "gsmemory.h"
+#include "gsmatrix.h"           /* for gsdevice.h */
+#include "gsdevice.h"
+#include "gsparam.h"
+#include "gp.h"
+
+static int pdfmark_write_list(gs_memory_t *mem, gx_device *device, gs_param_string_array *array_list)
+{
+    gs_c_param_list list;
+    int code;
+
+    gs_c_param_list_write(&list, mem);
+    gs_param_list_set_persistent_keys((gs_param_list *) &list, false);
+    gs_c_param_list_write_more(&list);
+    code = param_write_string_array((gs_param_list *)&list, "pdfmark", array_list);
+    if (code < 0)
+        return code;
+
+    gs_c_param_list_read(&list);
+    code = gs_putdeviceparams(device, (gs_param_list *)&list);
+
+    return code;
+}
+
+static int process_pdfmark(gs_memory_t *mem, gx_device *device, char *pdfmark)
+{
+    char *p, *type, *start, *copy, *stream_data = 0L;
+    int tokens = 0, code = 0;
+    gs_param_string *parray;
+    gs_param_string_array array_list;
+    bool putdict = false;
+
+    /* Our parsing will alter the string contents, so copy it and perform the parsing on the copy */
+    copy = (char *)gs_alloc_bytes(mem, strlen(pdfmark) + 1, "working buffer for pdfmark processing");
+    if (copy == 0)
+        return -1;
+    strcpy(copy, pdfmark);
+
+    start = copy + 1;
+    if (*pdfmark != '[') {
+        gs_free_object(mem, copy, "working buffer for pdfmark processing");
+        return -1;
+    }
+
+    p = start;
+    while (*p != 0x00){
+        if(*p == '(') {
+            while (*p != ')' && *p != 0x00) {
+                if (*p == '\\')
+                    p++;
+                p++;
+            }
+            if (*p != ')') {
+                gs_free_object(mem, copy, "working buffer for pdfmark processing");
+                return -1;
+            }
+        } else {
+            if (*p == ' ') {
+                tokens++;
+            }
+        }
+        p++;
+    }
+
+    if (*(p-1) != ' ')
+        tokens++;
+
+    /* We need an extra one for a dummy CTM */
+    tokens++;
+
+    parray = (gs_param_string *)gs_alloc_bytes(mem, tokens * sizeof(gs_param_string), "temporary pdfmark array");
+    if (!parray) {
+        gs_free_object(mem, copy, "working buffer for pdfmark processing");
+        return -1;
+    }
+
+    tokens = 0;
+    while (*start == ' ')
+        start++;
+    p = start;
+
+    while (*p != 0x00){
+        if(*p == '(') {
+            while (*p != ')' && *p != 0x00) {
+                if (*p == '\\')
+                    p++;
+                p++;
+            }
+            if (*p != ')') {
+                gs_free_object(mem, copy, "working buffer for pdfmark processing");
+                return -1;
+            }
+        } else {
+            if (*p == ' ') {
+                if (strncmp(start, "<<", 2) == 0) {
+                    putdict = true;
+                } else {
+                    if (strncmp(start, ">>", 2) != 0) {
+                        *p = 0x00;
+                        parray[tokens].data = (const byte *)start;
+                        parray[tokens].size = strlen(start);
+                        parray[tokens++].persistent = false;
+                    }
+                }
+                start = ++p;
+            } else
+                p++;
+        }
+    }
+    if (*(p-1) != ' ') {
+        parray[tokens].data = (const byte *)start;
+        parray[tokens].size = strlen(start);
+        parray[tokens++].persistent = false;
+    }
+
+    /* Move last entry up one and add a dummy CTM where it used to be */
+    parray[tokens].data = parray[tokens - 1].data;
+    parray[tokens].size = parray[tokens - 1].size;
+    parray[tokens].persistent = parray[tokens - 1].persistent;
+    parray[tokens - 1].data = (const byte *)"[0 0 0 0 0 0]";
+    parray[tokens - 1].size = 13;
+    parray[tokens - 1].persistent = false;
+
+    /* Features are name objects (ie they start with a '/') but putdeviceparams wants them
+     * as strings without the #/#, so we need to strip that here.
+     */
+    if (parray[tokens].data[0] != '/') {
+        gs_free_object(mem, copy, "working buffer for pdfmark processing");
+        gs_free_object(mem, parray, "temporary pdfmark array");
+        return -1;
+    } else {
+        parray[tokens].data++;
+        parray[tokens].size--;
+    }
+
+    /* We need to convert a 'PUT' with a dictonayr into a 'PUTDICT', this is normally done
+     * in PostScript
+     */
+    if (putdict && strncmp((const char *)(parray[tokens].data), "PUT", 3) == 0) {
+        parray[tokens].data = (const byte *)".PUTDICT";
+        parray[tokens].size = 8;
+        parray[tokens].persistent = false;
+    }
+    /* We also need some means to handle file data. Normally ths is done by creating a
+     * PostScript file object and doing a 'PUT', but we can't do that, so we define a
+     * special variety of 'PUT' called 'PUTFILE' and we handle that here.
+     */
+    if (strncmp((const char *)(parray[tokens].data), "PUTFILE", 7) == 0) {
+        FILE *f;
+        char *filename;
+        int bytes;
+
+        if (parray[tokens - 2].data[0] != '(') {
+            gs_free_object(mem, copy, "working buffer for pdfmark processing");
+            gs_free_object(mem, parray, "temporary pdfmark array");
+            return -1;
+        }
+        filename = (char *)&(parray[tokens - 2].data[1]);
+        filename[strlen(filename) - 1] = 0x00;
+
+        f = gp_fopen((const char *)filename, "rb");
+        if (!f) {
+            gs_free_object(mem, copy, "working buffer for pdfmark processing");
+            gs_free_object(mem, parray, "temporary pdfmark array");
+            return -1;
+        }
+
+        gp_fseek_64(f, 0, SEEK_END);
+        bytes = gp_ftell_64(f);
+        parray[tokens - 2].data = (const byte *)gs_alloc_bytes(mem, bytes, "PJL pdfmark, stream");
+        if (!parray[tokens - 2].data) {
+            gs_free_object(mem, copy, "working buffer for pdfmark processing");
+            gs_free_object(mem, parray, "temporary pdfmark array");
+            return -1;
+        }
+        stream_data = (char *)(parray[tokens - 2].data);
+
+        gp_fseek_64(f, 0, SEEK_SET);
+        fread(stream_data, 1, bytes, f);
+        fclose(f);
+        parray[tokens - 2].size = bytes;
+
+        parray[tokens].data = (const byte *)".PUTSTREAM";
+        parray[tokens].size = 10;
+        parray[tokens].persistent = false;
+    }
+
+    array_list.data = parray;
+    array_list.persistent = 0;
+    array_list.size = ++tokens;
+
+    code = pdfmark_write_list(mem, device, &array_list);
+
+    if (stream_data)
+        gs_free_object(mem, stream_data, "PJL pdfmark, stream");
+    gs_free_object(mem, copy, "working buffer for pdfmark processing");
+    gs_free_object(mem, parray, "temporary pdfmark array");
+
+    return code;
+}
+
+int pcl_pjl_pdfmark(gs_memory_t *mem, gx_device *device, char *pdfmark)
+{
+    char *pdfmark_start, *token_start, end, *p;
+
+    p = token_start = pdfmark_start = pdfmark + 1;
+
+    do {
+        while (*p != ' ' && *p != '"' && *p != 0x00)
+            p++;
+        if((p - token_start) != 7 || strncmp(token_start, "pdfmark", 7) != 0){
+            if (*p != 0x00)
+                token_start = ++p;
+            else
+                break;
+        } else {
+            token_start--;
+            end = *token_start;
+            *token_start = 0x00;
+            process_pdfmark(mem, device, pdfmark_start);
+            *token_start = end;
+            token_start = pdfmark_start = ++p;
+        }
+    } while (*p != 0x00);
+    return 0;
+}
diff --git a/pcl/pl/plparams.h b/pcl/pl/plparams.h
new file mode 100644
index 000000000..095c7b176
--- /dev/null
+++ b/pcl/pl/plparams.h
@@ -0,0 +1,19 @@
+/* Copyright (C) 2001-2012 Artifex Software, Inc.
+   All Rights Reserved.
+
+   This software is provided AS-IS with no warranty, either express or
+   implied.
+
+   This software is distributed under license and may not be copied,
+   modified or distributed except as expressly authorized under the terms
+   of the license contained in the file LICENSE in this distribution.
+
+   Refer to licensing information at http://www.artifex.com or contact
+   Artifex Software, Inc.,  7 Mt. Lassen Drive - Suite A-134, San Rafael,
+   CA  94903, U.S.A., +1(415)492-9861, for further information.
+*/
+
+
+/* plparams.h */
+
+int pcl_pjl_pdfmark(gs_memory_t *mem, gx_device *device, char *pdfmark);