diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-09-10 18:10:49 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-09-11 20:06:36 +0200 |
| commit | acfc02c1747065fe450c7cfeb6f1844b62335f08 (patch) | |
| tree | 5887806a2e6b99bbb0255e013a9028810e230a7f /psi | |
| parent | Import Ghostscript 9.52 (diff) | |
| download | ghostscript-gpl-patches-acfc02c1747065fe450c7cfeb6f1844b62335f08.tar.gz ghostscript-gpl-patches-acfc02c1747065fe450c7cfeb6f1844b62335f08.tar.bz2 ghostscript-gpl-patches-acfc02c1747065fe450c7cfeb6f1844b62335f08.zip | |
Import Ghostscript 9.53ghostscript-9.53
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'psi')
295 files changed, 4399 insertions, 2981 deletions
diff --git a/psi/bfont.h b/psi/bfont.h index 7a1806a3..94748f34 100644 --- a/psi/bfont.h +++ b/psi/bfont.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/btoken.h b/psi/btoken.h index 5681a983..a93f2a57 100644 --- a/psi/btoken.h +++ b/psi/btoken.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dmmain.c b/psi/dmmain.c index d19f681b..24801a99 100644 --- a/psi/dmmain.c +++ b/psi/dmmain.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dmmain.r b/psi/dmmain.r index 2991a215..1a7f2a7a 100644 --- a/psi/dmmain.r +++ b/psi/dmmain.r @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dpmain.c b/psi/dpmain.c index 7cb72078..0184892d 100644 --- a/psi/dpmain.c +++ b/psi/dpmain.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dscparse.c b/psi/dscparse.c index 0c34eb14..f7c28fc8 100644 --- a/psi/dscparse.c +++ b/psi/dscparse.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dscparse.h b/psi/dscparse.h index 60baa517..d6af4d45 100644 --- a/psi/dscparse.h +++ b/psi/dscparse.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dstack.h b/psi/dstack.h index ab99fead..e827197f 100644 --- a/psi/dstack.h +++ b/psi/dstack.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dw32c.def b/psi/dw32c.def index 6a326280..7204a2cc 100644 --- a/psi/dw32c.def +++ b/psi/dw32c.def @@ -1,4 +1,4 @@ ; 'Ghostscript Interpreter' -NAME GSWIN32C +NAME GSWIN32C HEAPSIZE 256 STACKSIZE 131072 diff --git a/psi/dw64c.def b/psi/dw64c.def index 9932c0be..5d3c0519 100644 --- a/psi/dw64c.def +++ b/psi/dw64c.def @@ -1,4 +1,4 @@ ; 'Ghostscript Interpreter' -NAME GSWIN64C +NAME GSWIN64C HEAPSIZE 256 STACKSIZE 131072 diff --git a/psi/dwdll.c b/psi/dwdll.c index 2224a0e7..f8594f8c 100644 --- a/psi/dwdll.c +++ b/psi/dwdll.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwdll.h b/psi/dwdll.h index a8066242..5422f06c 100644 --- a/psi/dwdll.h +++ b/psi/dwdll.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwimg.c b/psi/dwimg.c index 62f7f5fb..e31bf8b2 100644 --- a/psi/dwimg.c +++ b/psi/dwimg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwimg.h b/psi/dwimg.h index cbf6cea1..aff75b78 100644 --- a/psi/dwimg.h +++ b/psi/dwimg.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwmain.c b/psi/dwmain.c index de9f61cb..2fe1e9d1 100644 --- a/psi/dwmain.c +++ b/psi/dwmain.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwmain.rc b/psi/dwmain.rc index 2f8a8fa7..4b473d7b 100644 --- a/psi/dwmain.rc +++ b/psi/dwmain.rc @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwmain32.def b/psi/dwmain32.def index 3972c8cf..5da966a3 100644 --- a/psi/dwmain32.def +++ b/psi/dwmain32.def @@ -1,3 +1,3 @@ -NAME GSWIN32 +NAME GSWIN32 HEAPSIZE 256 STACKSIZE 131072 diff --git a/psi/dwmain64.def b/psi/dwmain64.def index 1b9341a9..e6a8f21e 100644 --- a/psi/dwmain64.def +++ b/psi/dwmain64.def @@ -1,3 +1,3 @@ -NAME GSWIN64 +NAME GSWIN64 HEAPSIZE 256 STACKSIZE 131072 diff --git a/psi/dwmainc.c b/psi/dwmainc.c index cc0db1f2..7fd21b91 100644 --- a/psi/dwmainc.c +++ b/psi/dwmainc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -766,7 +766,7 @@ int wmain(int argc, wchar_t *argv[], wchar_t *envp[]) { } code = main_utf8(argc, nargv); - if (0) { + if (0) { err: fprintf(stderr, "Ghostscript failed to initialise due to malloc failure\n"); diff --git a/psi/dwnodll.c b/psi/dwnodll.c index c8ea4501..382803c7 100644 --- a/psi/dwnodll.c +++ b/psi/dwnodll.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwreg.c b/psi/dwreg.c index ff7389ed..c9debca7 100644 --- a/psi/dwreg.c +++ b/psi/dwreg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwreg.h b/psi/dwreg.h index 9f75662b..bb59db68 100644 --- a/psi/dwreg.h +++ b/psi/dwreg.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwres.h b/psi/dwres.h index 26f36aef..ff6b5ed8 100644 --- a/psi/dwres.h +++ b/psi/dwres.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwsetup.def b/psi/dwsetup.def index 28fe216d..71d9b935 100644 --- a/psi/dwsetup.def +++ b/psi/dwsetup.def @@ -1,4 +1,4 @@ ; 'Ghostscript Setup' -NAME SETUPGS +NAME SETUPGS HEAPSIZE 4096 STACKSIZE 32768 diff --git a/psi/dwtext.c b/psi/dwtext.c index f690374d..39c9d9bb 100644 --- a/psi/dwtext.c +++ b/psi/dwtext.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwtext.h b/psi/dwtext.h index f6bd6ccf..e2457c8b 100644 --- a/psi/dwtext.h +++ b/psi/dwtext.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwtrace.c b/psi/dwtrace.c index 23e780bb..77b4d464 100644 --- a/psi/dwtrace.c +++ b/psi/dwtrace.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwtrace.h b/psi/dwtrace.h index 81245a36..30612792 100644 --- a/psi/dwtrace.h +++ b/psi/dwtrace.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dwuninst.def b/psi/dwuninst.def index 5a4002e2..f1c5f54c 100644 --- a/psi/dwuninst.def +++ b/psi/dwuninst.def @@ -1,4 +1,4 @@ ; 'Ghostscript uninstall' -NAME UNINSTGS +NAME UNINSTGS HEAPSIZE 4096 STACKSIZE 32768 diff --git a/psi/dxmain.c b/psi/dxmain.c index a52ec362..728effd5 100644 --- a/psi/dxmain.c +++ b/psi/dxmain.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/dxmainc.c b/psi/dxmainc.c index c95c08ca..396484ab 100644 --- a/psi/dxmainc.c +++ b/psi/dxmainc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/estack.h b/psi/estack.h index 5bc7886b..706ca4be 100644 --- a/psi/estack.h +++ b/psi/estack.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/files.h b/psi/files.h index 9895d203..2ce9c306 100644 --- a/psi/files.h +++ b/psi/files.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ghost.h b/psi/ghost.h index 683de570..d25601cb 100644 --- a/psi/ghost.h +++ b/psi/ghost.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/gsdll.c b/psi/gsdll.c index 7fb14669..670bdeef 100644 --- a/psi/gsdll.c +++ b/psi/gsdll.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/gsdll2.def b/psi/gsdll2.def index b6e198ef..0bf09f33 100644 --- a/psi/gsdll2.def +++ b/psi/gsdll2.def @@ -14,8 +14,22 @@ EXPORTS gsapi_run_file gsapi_exit gsapi_set_stdio + gsapi_set_stdio_with_handle gsapi_set_poll + gsapi_set_poll_with_handle gsapi_set_display_callback + gsapi_register_callout + gsapi_deregister_callout gsapi_set_arg_encoding gsapi_set_default_device_list gsapi_get_default_device_list + gsapi_add_control_path + gsapi_remove_control_path + gsapi_purge_control_paths + gsapi_activate_path_control + gsapi_is_path_control_active + gsapi_add_fs + gsapi_remove_fs + gsapi_set_param + gsapi_get_param + gsapi_enumerate_params diff --git a/psi/gsdll2.rc b/psi/gsdll2.rc index 0daf3971..8712aedf 100644 --- a/psi/gsdll2.rc +++ b/psi/gsdll2.rc @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/gsdll32.def b/psi/gsdll32.def index 4f31f1fd..f4b6b519 100644 --- a/psi/gsdll32.def +++ b/psi/gsdll32.def @@ -1,37 +1,40 @@ ; 'Ghostscript Interpreter DLL' -LIBRARY GSDLL32 +LIBRARY GSDLL32 EXPORTS - DllEntryPoint - DllMain - gsdll_revision @1 - gsdll_init @2 - gsdll_execute_begin @3 - gsdll_execute_cont @4 - gsdll_execute_end @5 - gsdll_exit @6 - gsdll_init_with_encoding - gsdll_initA - gsdll_initW - gsapi_revision - gsapi_new_instance - gsapi_delete_instance - gsapi_init_with_args - gsapi_run_string_begin - gsapi_run_string_continue - gsapi_run_string_end - gsapi_run_string_with_length - gsapi_run_string - gsapi_run_file - gsapi_run_fileA - gsapi_run_fileW - gsapi_exit - gsapi_set_stdio - gsapi_set_poll - gsapi_set_display_callback - gsapi_set_arg_encoding + DllEntryPoint + DllMain + gsdll_revision @1 + gsdll_init @2 + gsdll_execute_begin @3 + gsdll_execute_cont @4 + gsdll_execute_end @5 + gsdll_exit @6 + gsdll_init_with_encoding + gsdll_initA + gsdll_initW + gsapi_revision + gsapi_new_instance + gsapi_delete_instance + gsapi_init_with_args + gsapi_run_string_begin + gsapi_run_string_continue + gsapi_run_string_end + gsapi_run_string_with_length + gsapi_run_string + gsapi_run_file + gsapi_run_fileA + gsapi_run_fileW + gsapi_exit + gsapi_set_stdio + gsapi_set_stdio_with_handle + gsapi_set_poll + gsapi_set_poll_with_handle + gsapi_set_display_callback + gsapi_register_callout + gsapi_deregister_callout + gsapi_set_arg_encoding gsapi_set_default_device_list gsapi_get_default_device_list - gsapi_set_param gsapi_add_control_path gsapi_remove_control_path gsapi_purge_control_paths @@ -39,3 +42,6 @@ EXPORTS gsapi_is_path_control_active gsapi_add_fs gsapi_remove_fs + gsapi_set_param + gsapi_get_param + gsapi_enumerate_params diff --git a/psi/gsdll32.rc b/psi/gsdll32.rc index 7ef58347..ecbea88c 100644 --- a/psi/gsdll32.rc +++ b/psi/gsdll32.rc @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/gsdll32metro.def b/psi/gsdll32metro.def index 998b1e68..7e9b7ab9 100644 --- a/psi/gsdll32metro.def +++ b/psi/gsdll32metro.def @@ -1,37 +1,41 @@ ; 'Ghostscript Interpreter DLL' -LIBRARY GSDLL32METRO +LIBRARY GSDLL32METRO EXPORTS - DllEntryPoint - DllMain - gsdll_revision @1 - gsdll_init @2 - gsdll_execute_begin @3 - gsdll_execute_cont @4 - gsdll_execute_end @5 - gsdll_exit @6 - gsdll_init_with_encoding - gsdll_initA - gsdll_initW - gsapi_revision - gsapi_new_instance - gsapi_delete_instance - gsapi_init_with_args - gsapi_init_with_argsA - gsapi_init_with_argsW - gsapi_run_string_begin - gsapi_run_string_continue - gsapi_run_string_end - gsapi_run_string_with_length - gsapi_run_string - gsapi_run_file - gsapi_exit - gsapi_set_stdio - gsapi_set_poll - gsapi_set_display_callback - gsapi_set_arg_encoding + DllEntryPoint + DllMain + gsdll_revision @1 + gsdll_init @2 + gsdll_execute_begin @3 + gsdll_execute_cont @4 + gsdll_execute_end @5 + gsdll_exit @6 + gsdll_init_with_encoding + gsdll_initA + gsdll_initW + gsapi_revision + gsapi_new_instance + gsapi_delete_instance + gsapi_init_with_args + gsapi_init_with_argsA + gsapi_init_with_argsW + gsapi_run_string_begin + gsapi_run_string_continue + gsapi_run_string_end + gsapi_run_string_with_length + gsapi_run_string + gsapi_run_file + gsapi_exit + gsapi_set_stdio + gsapi_set_stdio_with_handle + gsapi_set_poll + gsapi_set_poll_with_handle + gsapi_set_display_callback + gsapi_set_display_callback_with_handle + gsapi_register_callout + gsapi_deregister_callout + gsapi_set_arg_encoding gsapi_set_default_device_list gsapi_get_default_device_list - gsapi_set_param gsapi_add_control_path gsapi_remove_control_path gsapi_purge_control_paths @@ -39,3 +43,6 @@ EXPORTS gsapi_is_path_control_active gsapi_add_fs gsapi_remove_fs + gsapi_set_param + gsapi_get_param + gsapi_enumerate_params diff --git a/psi/gsdll64.def b/psi/gsdll64.def index b1bb0383..94675e6a 100644 --- a/psi/gsdll64.def +++ b/psi/gsdll64.def @@ -1,37 +1,40 @@ ; 'Ghostscript Interpreter DLL' -LIBRARY GSDLL64 +LIBRARY GSDLL64 EXPORTS - DllEntryPoint - DllMain - gsdll_revision @1 - gsdll_init @2 - gsdll_execute_begin @3 - gsdll_execute_cont @4 - gsdll_execute_end @5 - gsdll_exit @6 - gsdll_init_with_encoding - gsdll_initA - gsdll_initW - gsapi_revision - gsapi_new_instance - gsapi_delete_instance - gsapi_init_with_args - gsapi_init_with_argsA - gsapi_init_with_argsW - gsapi_run_string_begin - gsapi_run_string_continue - gsapi_run_string_end - gsapi_run_string_with_length - gsapi_run_string - gsapi_run_file - gsapi_exit - gsapi_set_stdio - gsapi_set_poll - gsapi_set_display_callback - gsapi_set_arg_encoding + DllEntryPoint + DllMain + gsdll_revision @1 + gsdll_init @2 + gsdll_execute_begin @3 + gsdll_execute_cont @4 + gsdll_execute_end @5 + gsdll_exit @6 + gsdll_init_with_encoding + gsdll_initA + gsdll_initW + gsapi_revision + gsapi_new_instance + gsapi_delete_instance + gsapi_init_with_args + gsapi_init_with_argsA + gsapi_init_with_argsW + gsapi_run_string_begin + gsapi_run_string_continue + gsapi_run_string_end + gsapi_run_string_with_length + gsapi_run_string + gsapi_run_file + gsapi_exit + gsapi_set_stdio + gsapi_set_stdio_with_handle + gsapi_set_poll + gsapi_set_poll_with_handle + gsapi_set_display_callback + gsapi_register_callout + gsapi_deregister_callout + gsapi_set_arg_encoding gsapi_set_default_device_list gsapi_get_default_device_list - gsapi_set_param gsapi_add_control_path gsapi_remove_control_path gsapi_purge_control_paths @@ -39,3 +42,6 @@ EXPORTS gsapi_is_path_control_active gsapi_add_fs gsapi_remove_fs + gsapi_set_param + gsapi_get_param + gsapi_enumerate_params diff --git a/psi/gsdll64metro.def b/psi/gsdll64metro.def index 9a2a5d57..e234915c 100644 --- a/psi/gsdll64metro.def +++ b/psi/gsdll64metro.def @@ -1,37 +1,40 @@ ; 'Ghostscript Interpreter DLL' -LIBRARY GSDLL64METRO +LIBRARY GSDLL64METRO EXPORTS - DllEntryPoint - DllMain - gsdll_revision @1 - gsdll_init @2 - gsdll_execute_begin @3 - gsdll_execute_cont @4 - gsdll_execute_end @5 - gsdll_exit @6 - gsdll_init_with_encoding - gsdll_initA - gsdll_initW - gsapi_revision - gsapi_new_instance - gsapi_delete_instance - gsapi_init_with_args - gsapi_init_with_argsA - gsapi_init_with_argsW - gsapi_run_string_begin - gsapi_run_string_continue - gsapi_run_string_end - gsapi_run_string_with_length - gsapi_run_string - gsapi_run_file - gsapi_exit - gsapi_set_stdio - gsapi_set_poll - gsapi_set_display_callback - gsapi_set_arg_encoding + DllEntryPoint + DllMain + gsdll_revision @1 + gsdll_init @2 + gsdll_execute_begin @3 + gsdll_execute_cont @4 + gsdll_execute_end @5 + gsdll_exit @6 + gsdll_init_with_encoding + gsdll_initA + gsdll_initW + gsapi_revision + gsapi_new_instance + gsapi_delete_instance + gsapi_init_with_args + gsapi_init_with_argsA + gsapi_init_with_argsW + gsapi_run_string_begin + gsapi_run_string_continue + gsapi_run_string_end + gsapi_run_string_with_length + gsapi_run_string + gsapi_run_file + gsapi_exit + gsapi_set_stdio + gsapi_set_stdio_with_handle + gsapi_set_poll + gsapi_set_poll_with_handle + gsapi_set_display_callback + gsapi_register_callout + gsapi_deregister_callout + gsapi_set_arg_encoding gsapi_set_default_device_list gsapi_get_default_device_list - gsapi_set_param gsapi_add_control_path gsapi_remove_control_path gsapi_purge_control_paths @@ -39,3 +42,6 @@ EXPORTS gsapi_is_path_control_active gsapi_add_fs gsapi_remove_fs + gsapi_set_param + gsapi_get_param + gsapi_enumerate_params diff --git a/psi/gsdllARM32metro.def b/psi/gsdllARM32metro.def index a9bfdc57..85178f74 100644 --- a/psi/gsdllARM32metro.def +++ b/psi/gsdllARM32metro.def @@ -1,34 +1,38 @@ ; 'Ghostscript Interpreter DLL' -LIBRARY GSDLLARM32METRO +LIBRARY GSDLLARM32METRO EXPORTS - DllEntryPoint - DllMain - gsdll_revision @1 - gsdll_init @2 - gsdll_execute_begin @3 - gsdll_execute_cont @4 - gsdll_execute_end @5 - gsdll_exit @6 - gsdll_init_with_encoding - gsdll_initA - gsdll_initW - gsapi_revision - gsapi_new_instance - gsapi_delete_instance - gsapi_init_with_args - gsapi_init_with_argsA - gsapi_init_with_argsW - gsapi_run_string_begin - gsapi_run_string_continue - gsapi_run_string_end - gsapi_run_string_with_length - gsapi_run_string - gsapi_run_file - gsapi_exit - gsapi_set_stdio - gsapi_set_poll - gsapi_set_display_callback - gsapi_set_arg_encoding + DllEntryPoint + DllMain + gsdll_revision @1 + gsdll_init @2 + gsdll_execute_begin @3 + gsdll_execute_cont @4 + gsdll_execute_end @5 + gsdll_exit @6 + gsdll_init_with_encoding + gsdll_initA + gsdll_initW + gsapi_revision + gsapi_new_instance + gsapi_delete_instance + gsapi_init_with_args + gsapi_init_with_argsA + gsapi_init_with_argsW + gsapi_run_string_begin + gsapi_run_string_continue + gsapi_run_string_end + gsapi_run_string_with_length + gsapi_run_string + gsapi_run_file + gsapi_exit + gsapi_set_stdio + gsapi_set_stdio_with_handle + gsapi_set_poll + gsapi_set_poll_with_handle + gsapi_set_display_callback + gsapi_register_callout + gsapi_deregister_callout + gsapi_set_arg_encoding gsapi_set_default_device_list gsapi_get_default_device_list gsapi_set_param @@ -39,3 +43,6 @@ EXPORTS gsapi_is_path_control_active gsapi_add_fs gsapi_remove_fs + gsapi_set_param + gsapi_get_param + gsapi_enumerate_params diff --git a/psi/gserver.c b/psi/gserver.c index 4b8ebf5c..ca3a3d02 100644 --- a/psi/gserver.c +++ b/psi/gserver.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/gsos2.def b/psi/gsos2.def index 227a9fc1..029b8d8a 100644 --- a/psi/gsos2.def +++ b/psi/gsos2.def @@ -1,3 +1,3 @@ NAME GSOS2 WINDOWCOMPAT -DESCRIPTION 'Ghostscript OS/2 EXE' +DESCRIPTION 'Ghostscript OS/2 EXE' STACKSIZE 131072 diff --git a/psi/gsos2.rc b/psi/gsos2.rc index 9bcc0341..aa6c9c95 100644 --- a/psi/gsos2.rc +++ b/psi/gsos2.rc @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ialloc.c b/psi/ialloc.c index e8dd4ad1..f99398d4 100644 --- a/psi/ialloc.c +++ b/psi/ialloc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -199,9 +199,9 @@ gs_alloc_ref_array(gs_ref_memory_t * mem, ref * parr, uint attrs, ref *end; obj = (ref *) mem->cc->rtop - 1; /* back up over last ref */ - if_debug4m('A', (const gs_memory_t *)mem, "[a%d:+$ ]%s(%u) = 0x%lx\n", + if_debug4m('A', (const gs_memory_t *)mem, "[a%d:+$ ]%s(%u) = "PRI_INTPTR"\n", ialloc_trace_space(mem), client_name_string(cname), - num_refs, (ulong) obj); + num_refs, (intptr_t)obj); mem->cc->rcur[-1].o_size += num_refs * sizeof(ref); end = (ref *) (mem->cc->rtop = mem->cc->cbot += num_refs * sizeof(ref)); @@ -285,16 +285,16 @@ gs_resize_ref_array(gs_ref_memory_t * mem, ref * parr, ref *end = (ref *) (mem->cc->cbot = mem->cc->rtop -= diff * sizeof(ref)); - if_debug4m('A', (const gs_memory_t *)mem, "[a%d:<$ ]%s(%u) 0x%lx\n", + if_debug4m('A', (const gs_memory_t *)mem, "[a%d:<$ ]%s(%u) "PRI_INTPTR"\n", ialloc_trace_space(mem), client_name_string(cname), diff, - (ulong) obj); + (intptr_t)obj); mem->cc->rcur[-1].o_size -= diff * sizeof(ref); make_mark(end - 1); } else { /* Punt. */ - if_debug4m('A', (const gs_memory_t *)mem, "[a%d:<$#]%s(%u) 0x%lx\n", + if_debug4m('A', (const gs_memory_t *)mem, "[a%d:<$#]%s(%u) "PRI_INTPTR"\n", ialloc_trace_space(mem), client_name_string(cname), diff, - (ulong) obj); + (intptr_t)obj); mem->lost.refs += diff * sizeof(ref); } r_set_size(parr, new_num_refs); @@ -329,9 +329,9 @@ gs_free_ref_array(gs_ref_memory_t * mem, ref * parr, client_name_t cname) mem->cc->rtop = 0; } else { /* Deallocate it at the end of the refs object. */ - if_debug4m('A', (const gs_memory_t *)mem, "[a%d:-$ ]%s(%u) 0x%lx\n", + if_debug4m('A', (const gs_memory_t *)mem, "[a%d:-$ ]%s(%u) "PRI_INTPTR"\n", ialloc_trace_space(mem), client_name_string(cname), - num_refs, (ulong) obj); + num_refs, (intptr_t)obj); mem->cc->rcur[-1].o_size -= num_refs * sizeof(ref); mem->cc->rtop = mem->cc->cbot = (byte *) (obj + 1); make_mark(obj); @@ -350,9 +350,9 @@ gs_free_ref_array(gs_ref_memory_t * mem, ref * parr, client_name_t cname) (byte *) (obj + (num_refs + 1)) == cl.cp->cend ) { /* Free the clump. */ - if_debug4m('a', (const gs_memory_t *)mem, "[a%d:-$L]%s(%u) 0x%lx\n", + if_debug4m('a', (const gs_memory_t *)mem, "[a%d:-$L]%s(%u) "PRI_INTPTR"\n", ialloc_trace_space(mem), client_name_string(cname), - num_refs, (ulong) obj); + num_refs, (intptr_t)obj); if ((gs_memory_t *)mem != mem->stable_memory) { alloc_save_remove(mem, (ref_packed *)obj, "gs_free_ref_array"); } @@ -362,9 +362,9 @@ gs_free_ref_array(gs_ref_memory_t * mem, ref * parr, client_name_t cname) } /* Punt, but fill the array with nulls so that there won't be */ /* dangling references to confuse the garbage collector. */ - if_debug4m('A', (const gs_memory_t *)mem, "[a%d:-$#]%s(%u) 0x%lx\n", + if_debug4m('A', (const gs_memory_t *)mem, "[a%d:-$#]%s(%u) "PRI_INTPTR"\n", ialloc_trace_space(mem), client_name_string(cname), num_refs, - (ulong) obj); + (intptr_t)obj); { uint size; @@ -386,8 +386,8 @@ gs_free_ref_array(gs_ref_memory_t * mem, ref * parr, client_name_t cname) size = num_refs * sizeof(ref); break; default: - lprintf3("Unknown type 0x%x in free_ref_array(%u,0x%lx)!", - r_type(parr), num_refs, (ulong) obj); + lprintf3("Unknown type 0x%x in free_ref_array(%u,"PRI_INTPTR")!", + r_type(parr), num_refs, (intptr_t)obj); return; } /* diff --git a/psi/ialloc.h b/psi/ialloc.h index d47039e8..7887cfa9 100644 --- a/psi/ialloc.h +++ b/psi/ialloc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -33,6 +33,9 @@ #include "gslibctx.h" #include "gp.h" #include "gsargs.h" +#include "gdevdsp.h" +#include "gsstate.h" +#include "icstate.h" typedef struct { int a[(int)GS_ARG_ENCODING_LOCAL == (int)PS_ARG_ENCODING_LOCAL ? 1 : -1]; } compile_time_assert_0; typedef struct { int a[(int)GS_ARG_ENCODING_UTF8 == (int)PS_ARG_ENCODING_UTF8 ? 1 : -1]; } compile_time_assert_1; @@ -84,9 +87,25 @@ gsapi_set_stdio(void *instance, gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)instance; if (instance == NULL) return gs_error_Fatal; + return gsapi_set_stdio_with_handle(instance, + stdin_fn, stdout_fn, stderr_fn, + ctx->core->default_caller_handle); +} + +GSDLLEXPORT int GSDLLAPI +gsapi_set_stdio_with_handle(void *instance, + int(GSDLLCALL *stdin_fn)(void *caller_handle, char *buf, int len), + int(GSDLLCALL *stdout_fn)(void *caller_handle, const char *str, int len), + int(GSDLLCALL *stderr_fn)(void *caller_handle, const char *str, int len), + void *caller_handle) +{ + gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)instance; + if (instance == NULL) + return gs_error_Fatal; ctx->core->stdin_fn = stdin_fn; ctx->core->stdout_fn = stdout_fn; ctx->core->stderr_fn = stderr_fn; + ctx->core->std_caller_handle = caller_handle; return 0; } @@ -98,25 +117,97 @@ gsapi_set_poll(void *instance, gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)instance; if (instance == NULL) return gs_error_Fatal; + return gsapi_set_poll_with_handle(instance, poll_fn, + ctx->core->default_caller_handle); +} + +GSDLLEXPORT int GSDLLAPI +gsapi_set_poll_with_handle(void *instance, + int(GSDLLCALL *poll_fn)(void *caller_handle), + void *caller_handle) +{ + gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)instance; + if (instance == NULL) + return gs_error_Fatal; ctx->core->poll_fn = poll_fn; + ctx->core->poll_caller_handle = caller_handle; return 0; } +static int +legacy_display_callout(void *instance, + void *handle, + const char *dev_name, + int id, + int size, + void *data) +{ + gs_main_instance *inst = (gs_main_instance *)instance; + + if (dev_name == NULL) + return -1; + if (strcmp(dev_name, "display") != 0) + return -1; + + if (id == DISPLAY_CALLOUT_GET_CALLBACK_LEGACY) { + /* get display callbacks */ + gs_display_get_callback_t *cb = (gs_display_get_callback_t *)data; + cb->callback = inst->display; + return 0; + } + return -1; +} + /* Set the display callback structure */ GSDLLEXPORT int GSDLLAPI gsapi_set_display_callback(void *instance, display_callback *callback) { gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)instance; + gs_main_instance *minst; + int code; if (instance == NULL) return gs_error_Fatal; - get_minst_from_memory(ctx->memory)->display = callback; + minst = get_minst_from_memory(ctx->memory); + if (minst->display == NULL && callback != NULL) { + /* First registration. */ + code = gs_lib_ctx_register_callout(minst->heap, + legacy_display_callout, + minst); + if (code < 0) + return code; + } + if (minst->display != NULL && callback == NULL) { + /* Deregistered. */ + gs_lib_ctx_deregister_callout(minst->heap, + legacy_display_callout, + minst); + } + minst->display = callback; /* not in a language switched build */ return 0; } +GSDLLEXPORT int GSDLLAPI +gsapi_register_callout(void *instance, gs_callout fn, void *handle) +{ + gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)instance; + if (instance == NULL) + return gs_error_Fatal; + return gs_lib_ctx_register_callout(ctx->memory, fn, handle); +} + +GSDLLEXPORT void GSDLLAPI +gsapi_deregister_callout(void *instance, gs_callout fn, void *handle) +{ + gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)instance; + if (instance == NULL) + return; + gs_lib_ctx_deregister_callout(ctx->memory, fn, handle); +} + /* Set/Get the default device list string */ GSDLLEXPORT int GSDLLAPI -gsapi_set_default_device_list(void *instance, char *list, int listlen) +gsapi_set_default_device_list(void *instance, const char *list, int listlen) { gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)instance; if (instance == NULL) @@ -311,12 +402,376 @@ gsapi_exit(void *instance) } GSDLLEXPORT int GSDLLAPI -gsapi_set_param(void *lib, gs_set_param_type type, const char *param, const void *value) +gsapi_set_param(void *lib, const char *param, const void *value, gs_set_param_type type) { + int code = 0; + gs_param_string str_value; + bool bval; + int more_to_come = type & gs_spt_more_to_come; + gs_main_instance *minst; + gs_c_param_list *params; gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)lib; + if (lib == NULL) return gs_error_Fatal; - return psapi_set_param(ctx, (psapi_sptype)type, param, value); + minst = get_minst_from_memory(ctx->memory); + + /* First off, ensure we have a param list to work with. */ + params = minst->param_list; + if (params == NULL) { + params = minst->param_list = + gs_c_param_list_alloc(minst->heap, "gs_main_instance_param_list"); + if (params == NULL) + return_error(gs_error_VMerror); + gs_c_param_list_write(params, minst->heap); + gs_param_list_set_persistent_keys((gs_param_list *)params, false); + } + + type &= ~gs_spt_more_to_come; + + /* Set the passed param in the device params */ + gs_c_param_list_write_more(params); + switch (type) + { + case gs_spt_null: + code = param_write_null((gs_param_list *) params, + param); + break; + case gs_spt_bool: + bval = !!*(int *)value; + code = param_write_bool((gs_param_list *) params, + param, &bval); + break; + case gs_spt_int: + code = param_write_int((gs_param_list *) params, + param, (int *)value); + break; + case gs_spt_float: + code = param_write_float((gs_param_list *) params, + param, (float *)value); + break; + case gs_spt_name: + param_string_from_transient_string(str_value, value); + code = param_write_name((gs_param_list *) params, + param, &str_value); + break; + case gs_spt_string: + param_string_from_transient_string(str_value, value); + code = param_write_string((gs_param_list *) params, + param, &str_value); + break; + case gs_spt_long: + code = param_write_long((gs_param_list *) params, + param, (long *)value); + break; + case gs_spt_i64: + code = param_write_i64((gs_param_list *) params, + param, (int64_t *)value); + break; + case gs_spt_size_t: + code = param_write_size_t((gs_param_list *) params, + param, (size_t *)value); + break; + case gs_spt_parsed: + code = gs_param_list_add_parsed_value((gs_param_list *)params, + param, (void *)value); + break; + default: + code = gs_note_error(gs_error_rangecheck); + } + if (code < 0) { + gs_c_param_list_release(params); + return code; + } + gs_c_param_list_read(params); + + if (more_to_come || minst->i_ctx_p == NULL) { + /* Leave it in the param list for later. */ + return 0; + } + + /* Send it to the device. */ + code = psapi_set_device_param(ctx, (gs_param_list *)params); + if (code < 0) + return code; + + code = psapi_set_param(ctx, (gs_param_list *)params); + if (code < 0) + return code; + + /* Trigger an initgraphics */ + code = gs_initgraphics(minst->i_ctx_p->pgs); + + gs_c_param_list_release(params); + + return code; +} + +GSDLLEXPORT int GSDLLAPI +gsapi_get_param(void *lib, const char *param, void *value, gs_set_param_type type) +{ + int code = 0; + gs_param_string str_value; + gs_c_param_list params; + gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)lib; + + if (lib == NULL) + return gs_error_Fatal; + + gs_c_param_list_write(¶ms, ctx->memory); + + /* Should never be set, but clear the more to come bit anyway in case. */ + type &= ~gs_spt_more_to_come; + + code = psapi_get_device_params(ctx, (gs_param_list *)¶ms); + if (code < 0) { + gs_c_param_list_release(¶ms); + return code; + } + + gs_c_param_list_read(¶ms); + switch (type) + { + case gs_spt_null: + code = param_read_null((gs_param_list *)¶ms, param); + if (code == 1) + code = gs_error_undefined; + if (code < 0) + break; + code = 0; + break; + case gs_spt_bool: + { + bool b; + code = param_read_bool((gs_param_list *)¶ms, param, &b); + if (code == 1) + code = gs_error_undefined; + if (code < 0) + break; + code = sizeof(int); + if (value != NULL) + *(int *)value = !!b; + break; + } + case gs_spt_int: + { + int i; + code = param_read_int((gs_param_list *)¶ms, param, &i); + if (code == 1) + code = gs_error_undefined; + if (code < 0) + break; + code = sizeof(int); + if (value != NULL) + *(int *)value = i; + break; + } + case gs_spt_float: + { + float f; + code = param_read_float((gs_param_list *)¶ms, param, &f); + if (code == 1) + code = gs_error_undefined; + if (code < 0) + break; + code = sizeof(float); + if (value != NULL) + *(float *)value = f; + break; + } + case gs_spt_name: + code = param_read_name((gs_param_list *)¶ms, param, &str_value); + if (code == 1) + code = gs_error_undefined; + if (code < 0) + break; + if (value != NULL) { + memcpy(value, str_value.data, str_value.size); + ((char *)value)[str_value.size] = 0; + } + code = str_value.size+1; + break; + case gs_spt_string: + code = param_read_string((gs_param_list *)¶ms, param, &str_value); + if (code == 1) + code = gs_error_undefined; + if (code < 0) + break; + if (value != NULL) { + memcpy(value, str_value.data, str_value.size); + ((char *)value)[str_value.size] = 0; + } + code = str_value.size+1; + break; + case gs_spt_long: + { + long l; + code = param_read_long((gs_param_list *)¶ms, param, &l); + if (code == 1) + code = gs_error_undefined; + if (code < 0) + break; + if (value != NULL) + *(long *)value = l; + code = sizeof(long); + break; + } + case gs_spt_i64: + { + int64_t i64; + code = param_read_i64((gs_param_list *)¶ms, param, &i64); + if (code == 1) + code = gs_error_undefined; + if (code < 0) + break; + if (value != NULL) + *(int64_t *)value = i64; + code = sizeof(int64_t); + break; + } + case gs_spt_size_t: + { + size_t z; + code = param_read_size_t((gs_param_list *)¶ms, param, &z); + if (code == 1) + code = gs_error_undefined; + if (code < 0) + break; + if (value != NULL) + *(size_t *)value = z; + code = sizeof(size_t); + break; + } + case gs_spt_parsed: + { + int len; + code = gs_param_list_to_string((gs_param_list *)¶ms, + param, (char *)value, &len); + if (code == 1) + code = gs_error_undefined; + if (code >= 0) + code = len; + break; + } + default: + code = gs_note_error(gs_error_rangecheck); + } + gs_c_param_list_release(¶ms); + + return code; +} + +GSDLLEXPORT int GSDLLAPI +gsapi_enumerate_params(void *instance, void **iter, const char **key, gs_set_param_type *type) +{ + gs_main_instance *minst; + gs_c_param_list *params; + gs_lib_ctx_t *ctx = (gs_lib_ctx_t *)instance; + int code = 0; + gs_param_key_t keyp; + + if (ctx == NULL) + return gs_error_Fatal; + + minst = get_minst_from_memory(ctx->memory); + params = &minst->enum_params; + + if (key == NULL) + return -1; + *key = NULL; + if (iter == NULL) + return -1; + + if (*iter == NULL) { + /* Free any existing param list. */ + gs_c_param_list_release(params); + if (minst->i_ctx_p == NULL) { + return 1; + } + /* Set up a new one. */ + gs_c_param_list_write(params, minst->heap); + /* Get the keys. */ + code = psapi_get_device_params(ctx, (gs_param_list *)params); + if (code < 0) + return code; + + param_init_enumerator(&minst->enum_iter); + *iter = &minst->enum_iter; + } else if (*iter != &minst->enum_iter) + return -1; + + gs_c_param_list_read(params); + code = param_get_next_key((gs_param_list *)params, &minst->enum_iter, &keyp); + if (code < 0) + return code; + if (code != 0) { + /* End of iteration. */ + *iter = NULL; + return 1; + } + if (minst->enum_keybuf_max < keyp.size+1) { + int newsize = keyp.size+1; + char *newkey; + if (newsize < 128) + newsize = 128; + if (minst->enum_keybuf == NULL) { + newkey = (char *)gs_alloc_bytes(minst->heap, newsize, "enumerator key buffer"); + } else { + newkey = (char *)gs_resize_object(minst->heap, minst->enum_keybuf, newsize, "enumerator key buffer"); + } + if (newkey == NULL) + return_error(gs_error_VMerror); + minst->enum_keybuf = newkey; + minst->enum_keybuf_max = newsize; + } + memcpy(minst->enum_keybuf, keyp.data, keyp.size); + minst->enum_keybuf[keyp.size] = 0; + *key = minst->enum_keybuf; + + if (type) { + gs_param_typed_value pvalue; + pvalue.type = gs_param_type_any; + code = param_read_typed((gs_param_list *)params, *key, &pvalue); + if (code < 0) + return code; + if (code > 0) + return_error(gs_error_unknownerror); + + switch (pvalue.type) { + case gs_param_type_null: + *type = gs_spt_null; + break; + case gs_param_type_bool: + *type = gs_spt_bool; + break; + case gs_param_type_int: + *type = gs_spt_int; + break; + case gs_param_type_long: + *type = gs_spt_long; + break; + case gs_param_type_size_t: + *type = gs_spt_size_t; + break; + case gs_param_type_i64: + *type = gs_spt_i64; + break; + case gs_param_type_float: + *type = gs_spt_float; + break; + case gs_param_type_string: + *type = gs_spt_string; + break; + case gs_param_type_name: + *type = gs_spt_name; + break; + default: + *type = gs_spt_parsed; + break; + } + } + + return code; } GSDLLEXPORT int GSDLLAPI @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -196,6 +196,15 @@ gsapi_set_stdio(void *instance, int (GSDLLCALLPTR stdout_fn)(void *caller_handle, const char *str, int len), int (GSDLLCALLPTR stderr_fn)(void *caller_handle, const char *str, int len)); +/* Does the same as the above, but using the caller_handle given here, + * rather than the default one specified at gsapi_new_instance time. */ +GSDLLEXPORT int GSDLLAPI +gsapi_set_stdio_with_handle(void *instance, + int (GSDLLCALLPTR stdin_fn)(void *caller_handle, char *buf, int len), + int (GSDLLCALLPTR stdout_fn)(void *caller_handle, const char *str, int len), + int (GSDLLCALLPTR stderr_fn)(void *caller_handle, const char *str, int len), + void *caller_handle); + /* Set the callback function for polling. * This is used for handling window events or cooperative * multitasking. This function will only be called if @@ -208,14 +217,52 @@ gsapi_set_stdio(void *instance, GSDLLEXPORT int GSDLLAPI gsapi_set_poll(void *instance, int (GSDLLCALLPTR poll_fn)(void *caller_handle)); +/* Does the same as the above, but using the caller_handle given here, + * rather than the default one specified at gsapi_new_instance time. */ +GSDLLEXPORT int GSDLLAPI gsapi_set_poll_with_handle(void *instance, + int (GSDLLCALLPTR poll_fn)(void *caller_handle), void *caller_handle); + /* Set the display device callback structure. * If the display device is used, this must be called * after gsapi_new_instance() and before gsapi_init_with_args(). * See gdevdisp.h for more details. + * DEPRECATED: Use the gsapi_register_callback mechanism instead. */ GSDLLEXPORT int GSDLLAPI gsapi_set_display_callback( void *instance, display_callback *callback); +/* The callout mechanism allows devices to query "callers" (users of the + * DLL) in device specific ways. The callout function pointer type will + * be called with: + * callout_handle = the value given at registration + * device_name = the name of the current device + * id = An integer, guaranteed to be unique within the + * callouts from a given device, identifying the + * purpose of this call. + * size = device/id specific, but typically the size of 'data'. + * data = device/id specific, but typically the pointer to + * an in/out data block. + * Returns an error code (gs_error_unknownerror (-1) if unclaimed, + * non-negative on success, standard gs error numbers recommended). + */ +typedef int (*gs_callout)(void *instance, + void *callout_handle, + const char *device_name, + int id, + int size, + void *data); + +/* Register a handler for gs callouts. + * This must be called after gsapi_new_instance() and (typically) + * before gsapi_init_with_args(). + */ +GSDLLEXPORT int GSDLLAPI gsapi_register_callout( + void *instance, gs_callout callout, void *callout_handle); + +/* Deregister a handler for gs callouts. */ +GSDLLEXPORT void GSDLLAPI gsapi_deregister_callout( + void *instance, gs_callout callout, void *callout_handle); + /* Set the string containing the list of default device names * for example "display x11alpha x11 bbox". Allows the calling * application to influence which device(s) gs will try in order @@ -225,7 +272,7 @@ GSDLLEXPORT int GSDLLAPI gsapi_set_display_callback( * gsapi_init_with_args(). */ GSDLLEXPORT int GSDLLAPI -gsapi_set_default_device_list(void *instance, char *list, int listlen); +gsapi_set_default_device_list(void *instance, const char *list, int listlen); /* Returns a pointer to the current default device string * *Must* be called after gsapi_new_instance(). @@ -325,13 +372,63 @@ gsapi_exit(void *instance); typedef enum { gs_spt_invalid = -1, gs_spt_null = 0, /* void * is NULL */ - gs_spt_bool = 1, /* void * is NULL (false) or non-NULL (true) */ + gs_spt_bool = 1, /* void * is a pointer to an int (0 false, + * non-zero true). */ gs_spt_int = 2, /* void * is a pointer to an int */ gs_spt_float = 3, /* void * is a float * */ gs_spt_name = 4, /* void * is a char * */ - gs_spt_string = 5 /* void * is a char * */ + gs_spt_string = 5, /* void * is a char * */ + gs_spt_long = 6, /* void * is a long * */ + gs_spt_i64 = 7, /* void * is an int64_t * */ + gs_spt_size_t = 8, /* void * is a size_t * */ + gs_spt_parsed = 9, /* void * is a pointer to a char * to be parsed */ + + /* Setting a typed param causes it to be instantly fed to to the + * device. This can cause the device to reinitialise itself. Hence, + * setting a sequence of typed params can cause the device to reset + * itself several times. Accordingly, if you OR the type with + * gs_spt_more_to_come, the param will held ready to be passed into + * the device, and will only actually be sent when the next typed + * param is set without this flag (or on device init). Not valid + * for get_typed_param. */ + gs_spt_more_to_come = 1<<31 } gs_set_param_type; -GSDLLEXPORT int GSDLLAPI gsapi_set_param(void *instance, gs_set_param_type type, const char *param, const void *value); +/* gs_spt_parsed allows for a string such as "<< /Foo 0 /Bar true >>" or + * "[ 1 2 3 ]" etc to be used so more complex parameters can be set. */ + +GSDLLEXPORT int GSDLLAPI gsapi_set_param(void *instance, const char *param, const void *value, gs_set_param_type type); + +/* Called to get a value. value points to storage of the appropriate + * type. If value is passed as NULL on entry, then the return code is + * the number of bytes storage required for the type. Thus to read a + * name/string/parsed value, call once with value=NULL, then obtain + * the storage, and call again with value=the storage to get a nul + * terminated string. (nul terminator is included in the count - hence + * an empty string requires 1 byte storage). Returns gs_error_undefined + * (-21) if not found. */ +GSDLLEXPORT int GSDLLAPI gsapi_get_param(void *instance, const char *param, void *value, gs_set_param_type type); + +/* Enumerator to list all the parameters. + * Caller defines void *iter = NULL, and calls with &iter. + * Each call, iter is updated to reflect the position within the + * enumeration, so passing iterator back in gets the next key. The call + * returns negative values for errors, 0 for success, and 1 for "no more + * keys". + * + * void *iter = NULL; + * gs_set_param_type type; + * const char *key; + * int code; + * while ((code = gsapi_enumerate_params(inst, &iter, &key, &type)) == 0) { + * // Process key + * } + * + * Note that the ordering of enumerations is NOT defined. key is valid + * until the next call to gsapi_enumerate_params. Only one enumeration + * at a time (starting a new enumeration will invalidate any previous + * enumeration). + */ +GSDLLEXPORT int GSDLLAPI gsapi_enumerate_params(void *instance, void **iterator, const char **key, gs_set_param_type *type); enum { GS_PERMIT_FILE_READING = 0, @@ -455,7 +552,7 @@ typedef int (GSDLLAPIPTR PFN_gsapi_run_fileW)(void *instance, const wchar_t *file_name, int user_errors, int *pexit_code); #endif typedef int (GSDLLAPIPTR PFN_gsapi_exit)(void *instance); -typedef int (GSDLLAPIPTR PFN_gsapi_set_param)(void *instance, gs_set_param_type type, const char *param, const void *value); +typedef int (GSDLLAPIPTR PFN_gsapi_set_param)(void *instance, const char *param, const void *value, gs_set_param_type type); typedef int (GSDLLAPIPTR PFN_gsapi_add_control_path)(void *instance, int type, const char *path); typedef int (GSDLLAPIPTR PFN_gsapi_remove_control_path)(void *instance, int type, const char *path); diff --git a/psi/iastate.h b/psi/iastate.h index ed405ba8..98cdd3fd 100644 --- a/psi/iastate.h +++ b/psi/iastate.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iastruct.h b/psi/iastruct.h index d09991df..211aa564 100644 --- a/psi/iastruct.h +++ b/psi/iastruct.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ibnum.c b/psi/ibnum.c index 7a63cd7b..96230360 100644 --- a/psi/ibnum.c +++ b/psi/ibnum.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ibnum.h b/psi/ibnum.h index 4827fb38..42607895 100644 --- a/psi/ibnum.h +++ b/psi/ibnum.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ichar.h b/psi/ichar.h index 94f10b8a..18ecb005 100644 --- a/psi/ichar.h +++ b/psi/ichar.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ichar1.h b/psi/ichar1.h index 5874a905..f516c166 100644 --- a/psi/ichar1.h +++ b/psi/ichar1.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/icharout.h b/psi/icharout.h index d6280f94..0c9a24d9 100644 --- a/psi/icharout.h +++ b/psi/icharout.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/icolor.h b/psi/icolor.h index 523ba440..acea9234 100644 --- a/psi/icolor.h +++ b/psi/icolor.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iconf.c b/psi/iconf.c index 0b8ac463..18031142 100644 --- a/psi/iconf.c +++ b/psi/iconf.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iconf.h b/psi/iconf.h index a01aeae6..3273de40 100644 --- a/psi/iconf.h +++ b/psi/iconf.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/icontext.c b/psi/icontext.c index e7ad2bac..032522fa 100644 --- a/psi/icontext.c +++ b/psi/icontext.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/icontext.h b/psi/icontext.h index a27732a7..1ba03bc5 100644 --- a/psi/icontext.h +++ b/psi/icontext.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/icremap.h b/psi/icremap.h index 3c8e9e2e..e36d13f1 100644 --- a/psi/icremap.h +++ b/psi/icremap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/icsmap.h b/psi/icsmap.h index 5a09de66..72b91446 100644 --- a/psi/icsmap.h +++ b/psi/icsmap.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/icstate.h b/psi/icstate.h index b06ba3fe..2e66f6b5 100644 --- a/psi/icstate.h +++ b/psi/icstate.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iddict.h b/psi/iddict.h index c623a397..e6e41cdc 100644 --- a/psi/iddict.h +++ b/psi/iddict.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iddstack.h b/psi/iddstack.h index 2f72866b..58d306fb 100644 --- a/psi/iddstack.h +++ b/psi/iddstack.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/idebug.c b/psi/idebug.c index 442eb766..02c4265a 100644 --- a/psi/idebug.c +++ b/psi/idebug.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -66,7 +66,7 @@ debug_print_full_ref(const gs_memory_t *mem, const ref * pref) dmprintf1(mem, "(%x)", r_type_attrs(pref)); switch (r_type(pref)) { case t_array: - dmprintf2(mem, "array(%u)0x%lx", size, (ulong) pref->value.refs); + dmprintf2(mem, "array(%u)"PRI_INTPTR, size, (intptr_t)pref->value.refs); break; case t_astruct: goto strct; @@ -74,15 +74,15 @@ debug_print_full_ref(const gs_memory_t *mem, const ref * pref) dmprintf1(mem, "boolean %x", pref->value.boolval); break; case t_device: - dmprintf1(mem, "device 0x%lx", (ulong) pref->value.pdevice); + dmprintf1(mem, "device "PRI_INTPTR, (intptr_t) pref->value.pdevice); break; case t_dictionary: - dmprintf3(mem, "dict(%u/%u)0x%lx", + dmprintf3(mem, "dict(%u/%u)"PRI_INTPTR, dict_length(pref), dict_maxlength(pref), - (ulong) pref->value.pdict); + (intptr_t)pref->value.pdict); break; case t_file: - dmprintf1(mem, "file 0x%lx", (ulong) pref->value.pfile); + dmprintf1(mem, "file "PRI_INTPTR, (intptr_t)pref->value.pfile); break; case t_fontID: goto strct; @@ -93,11 +93,11 @@ debug_print_full_ref(const gs_memory_t *mem, const ref * pref) dmprintf(mem, "mark"); break; case t_mixedarray: - dmprintf2(mem, "mixed packedarray(%u)0x%lx", size, - (ulong) pref->value.packed); + dmprintf2(mem, "mixed packedarray(%u)"PRI_INTPTR"", size, + (intptr_t)pref->value.packed); break; case t_name: - dmprintf2(mem, "name(0x%lx#%u)", (ulong) pref->value.pname, + dmprintf2(mem, "name("PRI_INTPTR"#%u)", (intptr_t)pref->value.pname, name_index(mem, pref)); debug_print_name(mem, pref); break; @@ -105,7 +105,7 @@ debug_print_full_ref(const gs_memory_t *mem, const ref * pref) dmprintf(mem, "null"); break; case t_oparray: - dmprintf2(mem, "op_array(%u)0x%lx:", size, (ulong) pref->value.const_refs); + dmprintf2(mem, "op_array(%u)"PRI_INTPTR":", size, (intptr_t) pref->value.const_refs); { const op_array_table *opt = get_op_array(mem, size); @@ -117,7 +117,7 @@ debug_print_full_ref(const gs_memory_t *mem, const ref * pref) dmprintf1(mem, "op(%u", size); if (size > 0 && size < op_def_count) /* just in case */ dmprintf1(mem, ":%s", (const char *)(op_index_def(size)->oname + 1)); - dmprintf1(mem, ")0x%lx", (ulong) pref->value.opproc); + dmprintf1(mem, ")"PRI_INTPTR"", (intptr_t)pref->value.opproc); break; case t_real: dmprintf1(mem, "real %f", pref->value.realval); @@ -126,11 +126,11 @@ debug_print_full_ref(const gs_memory_t *mem, const ref * pref) dmprintf1(mem, "save %lu", pref->value.saveid); break; case t_shortarray: - dmprintf2(mem, "short packedarray(%u)0x%lx", size, - (ulong) pref->value.packed); + dmprintf2(mem, "short packedarray(%u)"PRI_INTPTR"", size, + (intptr_t)pref->value.packed); break; case t_string: - dmprintf2(mem, "string(%u)0x%lx", size, (ulong) pref->value.bytes); + dmprintf2(mem, "string(%u)"PRI_INTPTR"", size, (intptr_t)pref->value.bytes); break; case t_struct: strct:{ @@ -139,10 +139,10 @@ debug_print_full_ref(const gs_memory_t *mem, const ref * pref) gs_memory_type_ptr_t otype = gs_ref_memory_procs.object_type(NULL, obj); - dmprintf2(mem, "struct %s 0x%lx", + dmprintf2(mem, "struct %s "PRI_INTPTR"", (r_is_foreign(pref) ? "-foreign-" : gs_struct_type_name_string(otype)), - (ulong) obj); + (intptr_t)obj); } break; default: @@ -170,7 +170,7 @@ debug_print_packed_ref(const gs_memory_t *mem, const ref_packed *pref) case pt_executable_name: dmprintf(mem, "<exec_name>"); ptn: name_index_ref(mem, elt, &nref); - dmprintf2(mem, "(0x%lx#%u)", (ulong) nref.value.pname, elt); + dmprintf2(mem, "("PRI_INTPTR"#%u)", (intptr_t) nref.value.pname, elt); debug_print_name(mem, &nref); break; default: @@ -243,9 +243,9 @@ debug_dump_refs(const gs_memory_t *mem, const ref * from, uint count = size; if (size && msg) - dmprintf2(mem, "%s at 0x%lx:\n", msg, (ulong) from); + dmprintf2(mem, "%s at "PRI_INTPTR":\n", msg, (intptr_t)from); while (count--) { - dmprintf2(mem, "0x%lx: 0x%04x ", (ulong)p, r_type_attrs(p)); + dmprintf2(mem, PRI_INTPTR": 0x%04x ", (intptr_t)p, r_type_attrs(p)); debug_dump_one_ref(mem, p); dmputc(mem, '\n'); p++; @@ -264,10 +264,10 @@ debug_dump_stack(const gs_memory_t *mem, const ref *p = ref_stack_index(pstack, --i); if (m) { - dmprintf2(mem, "%s at 0x%lx:\n", m, (ulong) pstack); + dmprintf2(mem, "%s at "PRI_INTPTR":\n", m, (intptr_t)pstack); m = NULL; } - dmprintf2(mem, "0x%lx: 0x%02x ", (ulong)p, r_type(p)); + dmprintf2(mem, PRI_INTPTR": 0x%02x ", (intptr_t)p, r_type(p)); debug_dump_one_ref(mem, p); dmputc(mem, '\n'); } @@ -283,10 +283,10 @@ debug_dump_array(const gs_memory_t *mem, const ref * array) switch (type) { default: - dmprintf2(mem, "%s at 0x%lx isn't an array.\n", + dmprintf2(mem, "%s at "PRI_INTPTR" isn't an array.\n", (type < countof(type_strings) ? type_strings[type] : "????"), - (ulong) array); + (intptr_t)array); return; case t_oparray: /* This isn't really an array, but we'd like to see */ @@ -307,10 +307,10 @@ debug_dump_array(const gs_memory_t *mem, const ref * array) packed_get(mem, pp, &temp); if (r_is_packed(pp)) { - dmprintf2(mem, "0x%lx* 0x%04x ", (ulong)pp, (uint)*pp); + dmprintf2(mem, PRI_INTPTR"* 0x%04x ", (intptr_t)pp, (uint)*pp); print_ref_data(mem, &temp); } else { - dmprintf2(mem, "0x%lx: 0x%02x ", (ulong)pp, r_type(&temp)); + dmprintf2(mem, PRI_INTPTR": 0x%02x ", (intptr_t)pp, r_type(&temp)); debug_dump_one_ref(mem, &temp); } dmputc(mem, '\n'); diff --git a/psi/idebug.h b/psi/idebug.h index 47648200..ebfb74ef 100644 --- a/psi/idebug.h +++ b/psi/idebug.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/idict.c b/psi/idict.c index 71d9d018..b698a9fe 100644 --- a/psi/idict.c +++ b/psi/idict.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -502,8 +502,8 @@ dict_put(ref * pdref /* t_dictionary */ , const ref * pkey, const ref * pvalue, } else { ref *kp = pdict->keys.value.refs + index; - if_debug2m('d', (const gs_memory_t *)mem, "[d]0x%lx: fill key at 0x%lx\n", - (ulong) pdict, (ulong) kp); + if_debug2m('d', (const gs_memory_t *)mem, "[d]"PRI_INTPTR": fill key at "PRI_INTPTR"\n", + (intptr_t)pdict, (intptr_t)kp); store_check_dest(pdref, pkey); ref_assign_old_in(mem, &pdict->keys, kp, pkey, "dict_put(key)"); /* set key of pair */ @@ -527,10 +527,10 @@ dict_put(ref * pdref /* t_dictionary */ , const ref * pkey, const ref * pvalue, rcode = 1; } if_debug8m('d', (const gs_memory_t *)mem, - "[d]0x%lx: put key 0x%lx 0x%lx\n value at 0x%lx: old 0x%lx 0x%lx, new 0x%lx 0x%lx\n", - (ulong) pdref->value.pdict, + "[d]"PRI_INTPTR": put key 0x%lx 0x%lx\n value at "PRI_INTPTR": old 0x%lx 0x%lx, new 0x%lx 0x%lx\n", + (intptr_t) pdref->value.pdict, ((const ulong *)pkey)[0], ((const ulong *)pkey)[1], - (ulong) pvslot, + (intptr_t) pvslot, ((const ulong *)pvslot)[0], ((const ulong *)pvslot)[1], ((const ulong *)pvalue)[0], ((const ulong *)pvalue)[1]); ref_assign_old_in(mem, &pdref->value.pdict->values, pvslot, pvalue, @@ -600,8 +600,8 @@ dict_undef(ref * pdref, const ref * pkey, dict_stack_t *pds) bool must_save = ref_must_save_in(mem, &pdict->keys); if_debug3m('d', (const gs_memory_t *)mem, - "[d]0x%lx: removing key at 0%lx: 0x%x\n", - (ulong)pdict, (ulong)pkp, (uint)*pkp); + "[d]"PRI_INTPTR": removing key at "PRI_INTPTR": 0x%x\n", + (intptr_t)pdict, (intptr_t)pkp, (uint)*pkp); /* See the initial comment for why it is safe not to save */ /* the change if the keys array itself is new. */ if (must_save) @@ -635,8 +635,8 @@ dict_undef(ref * pdref, const ref * pkey, dict_stack_t *pds) ref *kp = pdict->keys.value.refs + index; if_debug4m('d', (const gs_memory_t *)mem, - "[d]0x%lx: removing key at 0%lx: 0x%lx 0x%lx\n", - (ulong)pdict, (ulong)kp, ((ulong *)kp)[0], ((ulong *)kp)[1]); + "[d]"PRI_INTPTR": removing key at "PRI_INTPTR": 0x%lx 0x%lx\n", + (intptr_t)pdict, (intptr_t)kp, ((ulong *)kp)[0], ((ulong *)kp)[1]); make_null_old_in(mem, &pdict->keys, kp, "dict_undef(key)"); /* * Accumulating deleted entries slows down lookup. @@ -659,8 +659,8 @@ dict_undef(ref * pdref, const ref * pkey, dict_stack_t *pds) #ifdef DEBUG /* Check the the cache is correct. */ if (!(pds && dstack_dict_is_permanent(pds, pdref))) - lprintf1("dict_undef: cached name value pointer 0x%lx is incorrect!\n", - (ulong) pname->pvalue); + lprintf1("dict_undef: cached name value pointer " PRI_INTPTR " is incorrect!\n", + (intptr_t) pname->pvalue); #endif /* Clear the cache */ pname->pvalue = pv_no_defn; @@ -887,7 +887,7 @@ dict_next(const ref * pdref, int index, ref * eltp /* ref eltp[2] */ ) ) { eltp[1] = *vp; if_debug6m('d', dict_mem(pdict), "[d]0x%lx: index %d: %lx %lx, %lx %lx\n", - (ulong) pdict, index, + (intptr_t)pdict, index, ((ulong *) eltp)[0], ((ulong *) eltp)[1], ((ulong *) vp)[0], ((ulong *) vp)[1]); return index; diff --git a/psi/idict.h b/psi/idict.h index fc0a056a..d5c19f28 100644 --- a/psi/idict.h +++ b/psi/idict.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/idictdef.h b/psi/idictdef.h index cb08cfe6..e6417a54 100644 --- a/psi/idictdef.h +++ b/psi/idictdef.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/idicttpl.h b/psi/idicttpl.h index cc6c6ff1..c48330a9 100644 --- a/psi/idicttpl.h +++ b/psi/idicttpl.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -43,7 +43,7 @@ again: for (; ; kp-- ) { - if_debug2('D', "[D]probe 0x%lx: 0x%x\n", (ulong)kp, *kp); + if_debug2('D', "[D]probe "PRI_INTPTR": 0x%x\n", (intptr_t)kp, *kp); if ( *kp == kpack ) { found; } else if ( !r_packed_is_name(kp) ) { diff --git a/psi/idisp.c b/psi/idisp.c index ecc3f2eb..ab8d070c 100644 --- a/psi/idisp.c +++ b/psi/idisp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -47,70 +47,36 @@ #include "gsequivc.h" #include "gdevdsp.h" #include "gdevdsp2.h" +#include "gxgstate.h" +#include "gxdevsop.h" int -display_set_callback(gs_main_instance *minst, display_callback *callback) +reopen_device_if_required(gs_main_instance *minst) { i_ctx_t *i_ctx_p; - bool was_open; int code; - int exit_code = 0; - os_ptr op; gx_device *dev; - gx_device_display *ddev; - - /* If display device exists, copy prototype if needed and return - * device true - * If it doesn't exist, return - * false - */ - const char getdisplay[] = - "devicedict /display known dup { /display finddevice exch } if"; - code = gs_main_run_string(minst, getdisplay, 0, &exit_code, - &minst->error_object); - if (code < 0) - return code; i_ctx_p = minst->i_ctx_p; /* run_string may change i_ctx_p if GC */ - op = osp; - check_type(*op, t_boolean); - if (op->value.boolval) { - /* display device was included in Ghostscript so we need - * to set the callback structure pointer within it. - * If the device is already open, close it before - * setting callback, then reopen it. - */ - check_read_type(op[-1], t_device); - if (op[-1].value.pdevice == NULL) - /* This can happen if we invalidated devices on the stack by calling nulldevice after they were pushed */ - return_error(gs_error_undefined); - - dev = op[-1].value.pdevice; + dev = gs_currentdevice_inline(i_ctx_p->pgs); + if (dev == NULL) + /* This can happen if we invalidated devices on the stack by calling nulldevice after they were pushed */ + return_error(gs_error_undefined); - was_open = dev->is_open; - if (was_open) { - code = gs_closedevice(dev); - if (code < 0) - return code; - } + if (!dev->is_open) + return 0; - ddev = (gx_device_display *) dev; + if (dev_proc(dev, dev_spec_op)(dev, gxdso_reopen_after_init, NULL, 0) != 1) + return 0; - /* Deal with the case where we subclassed the device before we got here */ - while (ddev->child) - ddev = (gx_device_display *)ddev->child; - - ddev->callback = callback; + code = gs_closedevice(dev); + if (code < 0) + return code; - if (was_open) { - code = gs_opendevice(dev); - if (code < 0) { - dmprintf(dev->memory, "**** Unable to open the display device, quitting.\n"); - return code; - } - } - pop(1); /* device */ + code = gs_opendevice(dev); + if (code < 0) { + dmprintf(dev->memory, "**** Unable to reopen the device, quitting.\n"); + return code; } - pop(1); /* boolean */ return 0; } diff --git a/psi/idisp.h b/psi/idisp.h index 7fa69747..215d915b 100644 --- a/psi/idisp.h +++ b/psi/idisp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -25,7 +25,8 @@ typedef struct display_callback_s display_callback; #endif -/* Called from imain.c to set the display callback in the device instance. */ -int display_set_callback(gs_main_instance *minst, display_callback *callback); +/* Called from imain.c to reopen the device after initialisation if the. + * device requires this. This gives it a chance to refetch any callbacks. */ +int reopen_device_if_required(gs_main_instance *minst); #endif /* idisp_INCLUDED */ diff --git a/psi/idosave.h b/psi/idosave.h index c8a527f5..ea161b23 100644 --- a/psi/idosave.h +++ b/psi/idosave.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/idparam.c b/psi/idparam.c index fbabc6c3..0fc0d9e6 100644 --- a/psi/idparam.c +++ b/psi/idparam.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/idparam.h b/psi/idparam.h index c31b37e9..40983680 100644 --- a/psi/idparam.h +++ b/psi/idparam.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/idsdata.h b/psi/idsdata.h index de673c6f..db1c956a 100644 --- a/psi/idsdata.h +++ b/psi/idsdata.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/idstack.c b/psi/idstack.c index 0dccd1c8..0e8615ab 100644 --- a/psi/idstack.c +++ b/psi/idstack.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -121,8 +121,8 @@ dstack_find_name_by_index(dict_stack_t * pds, uint nidx) name_index_ref(mem, nidx, &dnref); dmlputs(mem, "[D]lookup "); debug_print_name(mem, &dnref); - dmprintf3(mem," in 0x%lx(%u/%u)\n", - (ulong) pdict, dict_length(pdref), + dmprintf3(mem," in "PRI_INTPTR"(%u/%u)\n", + (intptr_t)pdict, dict_length(pdref), dict_maxlength(pdref)); } #endif @@ -208,8 +208,8 @@ dstack_set_top(dict_stack_t * pds) ds_ptr dsp = pds->stack.p; dict *pdict = dsp->value.pdict; - if_debug3('d', "[d]dsp = 0x%lx -> 0x%lx, key array type = %d\n", - (ulong) dsp, (ulong) pdict, r_type(&pdict->keys)); + if_debug3('d', "[d]dsp = "PRI_INTPTR" -> "PRI_INTPTR", key array type = %d\n", + (intptr_t)dsp, (intptr_t)pdict, r_type(&pdict->keys)); if (dict_is_packed(pdict) && r_has_attr(dict_access_ref(dsp), a_read) ) { diff --git a/psi/idstack.h b/psi/idstack.h index b690ecbb..111bcc6e 100644 --- a/psi/idstack.h +++ b/psi/idstack.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ierrors.h b/psi/ierrors.h index b34fcfc2..3f955b08 100644 --- a/psi/ierrors.h +++ b/psi/ierrors.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iesdata.h b/psi/iesdata.h index 68180bbb..0ee0fb05 100644 --- a/psi/iesdata.h +++ b/psi/iesdata.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iestack.h b/psi/iestack.h index 5b287060..6ec64b47 100644 --- a/psi/iestack.h +++ b/psi/iestack.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifapi.h b/psi/ifapi.h index 098d4d30..a536ea43 100644 --- a/psi/ifapi.h +++ b/psi/ifapi.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifcid.h b/psi/ifcid.h index 07554516..65b4e991 100644 --- a/psi/ifcid.h +++ b/psi/ifcid.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifilter.h b/psi/ifilter.h index c49b4761..fcc6009f 100644 --- a/psi/ifilter.h +++ b/psi/ifilter.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifilter2.h b/psi/ifilter2.h index 8fd933f7..d9e4b922 100644 --- a/psi/ifilter2.h +++ b/psi/ifilter2.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifont.h b/psi/ifont.h index 76f02db2..54581e96 100644 --- a/psi/ifont.h +++ b/psi/ifont.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifont1.h b/psi/ifont1.h index efa8db16..c35c904e 100644 --- a/psi/ifont1.h +++ b/psi/ifont1.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifont2.h b/psi/ifont2.h index 5afa638b..4fa50c3a 100644 --- a/psi/ifont2.h +++ b/psi/ifont2.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifont42.h b/psi/ifont42.h index 12225550..6c764f44 100644 --- a/psi/ifont42.h +++ b/psi/ifont42.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifrpred.h b/psi/ifrpred.h index a5f5cc37..de6397c6 100644 --- a/psi/ifrpred.h +++ b/psi/ifrpred.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifunc.h b/psi/ifunc.h index b8a61411..63e7349a 100644 --- a/psi/ifunc.h +++ b/psi/ifunc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ifwpred.h b/psi/ifwpred.h index 4c1c8929..0bc348bf 100644 --- a/psi/ifwpred.h +++ b/psi/ifwpred.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -318,8 +318,8 @@ gs_gc_reclaim(vm_spaces * pspaces, bool global) pms->prev = end; pms->on_heap = false; if_debug2m('6', (const gs_memory_t *)mem, - "[6]adding free 0x%lx(%u) to mark stack\n", - (ulong) pms, pms->count); + "[6]adding free "PRI_INTPTR"(%u) to mark stack\n", + (intptr_t)pms, pms->count); } cp->rescan_bot = cp->cend; cp->rescan_top = cp->cbase; @@ -455,8 +455,8 @@ gs_gc_reclaim(vm_spaces * pspaces, bool global) for_roots(ispace, max_trace, mem, rp) { if_debug3m('6', (const gs_memory_t *)mem, - "[6]relocating root 0x%lx: 0x%lx -> 0x%lx\n", - (ulong) rp, (ulong) rp->p, (ulong) * rp->p); + "[6]relocating root "PRI_INTPTR": "PRI_INTPTR" -> "PRI_INTPTR"\n", + (intptr_t)rp, (intptr_t)rp->p, (intptr_t)*rp->p); if (rp->ptype == ptr_ref_type) { ref *pref = (ref *) * rp->p; @@ -466,8 +466,8 @@ gs_gc_reclaim(vm_spaces * pspaces, bool global) } else *rp->p = (*rp->ptype->reloc) (*rp->p, &state); if_debug3m('6', (const gs_memory_t *)mem, - "[6]relocated root 0x%lx: 0x%lx -> 0x%lx\n", - (ulong) rp, (ulong) rp->p, (ulong) * rp->p); + "[6]relocated root "PRI_INTPTR": "PRI_INTPTR" -> "PRI_INTPTR"\n", + (intptr_t)rp, (intptr_t)rp->p, (intptr_t)*rp->p); } end_phase(state.heap,"relocate roots"); @@ -530,8 +530,8 @@ gs_gc_reclaim(vm_spaces * pspaces, bool global) mem->saved = prev; mem->previous_status = total; if_debug3m('6', (const gs_memory_t *)mem, - "[6]0x%lx previous allocated=%lu, used=%lu\n", - (ulong) mem, total.allocated, total.used); + "[6]"PRI_INTPTR" previous allocated=%lu, used=%lu\n", + (intptr_t)mem, total.allocated, total.used); gs_memory_status((gs_memory_t *) mem, &total); mem->gc_allocated = mem->allocated + total.allocated; } @@ -539,8 +539,8 @@ gs_gc_reclaim(vm_spaces * pspaces, bool global) mem->previous_status = total; mem->gc_allocated = mem->allocated + total.allocated; if_debug3m('6', (const gs_memory_t *)mem, - "[6]0x%lx previous allocated=%lu, used=%lu\n", - (ulong) mem, total.allocated, total.used); + "[6]"PRI_INTPTR" previous allocated=%lu, used=%lu\n", + (intptr_t)mem, total.allocated, total.used); } end_phase(state.heap,"update stats"); @@ -615,9 +615,9 @@ gc_objects_clear_marks(const gs_memory_t *mem, clump_t * cp) if (pre->o_type != &st_free) debug_check_object(pre, cp, NULL); #endif - if_debug3m('7', (const gs_memory_t *)mem, " [7](un)marking %s(%lu) 0x%lx\n", + if_debug3m('7', (const gs_memory_t *)mem, " [7](un)marking %s(%lu) "PRI_INTPTR"\n", struct_type_name_string(pre->o_type), - (ulong) size, (ulong) pre); + (ulong) size, (intptr_t)pre); o_set_unmarked(pre); if (proc != 0) (*proc) (mem, pre + 1, size, pre->o_type); @@ -682,8 +682,8 @@ gc_rescan_clump(clump_t * cp, gc_state_t * pstate, gc_mark_stack * pmstack) else if ((byte *) (pre + 1) > stop) return more; /* 'break' won't work here */ else { - if_debug2m('7', mem, " [7]scanning/marking 0x%lx(%lu)\n", - (ulong) pre, (ulong) size); + if_debug2m('7', mem, " [7]scanning/marking "PRI_INTPTR"(%lu)\n", + (intptr_t)pre, (ulong)size); if (pre->o_type == &st_refs) { ref_packed *rp = (ref_packed *) (pre + 1); char *end = (char *)rp + size; @@ -740,8 +740,8 @@ gc_trace_clump(const gs_memory_t *mem, clump_t * cp, gc_state_t * pstate, gc_mar SCAN_CLUMP_OBJECTS(cp) DO_ALL { - if_debug2m('7', mem, " [7]scanning/marking 0x%lx(%lu)\n", - (ulong) pre, (ulong) size); + if_debug2m('7', mem, " [7]scanning/marking "PRI_INTPTR"(%lu)\n", + (intptr_t)pre, (ulong)size); if (pre->o_type == &st_refs) { ref_packed *rp = (ref_packed *) (pre + 1); char *end = (char *)rp + size; @@ -804,8 +804,8 @@ gc_trace(gs_gc_root_t * rp, gc_state_t * pstate, gc_mark_stack * pmstack) BEGIN\ if (names_mark_index(nt, nidx)) {\ new |= 1;\ - if_debug2m('8', gcst_get_memory_ptr(pstate), " [8]marked name 0x%lx(%u)\n",\ - (ulong)names_index_ptr(nt, nidx), nidx);\ + if_debug2m('8', gcst_get_memory_ptr(pstate), " [8]marked name "PRI_INTPTR"(%u)\n",\ + (intptr_t)names_index_ptr(nt, nidx), nidx);\ }\ END @@ -850,10 +850,10 @@ gc_trace(gs_gc_root_t * rp, gc_state_t * pstate, gc_mark_stack * pmstack) continue; } debug_check_object(ptr - 1, NULL, NULL); - ts:if_debug4m('7', pstate->heap, " [7]%smarking %s 0x%lx[%u]", + ts:if_debug4m('7', pstate->heap, " [7]%smarking %s "PRI_INTPTR"[%u]", depth_dots(sp, pms), struct_type_name_string(ptr[-1].o_type), - (ulong) ptr, sp->index); + (intptr_t)ptr, sp->index); mproc = ptr[-1].o_type->enum_ptrs; if (mproc == gs_no_struct_enum_ptrs || (ptp = (*mproc) @@ -869,7 +869,7 @@ gc_trace(gs_gc_root_t * rp, gc_state_t * pstate, gc_mark_stack * pmstack) /* template for pointer enumeration work. */ nptr = (void *)nep.ptr; sp->index++; - if_debug1m('7', pstate->heap, " = 0x%lx\n", (ulong) nptr); + if_debug1m('7', pstate->heap, " = "PRI_INTPTR"\n", (intptr_t)nptr); /* Descend into nep.ptr, whose pointer type is ptp. */ if (ptp == ptr_struct_type) { sp[1].index = 0; @@ -909,8 +909,8 @@ gc_trace(gs_gc_root_t * rp, gc_state_t * pstate, gc_mark_stack * pmstack) continue; } --(sp->index); - if_debug3m('8', pstate->heap, " [8]%smarking refs 0x%lx[%u]\n", - depth_dots(sp, pms), (ulong) pptr, sp->index); + if_debug3m('8', pstate->heap, " [8]%smarking refs "PRI_INTPTR"[%u]\n", + depth_dots(sp, pms), (intptr_t)pptr, sp->index); if (r_is_packed(pptr)) { if (!r_has_pmark(pptr)) { r_set_pmark(pptr); @@ -1060,8 +1060,8 @@ gc_extend_stack(gc_mark_stack * pms, gc_state_t * pstate) if (cp == 0) { /* We were tracing outside collectible */ /* storage. This can't happen. */ - lprintf1("mark stack overflowed while outside collectible space at 0x%lx!\n", - (ulong) cptr); + lprintf1("mark stack overflowed while outside collectible space at "PRI_INTPTR"!\n", + (intptr_t)cptr); gs_abort(pstate->heap); } if (cptr < cp->rescan_bot) @@ -1193,16 +1193,16 @@ gc_objects_set_reloc(gc_state_t * gcst, clump_t * cp) ) { /* Free object */ reloc += sizeof(obj_header_t) + obj_align_round(size); if ((finalize = pre->o_type->finalize) != 0) { - if_debug2m('u', gcst->heap, "[u]GC finalizing %s 0x%lx\n", + if_debug2m('u', gcst->heap, "[u]GC finalizing %s "PRI_INTPTR"\n", struct_type_name_string(pre->o_type), - (ulong) (pre + 1)); + (intptr_t)(pre + 1)); (*finalize) (gcst->cur_mem, pre + 1); } pfree = (byte *) pre; pre->o_back = (pfree - (byte *) chead) >> obj_back_shift; pre->o_nreloc = reloc; - if_debug3m('7', gcst->heap, " [7]at 0x%p, unmarked %lu, new reloc = %u\n", - pre, (ulong) size, (unsigned int)reloc); + if_debug3m('7', gcst->heap, " [7]at "PRI_INTPTR", unmarked %lu, new reloc = %u\n", + (intptr_t)pre, (ulong) size, (unsigned int)reloc); } else { /* Useful object */ debug_check_object(pre, cp, gcst); pre->o_back = ((byte *) pre - pfree) >> obj_back_shift; @@ -1241,9 +1241,9 @@ gc_do_reloc(clump_t * cp, gs_ref_memory_t * mem, gc_state_t * pstate) pre->o_type->reloc_ptrs; if_debug3m('7', (const gs_memory_t *)mem, - " [7]relocating ptrs in %s(%lu) 0x%lx\n", + " [7]relocating ptrs in %s(%lu) "PRI_INTPTR"\n", struct_type_name_string(pre->o_type), - (ulong) size, (ulong) pre); + (ulong)size, (intptr_t)pre); if (proc != 0) (*proc) (pre + 1, size, pre->o_type, pstate); } @@ -1259,8 +1259,8 @@ gc_do_reloc(clump_t * cp, gs_ref_memory_t * mem, gc_state_t * pstate) const void * print_reloc_proc(const void *obj, const char *cname, const void *robj) { - if_debug3('9', " [9]relocate %s * 0x%lx to 0x%lx\n", - cname, (ulong)obj, (ulong)robj); + if_debug3('9', " [9]relocate %s * "PRI_INTPTR" to "PRI_INTPTR"\n", + cname, (intptr_t)obj, (intptr_t)robj); return robj; } @@ -1289,8 +1289,8 @@ igc_reloc_struct_ptr(const void /*obj_header_t */ *obj, gc_state_t * gcst) if (cp != 0 && cp->cbase <= (byte *)obj && (byte *)obj <cp->ctop) { if (back > (cp->ctop - cp->cbase) >> obj_back_shift) { - lprintf2("Invalid back pointer %u at 0x%lx!\n", - back, (ulong) obj); + lprintf2("Invalid back pointer %u at "PRI_INTPTR"!\n", + back, (intptr_t)obj); gs_abort(NULL); } } else { @@ -1340,9 +1340,9 @@ gc_objects_compact(clump_t * cp, gc_state_t * gcst) debug_check_object(pre, cp, gcst); if_debug4m('7', cmem, - " [7]compacting %s 0x%lx(%lu) to 0x%lx\n", + " [7]compacting %s "PRI_INTPTR"(%lu) to "PRI_INTPTR"\n", struct_type_name_string(pre->o_type), - (ulong) pre, (ulong) size, (ulong) dpre); + (intptr_t)pre, (ulong)size, (intptr_t)dpre); if (procs == 0) { if (dpre != pre) memmove(dpre, pre, @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/igcref.c b/psi/igcref.c index 94b94954..9c6c11d4 100644 --- a/psi/igcref.c +++ b/psi/igcref.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -118,7 +118,7 @@ refs_clear_marks(const gs_memory_t *cmem, if (r_is_packed(rp)) { #ifdef DEBUG if (gs_debug_c('8')) { - dmlprintf1(cmem, " [8]unmark packed 0x%lx ", (ulong) rp); + dmlprintf1(cmem, " [8]unmark packed "PRI_INTPTR" ", (intptr_t) rp); debug_print_ref(cmem, (const ref *)rp); dmputs(cmem, "\n"); } @@ -130,7 +130,7 @@ refs_clear_marks(const gs_memory_t *cmem, #ifdef DEBUG if (gs_debug_c('8')) { - dmlprintf1(cmem, " [8]unmark ref 0x%lx ", (ulong) rp); + dmlprintf1(cmem, " [8]unmark ref "PRI_INTPTR" ", (intptr_t)rp); debug_print_ref(cmem, pref); dmputs(cmem, "\n"); } @@ -190,7 +190,7 @@ refs_clear_reloc(obj_header_t *hdr, uint size) ref *const pref = (ref *)rp; if (!ref_type_uses_size_or_null(r_type(pref))) { - if_debug1('8', " [8]clearing reloc at 0x%lx\n", (ulong) rp); + if_debug1('8', " [8]clearing reloc at "PRI_INTPTR"\n", (intptr_t)rp); r_set_size(pref, 0); } rp += packed_per_ref; @@ -219,8 +219,8 @@ refs_set_reloc(obj_header_t * hdr, uint reloc, uint size) #if align_packed_per_ref == 1 if (r_has_pmark(rp)) { if_debug1('8', - " [8]packed ref 0x%lx is marked\n", - (ulong) rp); + " [8]packed ref "PRI_INTPTR" is marked\n", + (intptr_t)rp); rp++; } else { #else @@ -263,9 +263,9 @@ refs_set_reloc(obj_header_t * hdr, uint reloc, uint size) switch (marked) { case all_marked: if_debug2('8', - " [8]packed refs 0x%lx..0x%lx are marked\n", - (ulong) rp, - (ulong) (rp + (align_packed_per_ref - 1))); + " [8]packed refs "PRI_INTPTR".."PRI_INTPTR" are marked\n", + (intptr_t)rp, + (intptr_t)(rp + (align_packed_per_ref - 1))); rp += align_packed_per_ref; break; default: @@ -274,14 +274,14 @@ refs_set_reloc(obj_header_t * hdr, uint reloc, uint size) for (i = align_packed_per_ref; i--; rp++) { r_set_pmark(rp); if_debug1('8', - " [8]packed ref 0x%lx is marked\n", - (ulong) rp); + " [8]packed ref "PRI_INTPTR" is marked\n", + (intptr_t)rp); } break; case 0: #endif - if_debug2('8', " [8]%d packed ref(s) at 0x%lx are unmarked\n", - align_packed_per_ref, (ulong) rp); + if_debug2('8', " [8]%d packed ref(s) at "PRI_INTPTR" are unmarked\n", + align_packed_per_ref, (intptr_t)rp); { uint rel = reloc + freed; @@ -302,28 +302,28 @@ refs_set_reloc(obj_header_t * hdr, uint reloc, uint size) ref *pref = (ref *) rp; if (!r_has_attr(pref, l_mark)) { - if_debug1('8', " [8]ref 0x%lx is unmarked\n", - (ulong) pref); + if_debug1('8', " [8]ref "PRI_INTPTR" is unmarked\n", + (intptr_t)pref); /* Change this to a mark so we can */ /* store the relocation. */ r_set_type(pref, t_mark); r_set_size(pref, rel); freed += sizeof(ref); } else { - if_debug1('8', " [8]ref 0x%lx is marked\n", - (ulong) pref); + if_debug1('8', " [8]ref "PRI_INTPTR" is marked\n", + (intptr_t)pref); /* Store the relocation here if possible. */ if (!ref_type_uses_size_or_null(r_type(pref))) { - if_debug2('8', " [8]storing reloc %u at 0x%lx\n", - rel, (ulong) pref); + if_debug2('8', " [8]storing reloc %u at "PRI_INTPTR"\n", + rel, (intptr_t)pref); r_set_size(pref, rel); } } rp += packed_per_ref; } } - if_debug3('7', " [7]at end of refs 0x%lx, size = %u, freed = %u\n", - (ulong) (hdr + 1), size, freed); + if_debug3('7', " [7]at end of refs "PRI_INTPTR", size = %u, freed = %u\n", + (intptr_t)(hdr + 1), size, freed); if (freed == size) return false; #if ARCH_SIZEOF_INT > ARCH_SIZEOF_SHORT @@ -413,9 +413,9 @@ igc_reloc_refs(ref_packed * from, ref_packed * to, gc_state_t * gcst) /* The following assignment is logically unnecessary; */ /* we do it only for convenience in debugging. */ pref = (ref *) rp; - if_debug3m('8', gcst->heap, " [8]relocating %s %d ref at 0x%lx\n", + if_debug3m('8', gcst->heap, " [8]relocating %s %d ref at "PRI_INTPTR"\n", (r_has_attr(pref, l_mark) ? "marked" : "unmarked"), - r_btype(pref), (ulong) pref); + r_btype(pref), (intptr_t)pref); if ((r_has_attr(pref, l_mark) || do_all) && r_space(pref) >= min_trace ) { @@ -541,8 +541,8 @@ igc_reloc_refs(ref_packed * from, ref_packed * to, gc_state_t * gcst) default: goto no_reloc; /* don't print trace message */ } - if_debug2m('8', gcst->heap, " [8]relocated 0x%lx => 0x%lx\n", - (ulong)before, (ulong)after); + if_debug2m('8', gcst->heap, " [8]relocated "PRI_INTPTR" => "PRI_INTPTR"\n", + (intptr_t)before, (intptr_t)after); } no_reloc: rp += packed_per_ref; @@ -688,8 +688,8 @@ refs_compact(const gs_memory_t *mem, obj_header_t * pre, obj_header_t * dpre, ui if (r_is_packed(src)) { if (!r_has_pmark(src)) break; - if_debug1m('8', mem, " [8]packed ref 0x%lx \"copied\"\n", - (ulong) src); + if_debug1m('8', mem, " [8]packed ref "PRI_INTPTR" \"copied\"\n", + (intptr_t)src); *src &= ~lp_mark; src++; } else { /* full-size ref */ @@ -697,7 +697,7 @@ refs_compact(const gs_memory_t *mem, obj_header_t * pre, obj_header_t * dpre, ui if (!r_has_attr(pref, l_mark)) break; - if_debug1m('8', mem, " [8]ref 0x%lx \"copied\"\n", (ulong) src); + if_debug1m('8', mem, " [8]ref "PRI_INTPTR" \"copied\"\n", (intptr_t)src); r_clear_attrs(pref, l_mark); src += packed_per_ref; } @@ -707,8 +707,8 @@ refs_compact(const gs_memory_t *mem, obj_header_t * pre, obj_header_t * dpre, ui for (;;) { if (r_is_packed(src)) { if (r_has_pmark(src)) { - if_debug2m('8', mem, " [8]packed ref 0x%lx copied to 0x%lx\n", - (ulong) src, (ulong) dest); + if_debug2m('8', mem, " [8]packed ref "PRI_INTPTR" copied to "PRI_INTPTR"\n", + (intptr_t)src, (intptr_t)dest); *dest++ = *src & ~lp_mark; } src++; @@ -716,8 +716,8 @@ refs_compact(const gs_memory_t *mem, obj_header_t * pre, obj_header_t * dpre, ui if (r_has_attr((ref *) src, l_mark)) { ref rtemp; - if_debug2m('8', mem, " [8]ref 0x%lx copied to 0x%lx\n", - (ulong) src, (ulong) dest); + if_debug2m('8', mem, " [8]ref "PRI_INTPTR" copied to "PRI_INTPTR"\n", + (intptr_t)src, (intptr_t)dest); /* We can't just use ref_assign_inline, */ /* because the source and destination */ /* might overlap! */ @@ -738,8 +738,8 @@ refs_compact(const gs_memory_t *mem, obj_header_t * pre, obj_header_t * dpre, ui /* Check that the relocation came out OK. */ /* NOTE: this check only works within a single clump. */ if ((byte *) src - (byte *) dest != r_size((ref *) src - 1) + sizeof(ref)) { - mlprintf3(mem, "Reloc error for refs 0x%lx: reloc = %lu, stored = %u\n", - (ulong) dpre, (ulong) ((byte *) src - (byte *) dest), + mlprintf3(mem, "Reloc error for refs "PRI_INTPTR": reloc = %lu, stored = %u\n", + (intptr_t) dpre, (ulong) ((byte *) src - (byte *) dest), (uint) r_size((ref *) src - 1)); gs_abort(mem); } diff --git a/psi/igcstr.c b/psi/igcstr.c index f38c33aa..bfa8ace3 100644 --- a/psi/igcstr.c +++ b/psi/igcstr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -31,8 +31,8 @@ void gc_strings_set_marks(clump_t * cp, bool mark) { if (cp->smark != 0) { - if_debug3('6', "[6]clearing string marks 0x%lx[%u] to %d\n", - (ulong) cp->smark, cp->smark_size, (int)mark); + if_debug3('6', "[6]clearing string marks "PRI_INTPTR"[%u] to %d\n", + (intptr_t)cp->smark, cp->smark_size, (int)mark); memset(cp->smark, 0, cp->smark_size); if (mark) gc_mark_string(cp->sbase + HDR_ID_OFFSET, (cp->climit - cp->sbase) - HDR_ID_OFFSET, true, cp); @@ -141,7 +141,7 @@ gc_string_mark(const byte * ptr, uint size, bool set, gc_state_t * gcst) if (!(cp = gc_locate(ptr - HDR_ID_OFFSET, gcst))) { /* not in a clump */ #ifdef DEBUG if (gs_debug_c('5')) { - dmlprintf2(gcst->heap, "[5]0x%lx[%u]", (ulong) ptr - HDR_ID_OFFSET, size); + dmlprintf2(gcst->heap, "[5]"PRI_INTPTR"[%u]", (intptr_t)ptr - HDR_ID_OFFSET, size); dmprintstr(gcst->heap); dmputs(gcst->heap, " not in a clump\n"); } @@ -152,8 +152,8 @@ gc_string_mark(const byte * ptr, uint size, bool set, gc_state_t * gcst) return false; #ifdef DEBUG if (ptr - HDR_ID_OFFSET < cp->ctop) { - lprintf4("String pointer 0x%lx[%u] outside [0x%lx..0x%lx)\n", - (ulong) ptr - HDR_ID_OFFSET, size, (ulong) cp->ctop, (ulong) cp->climit); + lprintf4("String pointer "PRI_INTPTR"[%u] outside ["PRI_INTPTR".."PRI_INTPTR")\n", + (intptr_t)ptr - HDR_ID_OFFSET, size, (intptr_t)cp->ctop, (intptr_t)cp->climit); return false; } else if (ptr + size > cp->climit) { /* * If this is the bottommost string in a clump that has @@ -171,9 +171,9 @@ gc_string_mark(const byte * ptr, uint size, bool set, gc_state_t * gcst) while (ptr - HDR_ID_OFFSET == scp->climit && scp->outer != 0) scp = scp->outer; if (ptr - HDR_ID_OFFSET + size > scp->climit) { - lprintf4("String pointer 0x%lx[%u] outside [0x%lx..0x%lx)\n", - (ulong) ptr - HDR_ID_OFFSET, size, - (ulong) scp->ctop, (ulong) scp->climit); + lprintf4("String pointer "PRI_INTPTR"[%u] outside ["PRI_INTPTR".."PRI_INTPTR")\n", + (intptr_t)ptr - HDR_ID_OFFSET, size, + (intptr_t)scp->ctop, (intptr_t)scp->climit); return false; } } @@ -181,9 +181,9 @@ gc_string_mark(const byte * ptr, uint size, bool set, gc_state_t * gcst) marks = gc_mark_string(ptr, size, set, cp); #ifdef DEBUG if (gs_debug_c('5')) { - dmlprintf4(gcst->heap, "[5]%s%smarked 0x%lx[%u]", + dmlprintf4(gcst->heap, "[5]%s%smarked "PRI_INTPTR"[%u]", (marks ? "" : "already "), (set ? "" : "un"), - (ulong) ptr - HDR_ID_OFFSET, size); + (intptr_t)ptr - HDR_ID_OFFSET, size); dmprintstr(gcst->heap); dmputc(gcst->heap, '\n'); } @@ -198,8 +198,8 @@ gc_strings_clear_reloc(clump_t * cp) { if (cp->sreloc != 0) { gc_strings_set_marks(cp, true); - if_debug1('6', "[6]clearing string reloc 0x%lx\n", - (ulong) cp->sreloc); + if_debug1('6', "[6]clearing string reloc "PRI_INTPTR"\n", + (intptr_t)cp->sreloc); gc_strings_set_reloc(cp); } } @@ -320,8 +320,8 @@ igc_reloc_string(gs_string * sptr, gc_state_t * gcst) } byt = *bitp & (0xff >> (8 - (offset & 7))); reloc -= byte_count_one_bits(byt); - if_debug2('5', "[5]relocate string 0x%lx to 0x%lx\n", - (ulong) ptr, (ulong) (cp->sdest - reloc)); + if_debug2('5', "[5]relocate string "PRI_INTPTR" to 0x%lx\n", + (intptr_t)ptr, (intptr_t)(cp->sdest - reloc)); sptr->data = (cp->sdest - reloc) + HDR_ID_OFFSET; } void @@ -360,7 +360,7 @@ gc_strings_compact(clump_t * cp, const gs_memory_t *mem) for (; i < n; i += R) { uint j; - dmlprintf1(mem, "[4]0x%lx: ", (ulong) (base + i)); + dmlprintf1(mem, "[4]"PRI_INTPTR": ", (intptr_t) (base + i)); for (j = i; j < i + R; j++) { byte ch = base[j]; diff --git a/psi/igcstr.h b/psi/igcstr.h index ceb2190f..8d5cc783 100644 --- a/psi/igcstr.h +++ b/psi/igcstr.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/igstate.h b/psi/igstate.h index 18931f73..a6bbb63e 100644 --- a/psi/igstate.h +++ b/psi/igstate.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iimage.h b/psi/iimage.h index ea75911b..36914b9b 100644 --- a/psi/iimage.h +++ b/psi/iimage.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iinit.c b/psi/iinit.c index 25fe0a16..41ff8b09 100644 --- a/psi/iinit.c +++ b/psi/iinit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -395,8 +395,8 @@ zop_init(i_ctx_t *i_ctx_p) if (def->proc != 0) { code = def->proc(i_ctx_p); if (code < 0) { - lprintf2("op_init proc 0x%lx returned error %d!\n", - (ulong)def->proc, code); + lprintf2("op_init proc "PRI_INTPTR" returned error %d!\n", + (intptr_t)def->proc, code); return code; } } diff --git a/psi/iinit.h b/psi/iinit.h index 8305252f..f4e4255f 100644 --- a/psi/iinit.h +++ b/psi/iinit.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ilevel.h b/psi/ilevel.h index 6af439cc..90d222ce 100644 --- a/psi/ilevel.h +++ b/psi/ilevel.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ilocate.c b/psi/ilocate.c index 35916087..f86cc5b2 100644 --- a/psi/ilocate.c +++ b/psi/ilocate.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -249,13 +249,13 @@ ialloc_validate_memory(const gs_ref_memory_t * mem, gc_state_t * gcst) const clump_t *cp; int i; - if_debug3m('6', (gs_memory_t *)mem, "[6]validating memory 0x%lx, space %d, level %d\n", - (ulong) mem, mem->space, level); + if_debug3m('6', (gs_memory_t *)mem, "[6]validating memory "PRI_INTPTR", space %d, level %d\n", + (intptr_t) mem, mem->space, level); /* Validate clumps. */ for (cp = clump_splay_walk_init(&sw, smem); cp != 0; cp = clump_splay_walk_fwd(&sw)) if (do_validate_clump(cp, gcst)) { - mlprintf3((gs_memory_t *)mem, "while validating memory 0x%lx, space %d, level %d\n", - (ulong) mem, mem->space, level); + mlprintf3((gs_memory_t *)mem, "while validating memory "PRI_INTPTR", space %d, level %d\n", + (intptr_t) mem, mem->space, level); gs_abort(gcst->heap); } /* Validate freelists. */ @@ -269,17 +269,19 @@ ialloc_validate_memory(const gs_ref_memory_t * mem, gc_state_t * gcst) obj_size_t size = pfree[-1].o_size; if (pfree[-1].o_type != &st_free) { - mlprintf3((gs_memory_t *)mem, "Non-free object 0x%lx(%u) on freelist %i!\n", - (ulong) pfree, size, i); + mlprintf3((gs_memory_t *)mem, "Non-free object "PRI_INTPTR"(%u) on freelist %i!\n", + (intptr_t) pfree, size, i); break; } if ((i == LARGE_FREELIST_INDEX && size < max_freelist_size) || (i != LARGE_FREELIST_INDEX && (size < free_size - obj_align_mask || size > free_size))) { - mlprintf3((gs_memory_t *)mem, "Object 0x%lx(%u) size wrong on freelist %i!\n", - (ulong) pfree, (uint)size, i); + mlprintf3((gs_memory_t *)mem, "Object "PRI_INTPTR"(%u) size wrong on freelist %i!\n", + (intptr_t) pfree, (uint)size, i); break; } + if (pfree == *(const obj_header_t* const*)pfree) + break; } } }; @@ -313,17 +315,17 @@ do_validate_clump(const clump_t * cp, gc_state_t * gcst) DO_ALL if (pre->o_type == &st_free) { if (!object_size_valid(pre, size, cp)) { - lprintf3("Bad free object 0x%lx(%lu), in clump 0x%lx!\n", - (ulong) (pre + 1), (ulong) size, (ulong) cp); + lprintf3("Bad free object "PRI_INTPTR"(%lu), in clump "PRI_INTPTR"!\n", + (intptr_t) (pre + 1), (ulong) size, (intptr_t) cp); return 1; } } else if (do_validate_object(pre + 1, cp, gcst)) { dmprintf_clump(gcst->heap, "while validating clump", cp); return 1; } - if_debug3m('7', gcst->heap, " [7]validating %s(%lu) 0x%lx\n", + if_debug3m('7', gcst->heap, " [7]validating %s(%lu) "PRI_INTPTR"\n", struct_type_name_string(pre->o_type), - (ulong) size, (ulong) pre); + (ulong) size, (intptr_t) pre); if (pre->o_type == &st_refs) { const ref_packed *rp = (const ref_packed *)(pre + 1); const char *end = (const char *)rp + size; @@ -335,9 +337,9 @@ do_validate_clump(const clump_t * cp, gc_state_t * gcst) ret = ialloc_validate_ref_packed(rp, gcst); # endif if (ret) { - mlprintf3(gcst->heap, "while validating %s(%lu) 0x%lx\n", + mlprintf3(gcst->heap, "while validating %s(%lu) "PRI_INTPTR"\n", struct_type_name_string(pre->o_type), - (ulong) size, (ulong) pre); + (ulong) size, (intptr_t) pre); dmprintf_clump(gcst->heap, "in clump", cp); return ret; } @@ -461,9 +463,9 @@ cks: if (optr != 0) { break; case t_name: if (name_index_ptr(cmem, name_index(cmem, pref)) != pref->value.pname) { - lprintf3("At 0x%lx, bad name %u, pname = 0x%lx\n", - (ulong) pref, (uint)name_index(cmem, pref), - (ulong) pref->value.pname); + lprintf3("At "PRI_INTPTR", bad name %u, pname = "PRI_INTPTR"\n", + (intptr_t) pref, (uint)name_index(cmem, pref), + (intptr_t) pref->value.pname); ret = 1; break; } { @@ -473,18 +475,18 @@ cks: if (optr != 0) { if (r_space(&sref) != avm_foreign && !gc_locate(sref.value.const_bytes, gcst) ) { - lprintf4("At 0x%lx, bad name %u, pname = 0x%lx, string 0x%lx not in any clump\n", - (ulong) pref, (uint) r_size(pref), - (ulong) pref->value.pname, - (ulong) sref.value.const_bytes); + lprintf4("At "PRI_INTPTR", bad name %u, pname = "PRI_INTPTR", string "PRI_INTPTR" not in any clump\n", + (intptr_t) pref, (uint) r_size(pref), + (intptr_t) pref->value.pname, + (intptr_t) sref.value.const_bytes); ret = 1; } } break; case t_string: if (r_size(pref) != 0 && !gc_locate(pref->value.bytes, gcst)) { - lprintf3("At 0x%lx, string ptr 0x%lx[%u] not in any clump\n", - (ulong) pref, (ulong) pref->value.bytes, + lprintf3("At "PRI_INTPTR", string ptr "PRI_INTPTR"[%u] not in any clump\n", + (intptr_t) pref, (intptr_t) pref->value.bytes, (uint) r_size(pref)); ret = 1; } @@ -496,8 +498,8 @@ cks: if (optr != 0) { size = r_size(pref); tname = "array"; cka: if (!gc_locate(rptr, gcst)) { - lprintf3("At 0x%lx, %s 0x%lx not in any clump\n", - (ulong) pref, tname, (ulong) rptr); + lprintf3("At "PRI_INTPTR", %s "PRI_INTPTR" not in any clump\n", + (intptr_t) pref, tname, (intptr_t) rptr); ret = 1; break; } { @@ -507,8 +509,8 @@ cka: if (!gc_locate(rptr, gcst)) { const ref *elt = rptr + i; if (r_is_packed(elt)) { - lprintf5("At 0x%lx, %s 0x%lx[%u] element %u is not a ref\n", - (ulong) pref, tname, (ulong) rptr, size, i); + lprintf5("At "PRI_INTPTR", %s "PRI_INTPTR"[%u] element %u is not a ref\n", + (intptr_t) pref, tname, (intptr_t) rptr, size, i); ret = 1; } } @@ -520,8 +522,8 @@ cka: if (!gc_locate(rptr, gcst)) { break; optr = pref->value.packed; if (!gc_locate(optr, gcst)) { - lprintf2("At 0x%lx, packed array 0x%lx not in any clump\n", - (ulong) pref, (ulong) optr); + lprintf2("At "PRI_INTPTR", packed array "PRI_INTPTR" not in any clump\n", + (intptr_t) pref, (intptr_t) optr); ret = 1; } break; @@ -534,8 +536,8 @@ cka: if (!gc_locate(rptr, gcst)) { !r_has_type(&pdict->count, t_integer) || !r_has_type(&pdict->maxlength, t_integer) ) { - lprintf2("At 0x%lx, invalid dict 0x%lx\n", - (ulong) pref, (ulong) pdict); + lprintf2("At "PRI_INTPTR", invalid dict "PRI_INTPTR"\n", + (intptr_t) pref, (intptr_t) pdict); ret = 1; } rptr = (const ref *)pdict; @@ -562,10 +564,10 @@ ialloc_validate_pointer_stability(const obj_header_t * ptr_fr, const char *sn_to = (ptr_to->d.o.space_id < count_of(sn) ? sn[ptr_to->d.o.space_id] : "unknown"); - lprintf6("Reference to a less stable object 0x%lx<%s> " - "in the space \'%s\' from 0x%lx<%s> in the space \'%s\' !\n", - (ulong) ptr_to, ptr_to->d.o.t.type->sname, sn_to, - (ulong) ptr_fr, ptr_fr->d.o.t.type->sname, sn_fr); + lprintf6("Reference to a less stable object "PRI_INTPTR"<%s> " + "in the space \'%s\' from "PRI_INTPTR"<%s> in the space \'%s\' !\n", + (intptr_t) ptr_to, ptr_to->d.o.t.type->sname, sn_to, + (intptr_t) ptr_fr, ptr_fr->d.o.t.type->sname, sn_fr); } } #endif @@ -587,14 +589,14 @@ do_validate_object(const obj_header_t * ptr, const clump_t * cp, st = *gcst; /* no side effects! */ if (!(cp = gc_locate(pre, &st))) { - mlprintf1(gcst->heap, "Object 0x%lx not in any clump!\n", - (ulong) ptr); + mlprintf1(gcst->heap, "Object "PRI_INTPTR" not in any clump!\n", + (intptr_t) ptr); return 1; /*gs_abort(); */ } } if (otype == &st_free) { - mlprintf3(gcst->heap, "Reference to free object 0x%lx(%lu), in clump 0x%lx!\n", - (ulong) ptr, (ulong) size, (ulong) cp); + mlprintf3(gcst->heap, "Reference to free object "PRI_INTPTR"(%lu), in clump "PRI_INTPTR"!\n", + (intptr_t) ptr, (ulong) size, (intptr_t) cp); return 1; } if ((cp != 0 && !object_size_valid(pre, size, cp)) || @@ -602,15 +604,15 @@ do_validate_object(const obj_header_t * ptr, const clump_t * cp, (oname = struct_type_name_string(otype), *oname < 33 || *oname > 126) ) { - mlprintf2(gcst->heap, "\n Bad object 0x%lx(%lu),\n", - (ulong) ptr, (ulong) size); - dmprintf2(gcst->heap, " ssize = %u, in clump 0x%lx!\n", - otype->ssize, (ulong) cp); + mlprintf2(gcst->heap, "\n Bad object "PRI_INTPTR"(%lu),\n", + (intptr_t) ptr, (ulong) size); + dmprintf2(gcst->heap, " ssize = %u, in clump "PRI_INTPTR"!\n", + otype->ssize, (intptr_t) cp); return 1; } if (size % otype->ssize != 0) { - mlprintf3(gcst->heap, "\n Potentially bad object 0x%lx(%lu), in clump 0x%lx!\n", - (ulong) ptr, (ulong) size, (ulong) cp); + mlprintf3(gcst->heap, "\n Potentially bad object "PRI_INTPTR"(%lu), in clump "PRI_INTPTR"!\n", + (intptr_t) ptr, (ulong) size, (intptr_t) cp); dmprintf3(gcst->heap, " structure name = %s, size = %lu, ssize = %u\n", oname, size, otype->ssize); dmprintf(gcst->heap, " This can happen (and is benign) if a device has been subclassed\n"); diff --git a/psi/imain.c b/psi/imain.c index db3fd2a1..c45119c7 100644 --- a/psi/imain.c +++ b/psi/imain.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -130,7 +130,8 @@ gs_main_init0(gs_main_instance * minst, gp_file * in, gp_file * out, gp_file * e int code = 0; if (gs_debug_c(gs_debug_flag_init_details)) - dmprintf1(minst->heap, "%% Init phase 0 started, instance 0x%p\n", minst); + dmprintf1(minst->heap, "%% Init phase 0 started, instance "PRI_INTPTR"\n", + (intptr_t)minst); /* Do platform-dependent initialization. */ /* We have to do this as the very first thing, */ @@ -170,7 +171,8 @@ gs_main_init0(gs_main_instance * minst, gp_file * in, gp_file * out, gp_file * e fail: if (gs_debug_c(gs_debug_flag_init_details)) - dmprintf2(minst->heap, "%% Init phase 0 %s, instance 0x%p\n", code < 0 ? "failed" : "done", minst); + dmprintf2(minst->heap, "%% Init phase 0 %s, instance "PRI_INTPTR"\n", + code < 0 ? "failed" : "done", (intptr_t)minst); return code; } @@ -187,7 +189,8 @@ gs_main_init1(gs_main_instance * minst) return 0; if (gs_debug_c(gs_debug_flag_init_details)) - dmprintf1(minst->heap, "%% Init phase 1 started, instance 0x%p\n", minst); + dmprintf1(minst->heap, "%% Init phase 1 started, instance "PRI_INTPTR"\n", + (intptr_t)minst); code = ialloc_init(&idmem, minst->heap, minst->memory_clump_size, gs_have_level2()); @@ -232,7 +235,8 @@ fail: fail_early: if (gs_debug_c(gs_debug_flag_init_details)) - dmprintf2(minst->heap, "%% Init phase 1 %s, instance 0x%p\n", code < 0 ? "failed" : "done", minst); + dmprintf2(minst->heap, "%% Init phase 1 %s, instance "PRI_INTPTR"\n", + code < 0 ? "failed" : "done", (intptr_t)minst); return code; } @@ -302,11 +306,11 @@ int gs_main_init2aux(gs_main_instance * minst) { if (code < 0) return code; minst->init_done = 2; + /* NB this is to be done with device parameters * both minst->display and display_set_callback() are going away */ - if (minst->display) - if ((code = display_set_callback(minst, minst->display)) < 0) + if ((code = reopen_device_if_required(minst)) < 0) return code; if ((code = gs_main_run_string(minst, @@ -321,6 +325,132 @@ int gs_main_init2aux(gs_main_instance * minst) { } int +gs_main_set_language_param(gs_main_instance *minst, + gs_param_list *plist) +{ + ref value; + int code = 0; + i_ctx_t *i_ctx_p = minst->i_ctx_p; + uint space = icurrent_space; + gs_param_enumerator_t enumerator; + gs_param_key_t key; + gs_lib_ctx_t *ctx = minst->heap->gs_lib_ctx; + + ialloc_set_space(idmemory, avm_system); + + param_init_enumerator(&enumerator); + while ((code = param_get_next_key(plist, &enumerator, &key)) == 0) { + char string_key[256]; /* big enough for any reasonable key */ + gs_param_typed_value pvalue; + + if (key.size > sizeof(string_key) - 1) { + code = gs_note_error(gs_error_rangecheck); + break; + } + memcpy(string_key, key.data, key.size); + string_key[key.size] = 0; + if ((code = param_read_typed(plist, string_key, &pvalue)) != 0) { + code = (code > 0 ? gs_note_error(gs_error_unknownerror) : code); + break; + } + switch (pvalue.type) { + case gs_param_type_null: + make_null(&value); + break; + case gs_param_type_bool: + if (pvalue.value.b) + make_true(&value); + else + make_false(&value); + break; + case gs_param_type_int: + make_int(&value, (ps_int)pvalue.value.i); + break; + case gs_param_type_i64: + make_int(&value, (ps_int)pvalue.value.i64); + break; + case gs_param_type_long: + make_int(&value, (ps_int)pvalue.value.l); + break; + case gs_param_type_size_t: + make_int(&value, (ps_int)pvalue.value.z); + break; + case gs_param_type_float: + make_real(&value, pvalue.value.f); + break; + case gs_param_type_dict: + /* We don't support dicts for now */ + continue; + case gs_param_type_dict_int_keys: + /* We don't support dicts with int keys for now */ + continue; + case gs_param_type_array: + /* We don't support arrays for now */ + continue; + case gs_param_type_string: + if (pvalue.value.s.data == NULL || pvalue.value.s.size == 0) + make_empty_string(&value, a_readonly); + else { + size_t len = pvalue.value.s.size; + byte *body = ialloc_string(len, "-s"); + + if (body == NULL) + return gs_error_Fatal; + memcpy(body, pvalue.value.s.data, len); + make_const_string(&value, a_readonly | avm_system, len, body); + } + break; + case gs_param_type_name: + code = name_ref(ctx->memory, pvalue.value.n.data, pvalue.value.n.size, &value, 1); + break; + case gs_param_type_int_array: + /* We don't support arrays for now */ + continue; + case gs_param_type_float_array: + /* We don't support arrays for now */ + continue; + case gs_param_type_string_array: + /* We don't support arrays for now */ + continue; + default: + continue; + } + if (code < 0) + break; + + ialloc_set_space(idmemory, space); + /* Enter the name in systemdict. */ + i_initial_enter_name_copy(minst->i_ctx_p, string_key, &value); + } + + return code; +} + +static int +gs_main_push_params(gs_main_instance *minst) +{ + int code; + gs_c_param_list *plist; + + plist = minst->param_list; + if (!plist) + return 0; + + code = gs_putdeviceparams(minst->i_ctx_p->pgs->device, + (gs_param_list *)plist); + if (code < 0) + return code; + + code = gs_main_set_language_param(minst, (gs_param_list *)plist); + if (code < 0) + return code; + + gs_c_param_list_release(plist); + + return code; +} + +int gs_main_init2(gs_main_instance * minst) { i_ctx_t *i_ctx_p; @@ -329,17 +459,22 @@ gs_main_init2(gs_main_instance * minst) if (code < 0) return code; + code = gs_main_push_params(minst); + if (code < 0) + return code; + if (minst->init_done >= 2) return 0; if (gs_debug_c(gs_debug_flag_init_details)) - dmprintf1(minst->heap, "%% Init phase 2 started, instance 0x%p\n", minst); + dmprintf1(minst->heap, "%% Init phase 2 started, instance "PRI_INTPTR"\n", + (intptr_t)minst); code = gs_main_init2aux(minst); if (code < 0) goto fail; - i_ctx_p = minst->i_ctx_p; /* display_set_callback or run_string may change it */ + i_ctx_p = minst->i_ctx_p; /* reopen_device_if_display or run_string may change it */ /* Now process the initial saved-pages=... argument, if any as well as saved-pages-test */ { @@ -383,7 +518,8 @@ gs_main_init2(gs_main_instance * minst) fail: if (gs_debug_c(gs_debug_flag_init_details)) - dmprintf2(minst->heap, "%% Init phase 2 %s, instance 0x%p\n", code < 0 ? "failed" : "done", minst); + dmprintf2(minst->heap, "%% Init phase 2 %s, instance "PRI_INTPTR"\n", + code < 0 ? "failed" : "done", (intptr_t)minst); return code; } @@ -619,7 +755,7 @@ gs_main_set_lib_paths(gs_main_instance * minst) break; } } - if (have_rom_device && code >= 0) { + if (have_rom_device) { code = lib_path_add(minst, "%rom%Resource/Init/"); if (code < 0) return code; @@ -1073,7 +1209,7 @@ gs_finit_push_systemdict(i_ctx_t *i_ctx_p) /* Free all resources and return. */ int -gs_main_finit(gs_main_instance * minst, int exit_status, int code) +gs_main_finit(gs_main_instance * minst, int exit_status, int env_code) { i_ctx_t *i_ctx_p = minst->i_ctx_p; gs_dual_memory_t dmem = {0}; @@ -1225,7 +1361,7 @@ gs_main_finit(gs_main_instance * minst, int exit_status, int code) i_ctx_p = minst->i_ctx_p; /* get current interp context */ if (gs_debug_c(':')) { print_resource_usage(minst, &gs_imemory, "Final"); - dmprintf1(minst->heap, "%% Exiting instance 0x%p\n", minst); + dmprintf1(minst->heap, "%% Exiting instance "PRI_INTPTR"\n", (intptr_t)minst); } /* Do the equivalent of a restore "past the bottom". */ /* This will release all memory, close all open files, etc. */ @@ -1234,11 +1370,11 @@ gs_main_finit(gs_main_instance * minst, int exit_status, int code) i_plugin_holder *h = i_ctx_p->plugin_list; dmem = *idmemory; - code = alloc_restore_all(i_ctx_p); - if (code < 0) + env_code = alloc_restore_all(i_ctx_p); + if (env_code < 0) emprintf1(mem_raw, "ERROR %d while the final restore. See gs/psi/ierrors.h for code explanation.\n", - code); + env_code); i_iodev_finit(&dmem); i_plugin_finit(mem_raw, h); } @@ -1258,12 +1394,12 @@ gs_main_finit(gs_main_instance * minst, int exit_status, int code) if (tempnames) { char *p = tempnames; while (*p) { - unlink(p); + gp_unlink(minst->heap, p); p += strlen(p) + 1; } free(tempnames); } - gs_lib_finit(exit_status, code, minst->heap); + gs_lib_finit(exit_status, env_code, minst->heap); set_lib_path_length(minst, 0); gs_free_object(minst->heap, minst->lib_path.container.value.refs, "lib_path array"); diff --git a/psi/imain.h b/psi/imain.h index dd333032..5d3c8e19 100644 --- a/psi/imain.h +++ b/psi/imain.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -85,6 +85,10 @@ int gs_main_init1(gs_main_instance * minst); */ int gs_main_init2(gs_main_instance * minst); +int +gs_main_set_language_param(gs_main_instance *minst, + gs_param_list *plist); + /* * The runlibfile operator uses a search path, as described in * Use.htm, for looking up file names. Each interpreter instance has diff --git a/psi/imainarg.c b/psi/imainarg.c index c5d74caf..30ee6cca 100644 --- a/psi/imainarg.c +++ b/psi/imainarg.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -229,7 +229,8 @@ gs_main_init_with_args01(gs_main_instance * minst, int argc, char *argv[]) if (gs_debug[':'] && !have_dumped_args) { int i; - dmprintf1(minst->heap, "%% Args passed to instance 0x%p: ", minst); + dmprintf1(minst->heap, "%% Args passed to instance "PRI_INTPTR": ", + (intptr_t)minst); for (i=1; i<argc; i++) dmprintf1(minst->heap, "%s ", argv[i]); dmprintf(minst->heap, "\n"); @@ -474,6 +475,14 @@ run_stdin: if (code < 0) return code; break; } + if (*arg != 0) { + /* Unmatched switch. */ + outprintf(minst->heap, + " Unknown switch '--%s'.\n", + arg); + arg_finit(pal); + return gs_error_Fatal; + } /* FALLTHROUGH */ case '+': pal->expand_ats = false; @@ -829,14 +838,15 @@ run_stdin: ialloc_set_space(idmemory, avm_system); if (isd) { - int num, i; + int i; + int64_t num; /* Check for numbers so we can provide for suffix scalers */ /* Note the check for '#' is for PS "radix" numbers such as 16#ff */ /* and check for '.' and 'e' or 'E' which are 'real' numbers */ if ((strchr(eqp, '#') == NULL) && (strchr(eqp, '.') == NULL) && (strchr(eqp, 'e') == NULL) && (strchr(eqp, 'E') == NULL) && - ((i = sscanf((const char *)eqp, "%d", &num)) == 1)) { + ((i = sscanf((const char *)eqp, "%"PRIi64, &num)) == 1)) { char suffix = eqp[strlen(eqp) - 1]; switch (suffix) { @@ -857,7 +867,7 @@ run_stdin: default: break; /* not a valid suffix or last char was digit */ } - make_int(&value, num); + make_int(&value, (ps_int)num); } else { /* use the PS scanner to capture other valid token types */ stream astream; @@ -918,6 +928,33 @@ run_stdin: arg_free((char *)adef, minst->heap); break; } + case 'p': + { + char *adef = arg_copy(arg, minst->heap); + char *eqp; + + if (adef == NULL) + return gs_error_Fatal; + eqp = strchr(adef, '='); + + if (eqp == NULL) + eqp = strchr(adef, '#'); + if (eqp == NULL) { + outprintf(minst->heap, "Usage: -pNAME=STRING\n"); + arg_free((char *)adef, minst->heap); + return gs_error_Fatal; + } + *eqp++ = 0; + /* Slightly uncomfortable calling back up to a higher + * level, but we'll live with it. */ + code = gsapi_set_param(gs_lib_ctx_get_interp_instance(minst->heap), + adef, eqp, gs_spt_parsed); + if (code < 0) { + arg_free((char *)adef, minst->heap); + return code; + } + break; + } case 'u': /* undefine name */ if (!*arg) { puts(minst->heap, "-u requires a name to undefine."); @@ -1097,7 +1134,17 @@ gs_main_run_file2(gs_main_instance *minst, int *pexit_code, ref *perror_object) { - return runarg(minst, "", filename, ".runfile", runFlush, user_errors, pexit_code, perror_object); + int code, code1; + + code = gs_add_control_path(minst->heap, gs_permit_file_reading, filename); + if (code < 0) return code; + + code = runarg(minst, "", filename, ".runfile", runFlush, user_errors, pexit_code, perror_object); + + code1 = gs_remove_control_path(minst->heap, gs_permit_file_reading, filename); + if (code >= 0 && code1 < 0) code = code1; + + return code; } static int run_string(gs_main_instance *minst, diff --git a/psi/imainarg.h b/psi/imainarg.h index d8de7841..f9a40379 100644 --- a/psi/imainarg.h +++ b/psi/imainarg.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/imemory.h b/psi/imemory.h index d9815074..9aed79bf 100644 --- a/psi/imemory.h +++ b/psi/imemory.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iminst.h b/psi/iminst.h index d7d660b0..b8a472a2 100644 --- a/psi/iminst.h +++ b/psi/iminst.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -22,6 +22,7 @@ #include "iref.h" #include "imain.h" +#include "gsparam.h" #ifndef display_callback_DEFINED # define display_callback_DEFINED @@ -83,6 +84,16 @@ struct gs_main_instance_s { i_ctx_t *i_ctx_p; /* current interpreter context state */ char *saved_pages_initial_arg; /* used to defer processing of --saved-pages=begin... */ bool saved_pages_test_mode; /* for regression testing of saved-pages */ + + /* Used for gsapi_set_params in the gs (not gpdl) case. */ + gs_c_param_list *param_list; + int mid_run_string; + + /* The state for gsapi param enumeration in the gs (not gpdl) case. */ + gs_c_param_list enum_params; + gs_param_enumerator_t enum_iter; + char *enum_keybuf; + int enum_keybuf_max; }; /* diff --git a/psi/iname.c b/psi/iname.c index a8f32a99..e6b68d12 100644 --- a/psi/iname.c +++ b/psi/iname.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -66,9 +66,9 @@ name_print(const char *msg, const name_table *nt, uint nidx, const int *pflag) dmlprintf1(nt->memory, "[n]%s", msg); if (pflag) dmprintf1(nt->memory, "(%d)", *pflag); - dmprintf2(nt->memory, " (0x%lx#%u)", (ulong)pname, nidx); + dmprintf2(nt->memory, " ("PRI_INTPTR"#%u)", (intptr_t)pname, nidx); debug_print_string(nt->memory, str, pnstr->string_size); - dmprintf2(nt->memory, "(0x%lx,%u)\n", (ulong)str, pnstr->string_size); + dmprintf2(nt->memory, "("PRI_INTPTR",%u)\n", (intptr_t)str, pnstr->string_size); } # define if_debug_name(msg, nt, nidx, pflag)\ if ( gs_debug_c('n') ) name_print(msg, nt, nidx, pflag) diff --git a/psi/iname.h b/psi/iname.h index a9117d6b..b06efbad 100644 --- a/psi/iname.h +++ b/psi/iname.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/inamedef.h b/psi/inamedef.h index 86731419..b8a1621c 100644 --- a/psi/inamedef.h +++ b/psi/inamedef.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -62,7 +62,7 @@ struct name_s { /* pvalue == pv_other: other status */ #define pv_other ((ref *)1) /* pvalue != pv_no_defn, pvalue != pv_other: pvalue is valid */ -#define pv_valid(pvalue) ((unsigned long)(pvalue) > 1) +#define pv_valid(pvalue) ((uintptr_t)(pvalue) > 1) ref *pvalue; /* if only defined in systemdict or */ /* userdict, this points to the value */ }; diff --git a/psi/inameidx.h b/psi/inameidx.h index 87f4897f..bf831c8f 100644 --- a/psi/inameidx.h +++ b/psi/inameidx.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/inames.h b/psi/inames.h index c2e88fe7..3080a3f2 100644 --- a/psi/inames.h +++ b/psi/inames.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/inamestr.h b/psi/inamestr.h index 8e710b46..6b8b035a 100644 --- a/psi/inamestr.h +++ b/psi/inamestr.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/inobtokn.c b/psi/inobtokn.c index ec417b14..11cbde5d 100644 --- a/psi/inobtokn.c +++ b/psi/inobtokn.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/inouparm.c b/psi/inouparm.c index f4d45a4f..c4ec30f4 100644 --- a/psi/inouparm.c +++ b/psi/inouparm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/int.mak b/psi/int.mak index f149452a..1a40d202 100644 --- a/psi/int.mak +++ b/psi/int.mak @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2018 Artifex Software, Inc. +# Copyright (C) 2001-2020 Artifex Software, Inc. # All Rights Reserved. # # This software is provided AS-IS with no warranty, either express or @@ -1876,7 +1876,7 @@ $(PSOBJ)apitest.$(OBJ) : $(PSSRC)apitest.c $(GH)\ $(PSOBJ)iapi.$(OBJ) : $(PSSRC)iapi.c $(AK) $(psapi_h)\ $(string__h) $(ierrors_h) $(gscdefs_h) $(gstypes_h) $(iapi_h)\ $(iref_h) $(imain_h) $(imainarg_h) $(iminst_h) $(gslibctx_h)\ - $(INT_MAK) $(MAKEDIRS) + $(gsstate_h) $(icstate_h) $(INT_MAK) $(MAKEDIRS) $(PSCC) $(PSO_)iapi.$(OBJ) $(C_) $(PSSRC)iapi.c $(PSOBJ)psapi.$(OBJ) : $(PSSRC)psapi.c $(AK)\ @@ -1897,7 +1897,7 @@ gdevdsp2_h=$(DEVSRCDIR)$(D)gdevdsp2.h $(PSOBJ)idisp.$(OBJ) : $(PSSRC)idisp.c $(OP) $(stdio__h) $(gp_h)\ $(stdpre_h) $(gscdefs_h) $(gsdevice_h) $(gsmemory_h) $(gstypes_h)\ - $(iapi_h) $(iref_h)\ + $(iapi_h) $(iref_h) $(gxgstate_h) $(gxdevsop_h)\ $(imain_h) $(iminst_h) $(idisp_h) $(ostack_h)\ $(gx_h) $(gxdevice_h) $(gxdevmem_h) $(gdevdsp_h) $(gdevdsp2_h)\ $(INT_MAK) $(MAKEDIRS) @@ -1949,142 +1949,142 @@ $(PSSRC)ierrors.h:$(GLSRC)gserrors.h $(PSSRC)iconf.h:$(GLSRC)gxiodev.h $(PSSRC)iconf.h:$(GLSRC)gsparam.h $(PSSRC)iconf.h:$(GLSRC)gp.h +$(PSSRC)iconf.h:$(GLSRC)memory_.h $(PSSRC)iconf.h:$(GLSRC)srdline.h $(PSSRC)iconf.h:$(GLSRC)scommon.h $(PSSRC)iconf.h:$(GLSRC)gsfname.h -$(PSSRC)iconf.h:$(GLSRC)gsstype.h $(PSSRC)iconf.h:$(GLSRC)stat_.h +$(PSSRC)iconf.h:$(GLSRC)gsstype.h $(PSSRC)iconf.h:$(GLSRC)gsmemory.h -$(PSSRC)iconf.h:$(GLSRC)memory_.h $(PSSRC)iconf.h:$(GLSRC)gpgetenv.h -$(PSSRC)iconf.h:$(GLSRC)gslibctx.h $(PSSRC)iconf.h:$(GLSRC)gscdefs.h -$(PSSRC)iconf.h:$(GLSRC)gs_dll_call.h +$(PSSRC)iconf.h:$(GLSRC)gslibctx.h $(PSSRC)iconf.h:$(GLSRC)stdio_.h $(PSSRC)iconf.h:$(GLSRC)stdint_.h $(PSSRC)iconf.h:$(GLSRC)gssprintf.h -$(PSSRC)iconf.h:$(GLSRC)std.h $(PSSRC)iconf.h:$(GLSRC)gstypes.h +$(PSSRC)iconf.h:$(GLSRC)std.h $(PSSRC)iconf.h:$(GLSRC)stdpre.h $(PSSRC)iconf.h:$(GLGEN)arch.h +$(PSSRC)iconf.h:$(GLSRC)gs_dll_call.h $(PSSRC)idebug.h:$(PSSRC)iref.h $(PSSRC)idebug.h:$(GLSRC)gxalloc.h $(PSSRC)idebug.h:$(GLSRC)gxobj.h $(PSSRC)idebug.h:$(GLSRC)gsnamecl.h $(PSSRC)idebug.h:$(GLSRC)gxcspace.h +$(PSSRC)idebug.h:$(GLSRC)gscsel.h $(PSSRC)idebug.h:$(GLSRC)gsdcolor.h $(PSSRC)idebug.h:$(GLSRC)gxfrac.h $(PSSRC)idebug.h:$(GLSRC)gscms.h -$(PSSRC)idebug.h:$(GLSRC)gscspace.h $(PSSRC)idebug.h:$(GLSRC)gsdevice.h -$(PSSRC)idebug.h:$(GLSRC)gxarith.h -$(PSSRC)idebug.h:$(GLSRC)gxhttile.h +$(PSSRC)idebug.h:$(GLSRC)gscspace.h +$(PSSRC)idebug.h:$(GLSRC)gsgstate.h $(PSSRC)idebug.h:$(GLSRC)gsiparam.h -$(PSSRC)idebug.h:$(GLSRC)gxbitmap.h $(PSSRC)idebug.h:$(GLSRC)gsmatrix.h -$(PSSRC)idebug.h:$(GLSRC)gsrefct.h +$(PSSRC)idebug.h:$(GLSRC)gxhttile.h $(PSSRC)idebug.h:$(GLSRC)gsparam.h -$(PSSRC)idebug.h:$(GLSRC)gsccolor.h +$(PSSRC)idebug.h:$(GLSRC)gsrefct.h +$(PSSRC)idebug.h:$(GLSRC)memento.h $(PSSRC)idebug.h:$(GLSRC)gsstruct.h $(PSSRC)idebug.h:$(GLSRC)gxsync.h +$(PSSRC)idebug.h:$(GLSRC)gxbitmap.h $(PSSRC)idebug.h:$(GLSRC)scommon.h -$(PSSRC)idebug.h:$(GLSRC)memento.h -$(PSSRC)idebug.h:$(GLSRC)gscsel.h $(PSSRC)idebug.h:$(GLSRC)gsbitmap.h +$(PSSRC)idebug.h:$(GLSRC)gsccolor.h +$(PSSRC)idebug.h:$(GLSRC)gxarith.h +$(PSSRC)idebug.h:$(GLSRC)gpsync.h $(PSSRC)idebug.h:$(GLSRC)gsstype.h $(PSSRC)idebug.h:$(GLSRC)gsmemory.h -$(PSSRC)idebug.h:$(GLSRC)gpsync.h $(PSSRC)idebug.h:$(GLSRC)gslibctx.h -$(PSSRC)idebug.h:$(GLSRC)gs_dll_call.h $(PSSRC)idebug.h:$(GLSRC)gsalloc.h -$(PSSRC)idebug.h:$(GLSRC)stdio_.h $(PSSRC)idebug.h:$(GLSRC)gxcindex.h -$(PSSRC)idebug.h:$(GLSRC)gsgstate.h +$(PSSRC)idebug.h:$(GLSRC)stdio_.h $(PSSRC)idebug.h:$(GLSRC)stdint_.h $(PSSRC)idebug.h:$(GLSRC)gssprintf.h -$(PSSRC)idebug.h:$(GLSRC)std.h $(PSSRC)idebug.h:$(GLSRC)gstypes.h +$(PSSRC)idebug.h:$(GLSRC)std.h $(PSSRC)idebug.h:$(GLSRC)stdpre.h $(PSSRC)idebug.h:$(GLGEN)arch.h +$(PSSRC)idebug.h:$(GLSRC)gs_dll_call.h $(PSSRC)iddstack.h:$(PSSRC)iref.h $(PSSRC)iddstack.h:$(GLSRC)gxalloc.h $(PSSRC)iddstack.h:$(GLSRC)gxobj.h $(PSSRC)iddstack.h:$(GLSRC)gsnamecl.h $(PSSRC)iddstack.h:$(GLSRC)gxcspace.h +$(PSSRC)iddstack.h:$(GLSRC)gscsel.h $(PSSRC)iddstack.h:$(GLSRC)gsdcolor.h $(PSSRC)iddstack.h:$(GLSRC)gxfrac.h $(PSSRC)iddstack.h:$(GLSRC)gscms.h -$(PSSRC)iddstack.h:$(GLSRC)gscspace.h $(PSSRC)iddstack.h:$(GLSRC)gsdevice.h -$(PSSRC)iddstack.h:$(GLSRC)gxarith.h -$(PSSRC)iddstack.h:$(GLSRC)gxhttile.h +$(PSSRC)iddstack.h:$(GLSRC)gscspace.h +$(PSSRC)iddstack.h:$(GLSRC)gsgstate.h $(PSSRC)iddstack.h:$(GLSRC)gsiparam.h -$(PSSRC)iddstack.h:$(GLSRC)gxbitmap.h $(PSSRC)iddstack.h:$(GLSRC)gsmatrix.h -$(PSSRC)iddstack.h:$(GLSRC)gsrefct.h +$(PSSRC)iddstack.h:$(GLSRC)gxhttile.h $(PSSRC)iddstack.h:$(GLSRC)gsparam.h -$(PSSRC)iddstack.h:$(GLSRC)gsccolor.h +$(PSSRC)iddstack.h:$(GLSRC)gsrefct.h +$(PSSRC)iddstack.h:$(GLSRC)memento.h $(PSSRC)iddstack.h:$(GLSRC)gsstruct.h $(PSSRC)iddstack.h:$(GLSRC)gxsync.h +$(PSSRC)iddstack.h:$(GLSRC)gxbitmap.h $(PSSRC)iddstack.h:$(GLSRC)scommon.h -$(PSSRC)iddstack.h:$(GLSRC)memento.h -$(PSSRC)iddstack.h:$(GLSRC)gscsel.h $(PSSRC)iddstack.h:$(GLSRC)gsbitmap.h +$(PSSRC)iddstack.h:$(GLSRC)gsccolor.h +$(PSSRC)iddstack.h:$(GLSRC)gxarith.h +$(PSSRC)iddstack.h:$(GLSRC)gpsync.h $(PSSRC)iddstack.h:$(GLSRC)gsstype.h $(PSSRC)iddstack.h:$(GLSRC)gsmemory.h -$(PSSRC)iddstack.h:$(GLSRC)gpsync.h $(PSSRC)iddstack.h:$(GLSRC)gslibctx.h -$(PSSRC)iddstack.h:$(GLSRC)gs_dll_call.h $(PSSRC)iddstack.h:$(GLSRC)gsalloc.h -$(PSSRC)iddstack.h:$(GLSRC)stdio_.h $(PSSRC)iddstack.h:$(GLSRC)gxcindex.h -$(PSSRC)iddstack.h:$(GLSRC)gsgstate.h +$(PSSRC)iddstack.h:$(GLSRC)stdio_.h $(PSSRC)iddstack.h:$(GLSRC)stdint_.h $(PSSRC)iddstack.h:$(GLSRC)gssprintf.h -$(PSSRC)iddstack.h:$(GLSRC)std.h $(PSSRC)iddstack.h:$(GLSRC)gstypes.h +$(PSSRC)iddstack.h:$(GLSRC)std.h $(PSSRC)iddstack.h:$(GLSRC)stdpre.h $(PSSRC)iddstack.h:$(GLGEN)arch.h +$(PSSRC)iddstack.h:$(GLSRC)gs_dll_call.h $(PSSRC)idict.h:$(PSSRC)iddstack.h $(PSSRC)idict.h:$(PSSRC)iref.h $(PSSRC)idict.h:$(GLSRC)gxalloc.h $(PSSRC)idict.h:$(GLSRC)gxobj.h $(PSSRC)idict.h:$(GLSRC)gsnamecl.h $(PSSRC)idict.h:$(GLSRC)gxcspace.h +$(PSSRC)idict.h:$(GLSRC)gscsel.h $(PSSRC)idict.h:$(GLSRC)gsdcolor.h $(PSSRC)idict.h:$(GLSRC)gxfrac.h $(PSSRC)idict.h:$(GLSRC)gscms.h -$(PSSRC)idict.h:$(GLSRC)gscspace.h $(PSSRC)idict.h:$(GLSRC)gsdevice.h -$(PSSRC)idict.h:$(GLSRC)gxarith.h -$(PSSRC)idict.h:$(GLSRC)gxhttile.h +$(PSSRC)idict.h:$(GLSRC)gscspace.h +$(PSSRC)idict.h:$(GLSRC)gsgstate.h $(PSSRC)idict.h:$(GLSRC)gsiparam.h -$(PSSRC)idict.h:$(GLSRC)gxbitmap.h $(PSSRC)idict.h:$(GLSRC)gsmatrix.h -$(PSSRC)idict.h:$(GLSRC)gsrefct.h +$(PSSRC)idict.h:$(GLSRC)gxhttile.h $(PSSRC)idict.h:$(GLSRC)gsparam.h -$(PSSRC)idict.h:$(GLSRC)gsccolor.h +$(PSSRC)idict.h:$(GLSRC)gsrefct.h +$(PSSRC)idict.h:$(GLSRC)memento.h $(PSSRC)idict.h:$(GLSRC)gsstruct.h $(PSSRC)idict.h:$(GLSRC)gxsync.h +$(PSSRC)idict.h:$(GLSRC)gxbitmap.h $(PSSRC)idict.h:$(GLSRC)scommon.h -$(PSSRC)idict.h:$(GLSRC)memento.h -$(PSSRC)idict.h:$(GLSRC)gscsel.h $(PSSRC)idict.h:$(GLSRC)gsbitmap.h +$(PSSRC)idict.h:$(GLSRC)gsccolor.h +$(PSSRC)idict.h:$(GLSRC)gxarith.h +$(PSSRC)idict.h:$(GLSRC)gpsync.h $(PSSRC)idict.h:$(GLSRC)gsstype.h $(PSSRC)idict.h:$(GLSRC)gsmemory.h -$(PSSRC)idict.h:$(GLSRC)gpsync.h $(PSSRC)idict.h:$(GLSRC)gslibctx.h -$(PSSRC)idict.h:$(GLSRC)gs_dll_call.h $(PSSRC)idict.h:$(GLSRC)gsalloc.h -$(PSSRC)idict.h:$(GLSRC)stdio_.h $(PSSRC)idict.h:$(GLSRC)gxcindex.h -$(PSSRC)idict.h:$(GLSRC)gsgstate.h +$(PSSRC)idict.h:$(GLSRC)stdio_.h $(PSSRC)idict.h:$(GLSRC)stdint_.h $(PSSRC)idict.h:$(GLSRC)gssprintf.h -$(PSSRC)idict.h:$(GLSRC)std.h $(PSSRC)idict.h:$(GLSRC)gstypes.h +$(PSSRC)idict.h:$(GLSRC)std.h $(PSSRC)idict.h:$(GLSRC)stdpre.h $(PSSRC)idict.h:$(GLGEN)arch.h +$(PSSRC)idict.h:$(GLSRC)gs_dll_call.h $(PSSRC)idosave.h:$(PSSRC)imemory.h $(PSSRC)idosave.h:$(PSSRC)ivmspace.h $(PSSRC)idosave.h:$(PSSRC)iref.h @@ -2093,58 +2093,58 @@ $(PSSRC)idosave.h:$(GLSRC)gxalloc.h $(PSSRC)idosave.h:$(GLSRC)gxobj.h $(PSSRC)idosave.h:$(GLSRC)gsnamecl.h $(PSSRC)idosave.h:$(GLSRC)gxcspace.h +$(PSSRC)idosave.h:$(GLSRC)gscsel.h $(PSSRC)idosave.h:$(GLSRC)gsdcolor.h $(PSSRC)idosave.h:$(GLSRC)gxfrac.h $(PSSRC)idosave.h:$(GLSRC)gscms.h -$(PSSRC)idosave.h:$(GLSRC)gscspace.h $(PSSRC)idosave.h:$(GLSRC)gsdevice.h -$(PSSRC)idosave.h:$(GLSRC)gxarith.h -$(PSSRC)idosave.h:$(GLSRC)gxhttile.h +$(PSSRC)idosave.h:$(GLSRC)gscspace.h +$(PSSRC)idosave.h:$(GLSRC)gsgstate.h $(PSSRC)idosave.h:$(GLSRC)gsiparam.h -$(PSSRC)idosave.h:$(GLSRC)gxbitmap.h $(PSSRC)idosave.h:$(GLSRC)gsmatrix.h -$(PSSRC)idosave.h:$(GLSRC)gsrefct.h +$(PSSRC)idosave.h:$(GLSRC)gxhttile.h $(PSSRC)idosave.h:$(GLSRC)gsparam.h -$(PSSRC)idosave.h:$(GLSRC)gsccolor.h +$(PSSRC)idosave.h:$(GLSRC)gsrefct.h +$(PSSRC)idosave.h:$(GLSRC)memento.h $(PSSRC)idosave.h:$(GLSRC)gsstruct.h $(PSSRC)idosave.h:$(GLSRC)gxsync.h +$(PSSRC)idosave.h:$(GLSRC)gxbitmap.h $(PSSRC)idosave.h:$(GLSRC)scommon.h -$(PSSRC)idosave.h:$(GLSRC)memento.h -$(PSSRC)idosave.h:$(GLSRC)gscsel.h $(PSSRC)idosave.h:$(GLSRC)gsbitmap.h +$(PSSRC)idosave.h:$(GLSRC)gsccolor.h +$(PSSRC)idosave.h:$(GLSRC)gxarith.h +$(PSSRC)idosave.h:$(GLSRC)gpsync.h $(PSSRC)idosave.h:$(GLSRC)gsstype.h $(PSSRC)idosave.h:$(GLSRC)gsmemory.h -$(PSSRC)idosave.h:$(GLSRC)gpsync.h $(PSSRC)idosave.h:$(GLSRC)gslibctx.h -$(PSSRC)idosave.h:$(GLSRC)gs_dll_call.h $(PSSRC)idosave.h:$(GLSRC)gsalloc.h -$(PSSRC)idosave.h:$(GLSRC)stdio_.h $(PSSRC)idosave.h:$(GLSRC)gxcindex.h -$(PSSRC)idosave.h:$(GLSRC)gsgstate.h +$(PSSRC)idosave.h:$(GLSRC)stdio_.h $(PSSRC)idosave.h:$(GLSRC)stdint_.h $(PSSRC)idosave.h:$(GLSRC)gssprintf.h -$(PSSRC)idosave.h:$(GLSRC)std.h $(PSSRC)idosave.h:$(GLSRC)gstypes.h +$(PSSRC)idosave.h:$(GLSRC)std.h $(PSSRC)idosave.h:$(GLSRC)stdpre.h $(PSSRC)idosave.h:$(GLGEN)arch.h +$(PSSRC)idosave.h:$(GLSRC)gs_dll_call.h $(PSSRC)igcstr.h:$(GLSRC)gxalloc.h $(PSSRC)igcstr.h:$(GLSRC)gxobj.h -$(PSSRC)igcstr.h:$(GLSRC)gxbitmap.h $(PSSRC)igcstr.h:$(GLSRC)gsstruct.h +$(PSSRC)igcstr.h:$(GLSRC)gxbitmap.h $(PSSRC)igcstr.h:$(GLSRC)scommon.h $(PSSRC)igcstr.h:$(GLSRC)gsbitmap.h $(PSSRC)igcstr.h:$(GLSRC)gsstype.h $(PSSRC)igcstr.h:$(GLSRC)gsmemory.h $(PSSRC)igcstr.h:$(GLSRC)gslibctx.h -$(PSSRC)igcstr.h:$(GLSRC)gs_dll_call.h $(PSSRC)igcstr.h:$(GLSRC)gsalloc.h $(PSSRC)igcstr.h:$(GLSRC)stdio_.h $(PSSRC)igcstr.h:$(GLSRC)stdint_.h $(PSSRC)igcstr.h:$(GLSRC)gssprintf.h -$(PSSRC)igcstr.h:$(GLSRC)std.h $(PSSRC)igcstr.h:$(GLSRC)gstypes.h +$(PSSRC)igcstr.h:$(GLSRC)std.h $(PSSRC)igcstr.h:$(GLSRC)stdpre.h $(PSSRC)igcstr.h:$(GLGEN)arch.h +$(PSSRC)igcstr.h:$(GLSRC)gs_dll_call.h $(PSSRC)inames.h:$(PSSRC)imemory.h $(PSSRC)inames.h:$(PSSRC)ivmspace.h $(PSSRC)inames.h:$(PSSRC)iref.h @@ -2153,40 +2153,40 @@ $(PSSRC)inames.h:$(GLSRC)gxalloc.h $(PSSRC)inames.h:$(GLSRC)gxobj.h $(PSSRC)inames.h:$(GLSRC)gsnamecl.h $(PSSRC)inames.h:$(GLSRC)gxcspace.h +$(PSSRC)inames.h:$(GLSRC)gscsel.h $(PSSRC)inames.h:$(GLSRC)gsdcolor.h $(PSSRC)inames.h:$(GLSRC)gxfrac.h $(PSSRC)inames.h:$(GLSRC)gscms.h -$(PSSRC)inames.h:$(GLSRC)gscspace.h $(PSSRC)inames.h:$(GLSRC)gsdevice.h -$(PSSRC)inames.h:$(GLSRC)gxarith.h -$(PSSRC)inames.h:$(GLSRC)gxhttile.h +$(PSSRC)inames.h:$(GLSRC)gscspace.h +$(PSSRC)inames.h:$(GLSRC)gsgstate.h $(PSSRC)inames.h:$(GLSRC)gsiparam.h -$(PSSRC)inames.h:$(GLSRC)gxbitmap.h $(PSSRC)inames.h:$(GLSRC)gsmatrix.h -$(PSSRC)inames.h:$(GLSRC)gsrefct.h +$(PSSRC)inames.h:$(GLSRC)gxhttile.h $(PSSRC)inames.h:$(GLSRC)gsparam.h -$(PSSRC)inames.h:$(GLSRC)gsccolor.h +$(PSSRC)inames.h:$(GLSRC)gsrefct.h +$(PSSRC)inames.h:$(GLSRC)memento.h $(PSSRC)inames.h:$(GLSRC)gsstruct.h $(PSSRC)inames.h:$(GLSRC)gxsync.h +$(PSSRC)inames.h:$(GLSRC)gxbitmap.h $(PSSRC)inames.h:$(GLSRC)scommon.h -$(PSSRC)inames.h:$(GLSRC)memento.h -$(PSSRC)inames.h:$(GLSRC)gscsel.h $(PSSRC)inames.h:$(GLSRC)gsbitmap.h +$(PSSRC)inames.h:$(GLSRC)gsccolor.h +$(PSSRC)inames.h:$(GLSRC)gxarith.h +$(PSSRC)inames.h:$(GLSRC)gpsync.h $(PSSRC)inames.h:$(GLSRC)gsstype.h $(PSSRC)inames.h:$(GLSRC)gsmemory.h -$(PSSRC)inames.h:$(GLSRC)gpsync.h $(PSSRC)inames.h:$(GLSRC)gslibctx.h -$(PSSRC)inames.h:$(GLSRC)gs_dll_call.h $(PSSRC)inames.h:$(GLSRC)gsalloc.h -$(PSSRC)inames.h:$(GLSRC)stdio_.h $(PSSRC)inames.h:$(GLSRC)gxcindex.h -$(PSSRC)inames.h:$(GLSRC)gsgstate.h +$(PSSRC)inames.h:$(GLSRC)stdio_.h $(PSSRC)inames.h:$(GLSRC)stdint_.h $(PSSRC)inames.h:$(GLSRC)gssprintf.h -$(PSSRC)inames.h:$(GLSRC)std.h $(PSSRC)inames.h:$(GLSRC)gstypes.h +$(PSSRC)inames.h:$(GLSRC)std.h $(PSSRC)inames.h:$(GLSRC)stdpre.h $(PSSRC)inames.h:$(GLGEN)arch.h +$(PSSRC)inames.h:$(GLSRC)gs_dll_call.h $(PSSRC)iname.h:$(PSSRC)inames.h $(PSSRC)iname.h:$(PSSRC)imemory.h $(PSSRC)iname.h:$(PSSRC)ivmspace.h @@ -2196,80 +2196,80 @@ $(PSSRC)iname.h:$(GLSRC)gxalloc.h $(PSSRC)iname.h:$(GLSRC)gxobj.h $(PSSRC)iname.h:$(GLSRC)gsnamecl.h $(PSSRC)iname.h:$(GLSRC)gxcspace.h +$(PSSRC)iname.h:$(GLSRC)gscsel.h $(PSSRC)iname.h:$(GLSRC)gsdcolor.h $(PSSRC)iname.h:$(GLSRC)gxfrac.h $(PSSRC)iname.h:$(GLSRC)gscms.h -$(PSSRC)iname.h:$(GLSRC)gscspace.h $(PSSRC)iname.h:$(GLSRC)gsdevice.h -$(PSSRC)iname.h:$(GLSRC)gxarith.h -$(PSSRC)iname.h:$(GLSRC)gxhttile.h +$(PSSRC)iname.h:$(GLSRC)gscspace.h +$(PSSRC)iname.h:$(GLSRC)gsgstate.h $(PSSRC)iname.h:$(GLSRC)gsiparam.h -$(PSSRC)iname.h:$(GLSRC)gxbitmap.h $(PSSRC)iname.h:$(GLSRC)gsmatrix.h -$(PSSRC)iname.h:$(GLSRC)gsrefct.h +$(PSSRC)iname.h:$(GLSRC)gxhttile.h $(PSSRC)iname.h:$(GLSRC)gsparam.h -$(PSSRC)iname.h:$(GLSRC)gsccolor.h +$(PSSRC)iname.h:$(GLSRC)gsrefct.h +$(PSSRC)iname.h:$(GLSRC)memento.h $(PSSRC)iname.h:$(GLSRC)gsstruct.h $(PSSRC)iname.h:$(GLSRC)gxsync.h +$(PSSRC)iname.h:$(GLSRC)gxbitmap.h $(PSSRC)iname.h:$(GLSRC)scommon.h -$(PSSRC)iname.h:$(GLSRC)memento.h -$(PSSRC)iname.h:$(GLSRC)gscsel.h $(PSSRC)iname.h:$(GLSRC)gsbitmap.h +$(PSSRC)iname.h:$(GLSRC)gsccolor.h +$(PSSRC)iname.h:$(GLSRC)gxarith.h +$(PSSRC)iname.h:$(GLSRC)gpsync.h $(PSSRC)iname.h:$(GLSRC)gsstype.h $(PSSRC)iname.h:$(GLSRC)gsmemory.h -$(PSSRC)iname.h:$(GLSRC)gpsync.h $(PSSRC)iname.h:$(GLSRC)gslibctx.h -$(PSSRC)iname.h:$(GLSRC)gs_dll_call.h $(PSSRC)iname.h:$(GLSRC)gsalloc.h -$(PSSRC)iname.h:$(GLSRC)stdio_.h $(PSSRC)iname.h:$(GLSRC)gxcindex.h -$(PSSRC)iname.h:$(GLSRC)gsgstate.h +$(PSSRC)iname.h:$(GLSRC)stdio_.h $(PSSRC)iname.h:$(GLSRC)stdint_.h $(PSSRC)iname.h:$(GLSRC)gssprintf.h -$(PSSRC)iname.h:$(GLSRC)std.h $(PSSRC)iname.h:$(GLSRC)gstypes.h +$(PSSRC)iname.h:$(GLSRC)std.h $(PSSRC)iname.h:$(GLSRC)stdpre.h $(PSSRC)iname.h:$(GLGEN)arch.h +$(PSSRC)iname.h:$(GLSRC)gs_dll_call.h $(PSSRC)inamestr.h:$(PSSRC)inameidx.h $(PSSRC)inamestr.h:$(GLSRC)stdpre.h $(PSSRC)iref.h:$(GLSRC)gxalloc.h $(PSSRC)iref.h:$(GLSRC)gxobj.h $(PSSRC)iref.h:$(GLSRC)gsnamecl.h $(PSSRC)iref.h:$(GLSRC)gxcspace.h +$(PSSRC)iref.h:$(GLSRC)gscsel.h $(PSSRC)iref.h:$(GLSRC)gsdcolor.h $(PSSRC)iref.h:$(GLSRC)gxfrac.h $(PSSRC)iref.h:$(GLSRC)gscms.h -$(PSSRC)iref.h:$(GLSRC)gscspace.h $(PSSRC)iref.h:$(GLSRC)gsdevice.h -$(PSSRC)iref.h:$(GLSRC)gxarith.h -$(PSSRC)iref.h:$(GLSRC)gxhttile.h +$(PSSRC)iref.h:$(GLSRC)gscspace.h +$(PSSRC)iref.h:$(GLSRC)gsgstate.h $(PSSRC)iref.h:$(GLSRC)gsiparam.h -$(PSSRC)iref.h:$(GLSRC)gxbitmap.h $(PSSRC)iref.h:$(GLSRC)gsmatrix.h -$(PSSRC)iref.h:$(GLSRC)gsrefct.h +$(PSSRC)iref.h:$(GLSRC)gxhttile.h $(PSSRC)iref.h:$(GLSRC)gsparam.h -$(PSSRC)iref.h:$(GLSRC)gsccolor.h +$(PSSRC)iref.h:$(GLSRC)gsrefct.h +$(PSSRC)iref.h:$(GLSRC)memento.h $(PSSRC)iref.h:$(GLSRC)gsstruct.h $(PSSRC)iref.h:$(GLSRC)gxsync.h +$(PSSRC)iref.h:$(GLSRC)gxbitmap.h $(PSSRC)iref.h:$(GLSRC)scommon.h -$(PSSRC)iref.h:$(GLSRC)memento.h -$(PSSRC)iref.h:$(GLSRC)gscsel.h $(PSSRC)iref.h:$(GLSRC)gsbitmap.h +$(PSSRC)iref.h:$(GLSRC)gsccolor.h +$(PSSRC)iref.h:$(GLSRC)gxarith.h +$(PSSRC)iref.h:$(GLSRC)gpsync.h $(PSSRC)iref.h:$(GLSRC)gsstype.h $(PSSRC)iref.h:$(GLSRC)gsmemory.h -$(PSSRC)iref.h:$(GLSRC)gpsync.h $(PSSRC)iref.h:$(GLSRC)gslibctx.h -$(PSSRC)iref.h:$(GLSRC)gs_dll_call.h $(PSSRC)iref.h:$(GLSRC)gsalloc.h -$(PSSRC)iref.h:$(GLSRC)stdio_.h $(PSSRC)iref.h:$(GLSRC)gxcindex.h -$(PSSRC)iref.h:$(GLSRC)gsgstate.h +$(PSSRC)iref.h:$(GLSRC)stdio_.h $(PSSRC)iref.h:$(GLSRC)stdint_.h $(PSSRC)iref.h:$(GLSRC)gssprintf.h -$(PSSRC)iref.h:$(GLSRC)std.h $(PSSRC)iref.h:$(GLSRC)gstypes.h +$(PSSRC)iref.h:$(GLSRC)std.h $(PSSRC)iref.h:$(GLSRC)stdpre.h $(PSSRC)iref.h:$(GLGEN)arch.h +$(PSSRC)iref.h:$(GLSRC)gs_dll_call.h $(PSSRC)isave.h:$(PSSRC)idosave.h $(PSSRC)isave.h:$(PSSRC)imemory.h $(PSSRC)isave.h:$(PSSRC)ivmspace.h @@ -2279,98 +2279,98 @@ $(PSSRC)isave.h:$(GLSRC)gxalloc.h $(PSSRC)isave.h:$(GLSRC)gxobj.h $(PSSRC)isave.h:$(GLSRC)gsnamecl.h $(PSSRC)isave.h:$(GLSRC)gxcspace.h +$(PSSRC)isave.h:$(GLSRC)gscsel.h $(PSSRC)isave.h:$(GLSRC)gsdcolor.h $(PSSRC)isave.h:$(GLSRC)gxfrac.h $(PSSRC)isave.h:$(GLSRC)gscms.h -$(PSSRC)isave.h:$(GLSRC)gscspace.h $(PSSRC)isave.h:$(GLSRC)gsdevice.h -$(PSSRC)isave.h:$(GLSRC)gxarith.h -$(PSSRC)isave.h:$(GLSRC)gxhttile.h +$(PSSRC)isave.h:$(GLSRC)gscspace.h +$(PSSRC)isave.h:$(GLSRC)gsgstate.h $(PSSRC)isave.h:$(GLSRC)gsiparam.h -$(PSSRC)isave.h:$(GLSRC)gxbitmap.h $(PSSRC)isave.h:$(GLSRC)gsmatrix.h -$(PSSRC)isave.h:$(GLSRC)gsrefct.h +$(PSSRC)isave.h:$(GLSRC)gxhttile.h $(PSSRC)isave.h:$(GLSRC)gsparam.h -$(PSSRC)isave.h:$(GLSRC)gsccolor.h +$(PSSRC)isave.h:$(GLSRC)gsrefct.h +$(PSSRC)isave.h:$(GLSRC)memento.h $(PSSRC)isave.h:$(GLSRC)gsstruct.h $(PSSRC)isave.h:$(GLSRC)gxsync.h +$(PSSRC)isave.h:$(GLSRC)gxbitmap.h $(PSSRC)isave.h:$(GLSRC)scommon.h -$(PSSRC)isave.h:$(GLSRC)memento.h -$(PSSRC)isave.h:$(GLSRC)gscsel.h $(PSSRC)isave.h:$(GLSRC)gsbitmap.h +$(PSSRC)isave.h:$(GLSRC)gsccolor.h +$(PSSRC)isave.h:$(GLSRC)gxarith.h +$(PSSRC)isave.h:$(GLSRC)gpsync.h $(PSSRC)isave.h:$(GLSRC)gsstype.h $(PSSRC)isave.h:$(GLSRC)gsmemory.h -$(PSSRC)isave.h:$(GLSRC)gpsync.h $(PSSRC)isave.h:$(GLSRC)gslibctx.h -$(PSSRC)isave.h:$(GLSRC)gs_dll_call.h $(PSSRC)isave.h:$(GLSRC)gsalloc.h -$(PSSRC)isave.h:$(GLSRC)stdio_.h $(PSSRC)isave.h:$(GLSRC)gxcindex.h -$(PSSRC)isave.h:$(GLSRC)gsgstate.h +$(PSSRC)isave.h:$(GLSRC)stdio_.h $(PSSRC)isave.h:$(GLSRC)stdint_.h $(PSSRC)isave.h:$(GLSRC)gssprintf.h -$(PSSRC)isave.h:$(GLSRC)std.h $(PSSRC)isave.h:$(GLSRC)gstypes.h +$(PSSRC)isave.h:$(GLSRC)std.h $(PSSRC)isave.h:$(GLSRC)stdpre.h $(PSSRC)isave.h:$(GLGEN)arch.h +$(PSSRC)isave.h:$(GLSRC)gs_dll_call.h $(PSSRC)isstate.h:$(GLSRC)gsgc.h $(PSSRC)isstate.h:$(GLSRC)gxalloc.h $(PSSRC)isstate.h:$(GLSRC)gxobj.h -$(PSSRC)isstate.h:$(GLSRC)gxbitmap.h $(PSSRC)isstate.h:$(GLSRC)gsstruct.h +$(PSSRC)isstate.h:$(GLSRC)gxbitmap.h $(PSSRC)isstate.h:$(GLSRC)scommon.h $(PSSRC)isstate.h:$(GLSRC)gsbitmap.h $(PSSRC)isstate.h:$(GLSRC)gsstype.h $(PSSRC)isstate.h:$(GLSRC)gsmemory.h $(PSSRC)isstate.h:$(GLSRC)gslibctx.h -$(PSSRC)isstate.h:$(GLSRC)gs_dll_call.h $(PSSRC)isstate.h:$(GLSRC)gsalloc.h $(PSSRC)isstate.h:$(GLSRC)stdio_.h $(PSSRC)isstate.h:$(GLSRC)stdint_.h $(PSSRC)isstate.h:$(GLSRC)gssprintf.h -$(PSSRC)isstate.h:$(GLSRC)std.h $(PSSRC)isstate.h:$(GLSRC)gstypes.h +$(PSSRC)isstate.h:$(GLSRC)std.h $(PSSRC)isstate.h:$(GLSRC)stdpre.h $(PSSRC)isstate.h:$(GLGEN)arch.h +$(PSSRC)isstate.h:$(GLSRC)gs_dll_call.h $(PSSRC)istruct.h:$(PSSRC)iref.h $(PSSRC)istruct.h:$(GLSRC)gxalloc.h $(PSSRC)istruct.h:$(GLSRC)gxobj.h $(PSSRC)istruct.h:$(GLSRC)gsnamecl.h $(PSSRC)istruct.h:$(GLSRC)gxcspace.h +$(PSSRC)istruct.h:$(GLSRC)gscsel.h $(PSSRC)istruct.h:$(GLSRC)gsdcolor.h $(PSSRC)istruct.h:$(GLSRC)gxfrac.h $(PSSRC)istruct.h:$(GLSRC)gscms.h -$(PSSRC)istruct.h:$(GLSRC)gscspace.h $(PSSRC)istruct.h:$(GLSRC)gsdevice.h -$(PSSRC)istruct.h:$(GLSRC)gxarith.h -$(PSSRC)istruct.h:$(GLSRC)gxhttile.h +$(PSSRC)istruct.h:$(GLSRC)gscspace.h +$(PSSRC)istruct.h:$(GLSRC)gsgstate.h $(PSSRC)istruct.h:$(GLSRC)gsiparam.h -$(PSSRC)istruct.h:$(GLSRC)gxbitmap.h $(PSSRC)istruct.h:$(GLSRC)gsmatrix.h -$(PSSRC)istruct.h:$(GLSRC)gsrefct.h +$(PSSRC)istruct.h:$(GLSRC)gxhttile.h $(PSSRC)istruct.h:$(GLSRC)gsparam.h -$(PSSRC)istruct.h:$(GLSRC)gsccolor.h +$(PSSRC)istruct.h:$(GLSRC)gsrefct.h +$(PSSRC)istruct.h:$(GLSRC)memento.h $(PSSRC)istruct.h:$(GLSRC)gsstruct.h $(PSSRC)istruct.h:$(GLSRC)gxsync.h +$(PSSRC)istruct.h:$(GLSRC)gxbitmap.h $(PSSRC)istruct.h:$(GLSRC)scommon.h -$(PSSRC)istruct.h:$(GLSRC)memento.h -$(PSSRC)istruct.h:$(GLSRC)gscsel.h $(PSSRC)istruct.h:$(GLSRC)gsbitmap.h +$(PSSRC)istruct.h:$(GLSRC)gsccolor.h +$(PSSRC)istruct.h:$(GLSRC)gxarith.h +$(PSSRC)istruct.h:$(GLSRC)gpsync.h $(PSSRC)istruct.h:$(GLSRC)gsstype.h $(PSSRC)istruct.h:$(GLSRC)gsmemory.h -$(PSSRC)istruct.h:$(GLSRC)gpsync.h $(PSSRC)istruct.h:$(GLSRC)gslibctx.h -$(PSSRC)istruct.h:$(GLSRC)gs_dll_call.h $(PSSRC)istruct.h:$(GLSRC)gsalloc.h -$(PSSRC)istruct.h:$(GLSRC)stdio_.h $(PSSRC)istruct.h:$(GLSRC)gxcindex.h -$(PSSRC)istruct.h:$(GLSRC)gsgstate.h +$(PSSRC)istruct.h:$(GLSRC)stdio_.h $(PSSRC)istruct.h:$(GLSRC)stdint_.h $(PSSRC)istruct.h:$(GLSRC)gssprintf.h -$(PSSRC)istruct.h:$(GLSRC)std.h $(PSSRC)istruct.h:$(GLSRC)gstypes.h +$(PSSRC)istruct.h:$(GLSRC)std.h $(PSSRC)istruct.h:$(GLSRC)stdpre.h $(PSSRC)istruct.h:$(GLGEN)arch.h +$(PSSRC)istruct.h:$(GLSRC)gs_dll_call.h $(PSSRC)iutil.h:$(PSSRC)imemory.h $(PSSRC)iutil.h:$(PSSRC)ivmspace.h $(PSSRC)iutil.h:$(PSSRC)iref.h @@ -2379,119 +2379,119 @@ $(PSSRC)iutil.h:$(GLSRC)gxalloc.h $(PSSRC)iutil.h:$(GLSRC)gxobj.h $(PSSRC)iutil.h:$(GLSRC)gsnamecl.h $(PSSRC)iutil.h:$(GLSRC)gxcspace.h +$(PSSRC)iutil.h:$(GLSRC)gscsel.h $(PSSRC)iutil.h:$(GLSRC)gsdcolor.h $(PSSRC)iutil.h:$(GLSRC)gxfrac.h $(PSSRC)iutil.h:$(GLSRC)gscms.h -$(PSSRC)iutil.h:$(GLSRC)gscspace.h $(PSSRC)iutil.h:$(GLSRC)gsdevice.h -$(PSSRC)iutil.h:$(GLSRC)gxarith.h -$(PSSRC)iutil.h:$(GLSRC)gxhttile.h +$(PSSRC)iutil.h:$(GLSRC)gscspace.h +$(PSSRC)iutil.h:$(GLSRC)gsgstate.h $(PSSRC)iutil.h:$(GLSRC)gsiparam.h -$(PSSRC)iutil.h:$(GLSRC)gxbitmap.h $(PSSRC)iutil.h:$(GLSRC)gsmatrix.h -$(PSSRC)iutil.h:$(GLSRC)gsrefct.h +$(PSSRC)iutil.h:$(GLSRC)gxhttile.h $(PSSRC)iutil.h:$(GLSRC)gsparam.h -$(PSSRC)iutil.h:$(GLSRC)gsccolor.h +$(PSSRC)iutil.h:$(GLSRC)gsrefct.h +$(PSSRC)iutil.h:$(GLSRC)memento.h $(PSSRC)iutil.h:$(GLSRC)gsstruct.h $(PSSRC)iutil.h:$(GLSRC)gxsync.h +$(PSSRC)iutil.h:$(GLSRC)gxbitmap.h $(PSSRC)iutil.h:$(GLSRC)scommon.h -$(PSSRC)iutil.h:$(GLSRC)memento.h -$(PSSRC)iutil.h:$(GLSRC)gscsel.h $(PSSRC)iutil.h:$(GLSRC)gsbitmap.h +$(PSSRC)iutil.h:$(GLSRC)gsccolor.h +$(PSSRC)iutil.h:$(GLSRC)gxarith.h +$(PSSRC)iutil.h:$(GLSRC)gpsync.h $(PSSRC)iutil.h:$(GLSRC)gsstype.h $(PSSRC)iutil.h:$(GLSRC)gsmemory.h -$(PSSRC)iutil.h:$(GLSRC)gpsync.h $(PSSRC)iutil.h:$(GLSRC)gslibctx.h -$(PSSRC)iutil.h:$(GLSRC)gs_dll_call.h $(PSSRC)iutil.h:$(GLSRC)gsalloc.h -$(PSSRC)iutil.h:$(GLSRC)stdio_.h $(PSSRC)iutil.h:$(GLSRC)gxcindex.h -$(PSSRC)iutil.h:$(GLSRC)gsgstate.h +$(PSSRC)iutil.h:$(GLSRC)stdio_.h $(PSSRC)iutil.h:$(GLSRC)stdint_.h $(PSSRC)iutil.h:$(GLSRC)gssprintf.h -$(PSSRC)iutil.h:$(GLSRC)std.h $(PSSRC)iutil.h:$(GLSRC)gstypes.h +$(PSSRC)iutil.h:$(GLSRC)std.h $(PSSRC)iutil.h:$(GLSRC)stdpre.h $(PSSRC)iutil.h:$(GLGEN)arch.h +$(PSSRC)iutil.h:$(GLSRC)gs_dll_call.h $(PSSRC)ivmspace.h:$(PSSRC)iref.h $(PSSRC)ivmspace.h:$(GLSRC)gsgc.h $(PSSRC)ivmspace.h:$(GLSRC)gxalloc.h $(PSSRC)ivmspace.h:$(GLSRC)gxobj.h $(PSSRC)ivmspace.h:$(GLSRC)gsnamecl.h $(PSSRC)ivmspace.h:$(GLSRC)gxcspace.h +$(PSSRC)ivmspace.h:$(GLSRC)gscsel.h $(PSSRC)ivmspace.h:$(GLSRC)gsdcolor.h $(PSSRC)ivmspace.h:$(GLSRC)gxfrac.h $(PSSRC)ivmspace.h:$(GLSRC)gscms.h -$(PSSRC)ivmspace.h:$(GLSRC)gscspace.h $(PSSRC)ivmspace.h:$(GLSRC)gsdevice.h -$(PSSRC)ivmspace.h:$(GLSRC)gxarith.h -$(PSSRC)ivmspace.h:$(GLSRC)gxhttile.h +$(PSSRC)ivmspace.h:$(GLSRC)gscspace.h +$(PSSRC)ivmspace.h:$(GLSRC)gsgstate.h $(PSSRC)ivmspace.h:$(GLSRC)gsiparam.h -$(PSSRC)ivmspace.h:$(GLSRC)gxbitmap.h $(PSSRC)ivmspace.h:$(GLSRC)gsmatrix.h -$(PSSRC)ivmspace.h:$(GLSRC)gsrefct.h +$(PSSRC)ivmspace.h:$(GLSRC)gxhttile.h $(PSSRC)ivmspace.h:$(GLSRC)gsparam.h -$(PSSRC)ivmspace.h:$(GLSRC)gsccolor.h +$(PSSRC)ivmspace.h:$(GLSRC)gsrefct.h +$(PSSRC)ivmspace.h:$(GLSRC)memento.h $(PSSRC)ivmspace.h:$(GLSRC)gsstruct.h $(PSSRC)ivmspace.h:$(GLSRC)gxsync.h +$(PSSRC)ivmspace.h:$(GLSRC)gxbitmap.h $(PSSRC)ivmspace.h:$(GLSRC)scommon.h -$(PSSRC)ivmspace.h:$(GLSRC)memento.h -$(PSSRC)ivmspace.h:$(GLSRC)gscsel.h $(PSSRC)ivmspace.h:$(GLSRC)gsbitmap.h +$(PSSRC)ivmspace.h:$(GLSRC)gsccolor.h +$(PSSRC)ivmspace.h:$(GLSRC)gxarith.h +$(PSSRC)ivmspace.h:$(GLSRC)gpsync.h $(PSSRC)ivmspace.h:$(GLSRC)gsstype.h $(PSSRC)ivmspace.h:$(GLSRC)gsmemory.h -$(PSSRC)ivmspace.h:$(GLSRC)gpsync.h $(PSSRC)ivmspace.h:$(GLSRC)gslibctx.h -$(PSSRC)ivmspace.h:$(GLSRC)gs_dll_call.h $(PSSRC)ivmspace.h:$(GLSRC)gsalloc.h -$(PSSRC)ivmspace.h:$(GLSRC)stdio_.h $(PSSRC)ivmspace.h:$(GLSRC)gxcindex.h -$(PSSRC)ivmspace.h:$(GLSRC)gsgstate.h +$(PSSRC)ivmspace.h:$(GLSRC)stdio_.h $(PSSRC)ivmspace.h:$(GLSRC)stdint_.h $(PSSRC)ivmspace.h:$(GLSRC)gssprintf.h -$(PSSRC)ivmspace.h:$(GLSRC)std.h $(PSSRC)ivmspace.h:$(GLSRC)gstypes.h +$(PSSRC)ivmspace.h:$(GLSRC)std.h $(PSSRC)ivmspace.h:$(GLSRC)stdpre.h $(PSSRC)ivmspace.h:$(GLGEN)arch.h +$(PSSRC)ivmspace.h:$(GLSRC)gs_dll_call.h $(PSSRC)opdef.h:$(PSSRC)iref.h $(PSSRC)opdef.h:$(GLSRC)gxalloc.h $(PSSRC)opdef.h:$(GLSRC)gxobj.h $(PSSRC)opdef.h:$(GLSRC)gsnamecl.h $(PSSRC)opdef.h:$(GLSRC)gxcspace.h +$(PSSRC)opdef.h:$(GLSRC)gscsel.h $(PSSRC)opdef.h:$(GLSRC)gsdcolor.h $(PSSRC)opdef.h:$(GLSRC)gxfrac.h $(PSSRC)opdef.h:$(GLSRC)gscms.h -$(PSSRC)opdef.h:$(GLSRC)gscspace.h $(PSSRC)opdef.h:$(GLSRC)gsdevice.h -$(PSSRC)opdef.h:$(GLSRC)gxarith.h -$(PSSRC)opdef.h:$(GLSRC)gxhttile.h +$(PSSRC)opdef.h:$(GLSRC)gscspace.h +$(PSSRC)opdef.h:$(GLSRC)gsgstate.h $(PSSRC)opdef.h:$(GLSRC)gsiparam.h -$(PSSRC)opdef.h:$(GLSRC)gxbitmap.h $(PSSRC)opdef.h:$(GLSRC)gsmatrix.h -$(PSSRC)opdef.h:$(GLSRC)gsrefct.h +$(PSSRC)opdef.h:$(GLSRC)gxhttile.h $(PSSRC)opdef.h:$(GLSRC)gsparam.h -$(PSSRC)opdef.h:$(GLSRC)gsccolor.h +$(PSSRC)opdef.h:$(GLSRC)gsrefct.h +$(PSSRC)opdef.h:$(GLSRC)memento.h $(PSSRC)opdef.h:$(GLSRC)gsstruct.h $(PSSRC)opdef.h:$(GLSRC)gxsync.h +$(PSSRC)opdef.h:$(GLSRC)gxbitmap.h $(PSSRC)opdef.h:$(GLSRC)scommon.h -$(PSSRC)opdef.h:$(GLSRC)memento.h -$(PSSRC)opdef.h:$(GLSRC)gscsel.h $(PSSRC)opdef.h:$(GLSRC)gsbitmap.h +$(PSSRC)opdef.h:$(GLSRC)gsccolor.h +$(PSSRC)opdef.h:$(GLSRC)gxarith.h +$(PSSRC)opdef.h:$(GLSRC)gpsync.h $(PSSRC)opdef.h:$(GLSRC)gsstype.h $(PSSRC)opdef.h:$(GLSRC)gsmemory.h -$(PSSRC)opdef.h:$(GLSRC)gpsync.h $(PSSRC)opdef.h:$(GLSRC)gslibctx.h -$(PSSRC)opdef.h:$(GLSRC)gs_dll_call.h $(PSSRC)opdef.h:$(GLSRC)gsalloc.h -$(PSSRC)opdef.h:$(GLSRC)stdio_.h $(PSSRC)opdef.h:$(GLSRC)gxcindex.h -$(PSSRC)opdef.h:$(GLSRC)gsgstate.h +$(PSSRC)opdef.h:$(GLSRC)stdio_.h $(PSSRC)opdef.h:$(GLSRC)stdint_.h $(PSSRC)opdef.h:$(GLSRC)gssprintf.h -$(PSSRC)opdef.h:$(GLSRC)std.h $(PSSRC)opdef.h:$(GLSRC)gstypes.h +$(PSSRC)opdef.h:$(GLSRC)std.h $(PSSRC)opdef.h:$(GLSRC)stdpre.h $(PSSRC)opdef.h:$(GLGEN)arch.h +$(PSSRC)opdef.h:$(GLSRC)gs_dll_call.h $(PSSRC)ghost.h:$(GLSRC)gx.h $(PSSRC)ghost.h:$(GLSRC)gdebug.h $(PSSRC)ghost.h:$(PSSRC)iref.h @@ -2499,43 +2499,43 @@ $(PSSRC)ghost.h:$(GLSRC)gxalloc.h $(PSSRC)ghost.h:$(GLSRC)gxobj.h $(PSSRC)ghost.h:$(GLSRC)gsnamecl.h $(PSSRC)ghost.h:$(GLSRC)gxcspace.h +$(PSSRC)ghost.h:$(GLSRC)gscsel.h $(PSSRC)ghost.h:$(GLSRC)gsdcolor.h $(PSSRC)ghost.h:$(GLSRC)gxfrac.h $(PSSRC)ghost.h:$(GLSRC)gscms.h -$(PSSRC)ghost.h:$(GLSRC)gscspace.h $(PSSRC)ghost.h:$(GLSRC)gsdevice.h -$(PSSRC)ghost.h:$(GLSRC)gxarith.h -$(PSSRC)ghost.h:$(GLSRC)gxhttile.h -$(PSSRC)ghost.h:$(GLSRC)gsiparam.h +$(PSSRC)ghost.h:$(GLSRC)gscspace.h +$(PSSRC)ghost.h:$(GLSRC)gsgstate.h $(PSSRC)ghost.h:$(GLSRC)gsio.h -$(PSSRC)ghost.h:$(GLSRC)gxbitmap.h +$(PSSRC)ghost.h:$(GLSRC)gsiparam.h $(PSSRC)ghost.h:$(GLSRC)gsmatrix.h -$(PSSRC)ghost.h:$(GLSRC)gsrefct.h +$(PSSRC)ghost.h:$(GLSRC)gxhttile.h $(PSSRC)ghost.h:$(GLSRC)gsparam.h -$(PSSRC)ghost.h:$(GLSRC)gsccolor.h +$(PSSRC)ghost.h:$(GLSRC)gsrefct.h +$(PSSRC)ghost.h:$(GLSRC)memento.h $(PSSRC)ghost.h:$(GLSRC)gsstruct.h -$(PSSRC)ghost.h:$(GLSRC)gxsync.h $(PSSRC)ghost.h:$(GLSRC)gdbflags.h +$(PSSRC)ghost.h:$(GLSRC)gxsync.h $(PSSRC)ghost.h:$(GLSRC)gserrors.h +$(PSSRC)ghost.h:$(GLSRC)gxbitmap.h $(PSSRC)ghost.h:$(GLSRC)scommon.h -$(PSSRC)ghost.h:$(GLSRC)memento.h -$(PSSRC)ghost.h:$(GLSRC)gscsel.h $(PSSRC)ghost.h:$(GLSRC)gsbitmap.h +$(PSSRC)ghost.h:$(GLSRC)gsccolor.h +$(PSSRC)ghost.h:$(GLSRC)gxarith.h +$(PSSRC)ghost.h:$(GLSRC)gpsync.h $(PSSRC)ghost.h:$(GLSRC)gsstype.h $(PSSRC)ghost.h:$(GLSRC)gsmemory.h -$(PSSRC)ghost.h:$(GLSRC)gpsync.h $(PSSRC)ghost.h:$(GLSRC)gslibctx.h -$(PSSRC)ghost.h:$(GLSRC)gs_dll_call.h $(PSSRC)ghost.h:$(GLSRC)gsalloc.h -$(PSSRC)ghost.h:$(GLSRC)stdio_.h $(PSSRC)ghost.h:$(GLSRC)gxcindex.h -$(PSSRC)ghost.h:$(GLSRC)gsgstate.h +$(PSSRC)ghost.h:$(GLSRC)stdio_.h $(PSSRC)ghost.h:$(GLSRC)stdint_.h $(PSSRC)ghost.h:$(GLSRC)gssprintf.h -$(PSSRC)ghost.h:$(GLSRC)std.h $(PSSRC)ghost.h:$(GLSRC)gstypes.h +$(PSSRC)ghost.h:$(GLSRC)std.h $(PSSRC)ghost.h:$(GLSRC)stdpre.h $(PSSRC)ghost.h:$(GLGEN)arch.h +$(PSSRC)ghost.h:$(GLSRC)gs_dll_call.h $(PSSRC)igc.h:$(PSSRC)istruct.h $(PSSRC)igc.h:$(PSSRC)inames.h $(PSSRC)igc.h:$(PSSRC)imemory.h @@ -2546,40 +2546,40 @@ $(PSSRC)igc.h:$(GLSRC)gxalloc.h $(PSSRC)igc.h:$(GLSRC)gxobj.h $(PSSRC)igc.h:$(GLSRC)gsnamecl.h $(PSSRC)igc.h:$(GLSRC)gxcspace.h +$(PSSRC)igc.h:$(GLSRC)gscsel.h $(PSSRC)igc.h:$(GLSRC)gsdcolor.h $(PSSRC)igc.h:$(GLSRC)gxfrac.h $(PSSRC)igc.h:$(GLSRC)gscms.h -$(PSSRC)igc.h:$(GLSRC)gscspace.h $(PSSRC)igc.h:$(GLSRC)gsdevice.h -$(PSSRC)igc.h:$(GLSRC)gxarith.h -$(PSSRC)igc.h:$(GLSRC)gxhttile.h +$(PSSRC)igc.h:$(GLSRC)gscspace.h +$(PSSRC)igc.h:$(GLSRC)gsgstate.h $(PSSRC)igc.h:$(GLSRC)gsiparam.h -$(PSSRC)igc.h:$(GLSRC)gxbitmap.h $(PSSRC)igc.h:$(GLSRC)gsmatrix.h -$(PSSRC)igc.h:$(GLSRC)gsrefct.h +$(PSSRC)igc.h:$(GLSRC)gxhttile.h $(PSSRC)igc.h:$(GLSRC)gsparam.h -$(PSSRC)igc.h:$(GLSRC)gsccolor.h +$(PSSRC)igc.h:$(GLSRC)gsrefct.h +$(PSSRC)igc.h:$(GLSRC)memento.h $(PSSRC)igc.h:$(GLSRC)gsstruct.h $(PSSRC)igc.h:$(GLSRC)gxsync.h +$(PSSRC)igc.h:$(GLSRC)gxbitmap.h $(PSSRC)igc.h:$(GLSRC)scommon.h -$(PSSRC)igc.h:$(GLSRC)memento.h -$(PSSRC)igc.h:$(GLSRC)gscsel.h $(PSSRC)igc.h:$(GLSRC)gsbitmap.h +$(PSSRC)igc.h:$(GLSRC)gsccolor.h +$(PSSRC)igc.h:$(GLSRC)gxarith.h +$(PSSRC)igc.h:$(GLSRC)gpsync.h $(PSSRC)igc.h:$(GLSRC)gsstype.h $(PSSRC)igc.h:$(GLSRC)gsmemory.h -$(PSSRC)igc.h:$(GLSRC)gpsync.h $(PSSRC)igc.h:$(GLSRC)gslibctx.h -$(PSSRC)igc.h:$(GLSRC)gs_dll_call.h $(PSSRC)igc.h:$(GLSRC)gsalloc.h -$(PSSRC)igc.h:$(GLSRC)stdio_.h $(PSSRC)igc.h:$(GLSRC)gxcindex.h -$(PSSRC)igc.h:$(GLSRC)gsgstate.h +$(PSSRC)igc.h:$(GLSRC)stdio_.h $(PSSRC)igc.h:$(GLSRC)stdint_.h $(PSSRC)igc.h:$(GLSRC)gssprintf.h -$(PSSRC)igc.h:$(GLSRC)std.h $(PSSRC)igc.h:$(GLSRC)gstypes.h +$(PSSRC)igc.h:$(GLSRC)std.h $(PSSRC)igc.h:$(GLSRC)stdpre.h $(PSSRC)igc.h:$(GLGEN)arch.h +$(PSSRC)igc.h:$(GLSRC)gs_dll_call.h $(PSSRC)imemory.h:$(PSSRC)ivmspace.h $(PSSRC)imemory.h:$(PSSRC)iref.h $(PSSRC)imemory.h:$(GLSRC)gsgc.h @@ -2587,40 +2587,40 @@ $(PSSRC)imemory.h:$(GLSRC)gxalloc.h $(PSSRC)imemory.h:$(GLSRC)gxobj.h $(PSSRC)imemory.h:$(GLSRC)gsnamecl.h $(PSSRC)imemory.h:$(GLSRC)gxcspace.h +$(PSSRC)imemory.h:$(GLSRC)gscsel.h $(PSSRC)imemory.h:$(GLSRC)gsdcolor.h $(PSSRC)imemory.h:$(GLSRC)gxfrac.h $(PSSRC)imemory.h:$(GLSRC)gscms.h -$(PSSRC)imemory.h:$(GLSRC)gscspace.h $(PSSRC)imemory.h:$(GLSRC)gsdevice.h -$(PSSRC)imemory.h:$(GLSRC)gxarith.h -$(PSSRC)imemory.h:$(GLSRC)gxhttile.h +$(PSSRC)imemory.h:$(GLSRC)gscspace.h +$(PSSRC)imemory.h:$(GLSRC)gsgstate.h $(PSSRC)imemory.h:$(GLSRC)gsiparam.h -$(PSSRC)imemory.h:$(GLSRC)gxbitmap.h $(PSSRC)imemory.h:$(GLSRC)gsmatrix.h -$(PSSRC)imemory.h:$(GLSRC)gsrefct.h +$(PSSRC)imemory.h:$(GLSRC)gxhttile.h $(PSSRC)imemory.h:$(GLSRC)gsparam.h -$(PSSRC)imemory.h:$(GLSRC)gsccolor.h +$(PSSRC)imemory.h:$(GLSRC)gsrefct.h +$(PSSRC)imemory.h:$(GLSRC)memento.h $(PSSRC)imemory.h:$(GLSRC)gsstruct.h $(PSSRC)imemory.h:$(GLSRC)gxsync.h +$(PSSRC)imemory.h:$(GLSRC)gxbitmap.h $(PSSRC)imemory.h:$(GLSRC)scommon.h -$(PSSRC)imemory.h:$(GLSRC)memento.h -$(PSSRC)imemory.h:$(GLSRC)gscsel.h $(PSSRC)imemory.h:$(GLSRC)gsbitmap.h +$(PSSRC)imemory.h:$(GLSRC)gsccolor.h +$(PSSRC)imemory.h:$(GLSRC)gxarith.h +$(PSSRC)imemory.h:$(GLSRC)gpsync.h $(PSSRC)imemory.h:$(GLSRC)gsstype.h $(PSSRC)imemory.h:$(GLSRC)gsmemory.h -$(PSSRC)imemory.h:$(GLSRC)gpsync.h $(PSSRC)imemory.h:$(GLSRC)gslibctx.h -$(PSSRC)imemory.h:$(GLSRC)gs_dll_call.h $(PSSRC)imemory.h:$(GLSRC)gsalloc.h -$(PSSRC)imemory.h:$(GLSRC)stdio_.h $(PSSRC)imemory.h:$(GLSRC)gxcindex.h -$(PSSRC)imemory.h:$(GLSRC)gsgstate.h +$(PSSRC)imemory.h:$(GLSRC)stdio_.h $(PSSRC)imemory.h:$(GLSRC)stdint_.h $(PSSRC)imemory.h:$(GLSRC)gssprintf.h -$(PSSRC)imemory.h:$(GLSRC)std.h $(PSSRC)imemory.h:$(GLSRC)gstypes.h +$(PSSRC)imemory.h:$(GLSRC)std.h $(PSSRC)imemory.h:$(GLSRC)stdpre.h $(PSSRC)imemory.h:$(GLGEN)arch.h +$(PSSRC)imemory.h:$(GLSRC)gs_dll_call.h $(PSSRC)ialloc.h:$(PSSRC)imemory.h $(PSSRC)ialloc.h:$(PSSRC)ivmspace.h $(PSSRC)ialloc.h:$(PSSRC)iref.h @@ -2629,40 +2629,40 @@ $(PSSRC)ialloc.h:$(GLSRC)gxalloc.h $(PSSRC)ialloc.h:$(GLSRC)gxobj.h $(PSSRC)ialloc.h:$(GLSRC)gsnamecl.h $(PSSRC)ialloc.h:$(GLSRC)gxcspace.h +$(PSSRC)ialloc.h:$(GLSRC)gscsel.h $(PSSRC)ialloc.h:$(GLSRC)gsdcolor.h $(PSSRC)ialloc.h:$(GLSRC)gxfrac.h $(PSSRC)ialloc.h:$(GLSRC)gscms.h -$(PSSRC)ialloc.h:$(GLSRC)gscspace.h $(PSSRC)ialloc.h:$(GLSRC)gsdevice.h -$(PSSRC)ialloc.h:$(GLSRC)gxarith.h -$(PSSRC)ialloc.h:$(GLSRC)gxhttile.h +$(PSSRC)ialloc.h:$(GLSRC)gscspace.h +$(PSSRC)ialloc.h:$(GLSRC)gsgstate.h $(PSSRC)ialloc.h:$(GLSRC)gsiparam.h -$(PSSRC)ialloc.h:$(GLSRC)gxbitmap.h $(PSSRC)ialloc.h:$(GLSRC)gsmatrix.h -$(PSSRC)ialloc.h:$(GLSRC)gsrefct.h +$(PSSRC)ialloc.h:$(GLSRC)gxhttile.h $(PSSRC)ialloc.h:$(GLSRC)gsparam.h -$(PSSRC)ialloc.h:$(GLSRC)gsccolor.h +$(PSSRC)ialloc.h:$(GLSRC)gsrefct.h +$(PSSRC)ialloc.h:$(GLSRC)memento.h $(PSSRC)ialloc.h:$(GLSRC)gsstruct.h $(PSSRC)ialloc.h:$(GLSRC)gxsync.h +$(PSSRC)ialloc.h:$(GLSRC)gxbitmap.h $(PSSRC)ialloc.h:$(GLSRC)scommon.h -$(PSSRC)ialloc.h:$(GLSRC)memento.h -$(PSSRC)ialloc.h:$(GLSRC)gscsel.h $(PSSRC)ialloc.h:$(GLSRC)gsbitmap.h +$(PSSRC)ialloc.h:$(GLSRC)gsccolor.h +$(PSSRC)ialloc.h:$(GLSRC)gxarith.h +$(PSSRC)ialloc.h:$(GLSRC)gpsync.h $(PSSRC)ialloc.h:$(GLSRC)gsstype.h $(PSSRC)ialloc.h:$(GLSRC)gsmemory.h -$(PSSRC)ialloc.h:$(GLSRC)gpsync.h $(PSSRC)ialloc.h:$(GLSRC)gslibctx.h -$(PSSRC)ialloc.h:$(GLSRC)gs_dll_call.h $(PSSRC)ialloc.h:$(GLSRC)gsalloc.h -$(PSSRC)ialloc.h:$(GLSRC)stdio_.h $(PSSRC)ialloc.h:$(GLSRC)gxcindex.h -$(PSSRC)ialloc.h:$(GLSRC)gsgstate.h +$(PSSRC)ialloc.h:$(GLSRC)stdio_.h $(PSSRC)ialloc.h:$(GLSRC)stdint_.h $(PSSRC)ialloc.h:$(GLSRC)gssprintf.h -$(PSSRC)ialloc.h:$(GLSRC)std.h $(PSSRC)ialloc.h:$(GLSRC)gstypes.h +$(PSSRC)ialloc.h:$(GLSRC)std.h $(PSSRC)ialloc.h:$(GLSRC)stdpre.h $(PSSRC)ialloc.h:$(GLGEN)arch.h +$(PSSRC)ialloc.h:$(GLSRC)gs_dll_call.h $(PSSRC)iastruct.h:$(PSSRC)ialloc.h $(PSSRC)iastruct.h:$(PSSRC)imemory.h $(PSSRC)iastruct.h:$(PSSRC)ivmspace.h @@ -2672,40 +2672,40 @@ $(PSSRC)iastruct.h:$(GLSRC)gxalloc.h $(PSSRC)iastruct.h:$(GLSRC)gxobj.h $(PSSRC)iastruct.h:$(GLSRC)gsnamecl.h $(PSSRC)iastruct.h:$(GLSRC)gxcspace.h +$(PSSRC)iastruct.h:$(GLSRC)gscsel.h $(PSSRC)iastruct.h:$(GLSRC)gsdcolor.h $(PSSRC)iastruct.h:$(GLSRC)gxfrac.h $(PSSRC)iastruct.h:$(GLSRC)gscms.h -$(PSSRC)iastruct.h:$(GLSRC)gscspace.h $(PSSRC)iastruct.h:$(GLSRC)gsdevice.h -$(PSSRC)iastruct.h:$(GLSRC)gxarith.h -$(PSSRC)iastruct.h:$(GLSRC)gxhttile.h +$(PSSRC)iastruct.h:$(GLSRC)gscspace.h +$(PSSRC)iastruct.h:$(GLSRC)gsgstate.h $(PSSRC)iastruct.h:$(GLSRC)gsiparam.h -$(PSSRC)iastruct.h:$(GLSRC)gxbitmap.h $(PSSRC)iastruct.h:$(GLSRC)gsmatrix.h -$(PSSRC)iastruct.h:$(GLSRC)gsrefct.h +$(PSSRC)iastruct.h:$(GLSRC)gxhttile.h $(PSSRC)iastruct.h:$(GLSRC)gsparam.h -$(PSSRC)iastruct.h:$(GLSRC)gsccolor.h +$(PSSRC)iastruct.h:$(GLSRC)gsrefct.h +$(PSSRC)iastruct.h:$(GLSRC)memento.h $(PSSRC)iastruct.h:$(GLSRC)gsstruct.h $(PSSRC)iastruct.h:$(GLSRC)gxsync.h +$(PSSRC)iastruct.h:$(GLSRC)gxbitmap.h $(PSSRC)iastruct.h:$(GLSRC)scommon.h -$(PSSRC)iastruct.h:$(GLSRC)memento.h -$(PSSRC)iastruct.h:$(GLSRC)gscsel.h $(PSSRC)iastruct.h:$(GLSRC)gsbitmap.h +$(PSSRC)iastruct.h:$(GLSRC)gsccolor.h +$(PSSRC)iastruct.h:$(GLSRC)gxarith.h +$(PSSRC)iastruct.h:$(GLSRC)gpsync.h $(PSSRC)iastruct.h:$(GLSRC)gsstype.h $(PSSRC)iastruct.h:$(GLSRC)gsmemory.h -$(PSSRC)iastruct.h:$(GLSRC)gpsync.h $(PSSRC)iastruct.h:$(GLSRC)gslibctx.h -$(PSSRC)iastruct.h:$(GLSRC)gs_dll_call.h $(PSSRC)iastruct.h:$(GLSRC)gsalloc.h -$(PSSRC)iastruct.h:$(GLSRC)stdio_.h $(PSSRC)iastruct.h:$(GLSRC)gxcindex.h -$(PSSRC)iastruct.h:$(GLSRC)gsgstate.h +$(PSSRC)iastruct.h:$(GLSRC)stdio_.h $(PSSRC)iastruct.h:$(GLSRC)stdint_.h $(PSSRC)iastruct.h:$(GLSRC)gssprintf.h -$(PSSRC)iastruct.h:$(GLSRC)std.h $(PSSRC)iastruct.h:$(GLSRC)gstypes.h +$(PSSRC)iastruct.h:$(GLSRC)std.h $(PSSRC)iastruct.h:$(GLSRC)stdpre.h $(PSSRC)iastruct.h:$(GLGEN)arch.h +$(PSSRC)iastruct.h:$(GLSRC)gs_dll_call.h $(PSSRC)iastate.h:$(PSSRC)istruct.h $(PSSRC)iastate.h:$(PSSRC)ialloc.h $(PSSRC)iastate.h:$(PSSRC)imemory.h @@ -2716,40 +2716,40 @@ $(PSSRC)iastate.h:$(GLSRC)gxalloc.h $(PSSRC)iastate.h:$(GLSRC)gxobj.h $(PSSRC)iastate.h:$(GLSRC)gsnamecl.h $(PSSRC)iastate.h:$(GLSRC)gxcspace.h +$(PSSRC)iastate.h:$(GLSRC)gscsel.h $(PSSRC)iastate.h:$(GLSRC)gsdcolor.h $(PSSRC)iastate.h:$(GLSRC)gxfrac.h $(PSSRC)iastate.h:$(GLSRC)gscms.h -$(PSSRC)iastate.h:$(GLSRC)gscspace.h $(PSSRC)iastate.h:$(GLSRC)gsdevice.h -$(PSSRC)iastate.h:$(GLSRC)gxarith.h -$(PSSRC)iastate.h:$(GLSRC)gxhttile.h +$(PSSRC)iastate.h:$(GLSRC)gscspace.h +$(PSSRC)iastate.h:$(GLSRC)gsgstate.h $(PSSRC)iastate.h:$(GLSRC)gsiparam.h -$(PSSRC)iastate.h:$(GLSRC)gxbitmap.h $(PSSRC)iastate.h:$(GLSRC)gsmatrix.h -$(PSSRC)iastate.h:$(GLSRC)gsrefct.h +$(PSSRC)iastate.h:$(GLSRC)gxhttile.h $(PSSRC)iastate.h:$(GLSRC)gsparam.h -$(PSSRC)iastate.h:$(GLSRC)gsccolor.h +$(PSSRC)iastate.h:$(GLSRC)gsrefct.h +$(PSSRC)iastate.h:$(GLSRC)memento.h $(PSSRC)iastate.h:$(GLSRC)gsstruct.h $(PSSRC)iastate.h:$(GLSRC)gxsync.h +$(PSSRC)iastate.h:$(GLSRC)gxbitmap.h $(PSSRC)iastate.h:$(GLSRC)scommon.h -$(PSSRC)iastate.h:$(GLSRC)memento.h -$(PSSRC)iastate.h:$(GLSRC)gscsel.h $(PSSRC)iastate.h:$(GLSRC)gsbitmap.h +$(PSSRC)iastate.h:$(GLSRC)gsccolor.h +$(PSSRC)iastate.h:$(GLSRC)gxarith.h +$(PSSRC)iastate.h:$(GLSRC)gpsync.h $(PSSRC)iastate.h:$(GLSRC)gsstype.h $(PSSRC)iastate.h:$(GLSRC)gsmemory.h -$(PSSRC)iastate.h:$(GLSRC)gpsync.h $(PSSRC)iastate.h:$(GLSRC)gslibctx.h -$(PSSRC)iastate.h:$(GLSRC)gs_dll_call.h $(PSSRC)iastate.h:$(GLSRC)gsalloc.h -$(PSSRC)iastate.h:$(GLSRC)stdio_.h $(PSSRC)iastate.h:$(GLSRC)gxcindex.h -$(PSSRC)iastate.h:$(GLSRC)gsgstate.h +$(PSSRC)iastate.h:$(GLSRC)stdio_.h $(PSSRC)iastate.h:$(GLSRC)stdint_.h $(PSSRC)iastate.h:$(GLSRC)gssprintf.h -$(PSSRC)iastate.h:$(GLSRC)std.h $(PSSRC)iastate.h:$(GLSRC)gstypes.h +$(PSSRC)iastate.h:$(GLSRC)std.h $(PSSRC)iastate.h:$(GLSRC)stdpre.h $(PSSRC)iastate.h:$(GLGEN)arch.h +$(PSSRC)iastate.h:$(GLSRC)gs_dll_call.h $(PSSRC)inamedef.h:$(PSSRC)isave.h $(PSSRC)inamedef.h:$(PSSRC)inames.h $(PSSRC)inamedef.h:$(PSSRC)idosave.h @@ -2763,40 +2763,40 @@ $(PSSRC)inamedef.h:$(GLSRC)gxalloc.h $(PSSRC)inamedef.h:$(GLSRC)gxobj.h $(PSSRC)inamedef.h:$(GLSRC)gsnamecl.h $(PSSRC)inamedef.h:$(GLSRC)gxcspace.h +$(PSSRC)inamedef.h:$(GLSRC)gscsel.h $(PSSRC)inamedef.h:$(GLSRC)gsdcolor.h $(PSSRC)inamedef.h:$(GLSRC)gxfrac.h $(PSSRC)inamedef.h:$(GLSRC)gscms.h -$(PSSRC)inamedef.h:$(GLSRC)gscspace.h $(PSSRC)inamedef.h:$(GLSRC)gsdevice.h -$(PSSRC)inamedef.h:$(GLSRC)gxarith.h -$(PSSRC)inamedef.h:$(GLSRC)gxhttile.h +$(PSSRC)inamedef.h:$(GLSRC)gscspace.h +$(PSSRC)inamedef.h:$(GLSRC)gsgstate.h $(PSSRC)inamedef.h:$(GLSRC)gsiparam.h -$(PSSRC)inamedef.h:$(GLSRC)gxbitmap.h $(PSSRC)inamedef.h:$(GLSRC)gsmatrix.h -$(PSSRC)inamedef.h:$(GLSRC)gsrefct.h +$(PSSRC)inamedef.h:$(GLSRC)gxhttile.h $(PSSRC)inamedef.h:$(GLSRC)gsparam.h -$(PSSRC)inamedef.h:$(GLSRC)gsccolor.h +$(PSSRC)inamedef.h:$(GLSRC)gsrefct.h +$(PSSRC)inamedef.h:$(GLSRC)memento.h $(PSSRC)inamedef.h:$(GLSRC)gsstruct.h $(PSSRC)inamedef.h:$(GLSRC)gxsync.h +$(PSSRC)inamedef.h:$(GLSRC)gxbitmap.h $(PSSRC)inamedef.h:$(GLSRC)scommon.h -$(PSSRC)inamedef.h:$(GLSRC)memento.h -$(PSSRC)inamedef.h:$(GLSRC)gscsel.h $(PSSRC)inamedef.h:$(GLSRC)gsbitmap.h +$(PSSRC)inamedef.h:$(GLSRC)gsccolor.h +$(PSSRC)inamedef.h:$(GLSRC)gxarith.h +$(PSSRC)inamedef.h:$(GLSRC)gpsync.h $(PSSRC)inamedef.h:$(GLSRC)gsstype.h $(PSSRC)inamedef.h:$(GLSRC)gsmemory.h -$(PSSRC)inamedef.h:$(GLSRC)gpsync.h $(PSSRC)inamedef.h:$(GLSRC)gslibctx.h -$(PSSRC)inamedef.h:$(GLSRC)gs_dll_call.h $(PSSRC)inamedef.h:$(GLSRC)gsalloc.h -$(PSSRC)inamedef.h:$(GLSRC)stdio_.h $(PSSRC)inamedef.h:$(GLSRC)gxcindex.h -$(PSSRC)inamedef.h:$(GLSRC)gsgstate.h +$(PSSRC)inamedef.h:$(GLSRC)stdio_.h $(PSSRC)inamedef.h:$(GLSRC)stdint_.h $(PSSRC)inamedef.h:$(GLSRC)gssprintf.h -$(PSSRC)inamedef.h:$(GLSRC)std.h $(PSSRC)inamedef.h:$(GLSRC)gstypes.h +$(PSSRC)inamedef.h:$(GLSRC)std.h $(PSSRC)inamedef.h:$(GLSRC)stdpre.h $(PSSRC)inamedef.h:$(GLGEN)arch.h +$(PSSRC)inamedef.h:$(GLSRC)gs_dll_call.h $(PSSRC)store.h:$(PSSRC)ialloc.h $(PSSRC)store.h:$(PSSRC)idosave.h $(PSSRC)store.h:$(PSSRC)imemory.h @@ -2807,287 +2807,287 @@ $(PSSRC)store.h:$(GLSRC)gxalloc.h $(PSSRC)store.h:$(GLSRC)gxobj.h $(PSSRC)store.h:$(GLSRC)gsnamecl.h $(PSSRC)store.h:$(GLSRC)gxcspace.h +$(PSSRC)store.h:$(GLSRC)gscsel.h $(PSSRC)store.h:$(GLSRC)gsdcolor.h $(PSSRC)store.h:$(GLSRC)gxfrac.h $(PSSRC)store.h:$(GLSRC)gscms.h -$(PSSRC)store.h:$(GLSRC)gscspace.h $(PSSRC)store.h:$(GLSRC)gsdevice.h -$(PSSRC)store.h:$(GLSRC)gxarith.h -$(PSSRC)store.h:$(GLSRC)gxhttile.h +$(PSSRC)store.h:$(GLSRC)gscspace.h +$(PSSRC)store.h:$(GLSRC)gsgstate.h $(PSSRC)store.h:$(GLSRC)gsiparam.h -$(PSSRC)store.h:$(GLSRC)gxbitmap.h $(PSSRC)store.h:$(GLSRC)gsmatrix.h -$(PSSRC)store.h:$(GLSRC)gsrefct.h +$(PSSRC)store.h:$(GLSRC)gxhttile.h $(PSSRC)store.h:$(GLSRC)gsparam.h -$(PSSRC)store.h:$(GLSRC)gsccolor.h +$(PSSRC)store.h:$(GLSRC)gsrefct.h +$(PSSRC)store.h:$(GLSRC)memento.h $(PSSRC)store.h:$(GLSRC)gsstruct.h $(PSSRC)store.h:$(GLSRC)gxsync.h +$(PSSRC)store.h:$(GLSRC)gxbitmap.h $(PSSRC)store.h:$(GLSRC)scommon.h -$(PSSRC)store.h:$(GLSRC)memento.h -$(PSSRC)store.h:$(GLSRC)gscsel.h $(PSSRC)store.h:$(GLSRC)gsbitmap.h +$(PSSRC)store.h:$(GLSRC)gsccolor.h +$(PSSRC)store.h:$(GLSRC)gxarith.h +$(PSSRC)store.h:$(GLSRC)gpsync.h $(PSSRC)store.h:$(GLSRC)gsstype.h $(PSSRC)store.h:$(GLSRC)gsmemory.h -$(PSSRC)store.h:$(GLSRC)gpsync.h $(PSSRC)store.h:$(GLSRC)gslibctx.h -$(PSSRC)store.h:$(GLSRC)gs_dll_call.h $(PSSRC)store.h:$(GLSRC)gsalloc.h -$(PSSRC)store.h:$(GLSRC)stdio_.h $(PSSRC)store.h:$(GLSRC)gxcindex.h -$(PSSRC)store.h:$(GLSRC)gsgstate.h +$(PSSRC)store.h:$(GLSRC)stdio_.h $(PSSRC)store.h:$(GLSRC)stdint_.h $(PSSRC)store.h:$(GLSRC)gssprintf.h -$(PSSRC)store.h:$(GLSRC)std.h $(PSSRC)store.h:$(GLSRC)gstypes.h +$(PSSRC)store.h:$(GLSRC)std.h $(PSSRC)store.h:$(GLSRC)stdpre.h $(PSSRC)store.h:$(GLGEN)arch.h +$(PSSRC)store.h:$(GLSRC)gs_dll_call.h $(PSSRC)iplugin.h:$(PSSRC)iref.h $(PSSRC)iplugin.h:$(GLSRC)gxalloc.h $(PSSRC)iplugin.h:$(GLSRC)gxobj.h $(PSSRC)iplugin.h:$(GLSRC)gsnamecl.h $(PSSRC)iplugin.h:$(GLSRC)gxcspace.h +$(PSSRC)iplugin.h:$(GLSRC)gscsel.h $(PSSRC)iplugin.h:$(GLSRC)gsdcolor.h $(PSSRC)iplugin.h:$(GLSRC)gxfrac.h $(PSSRC)iplugin.h:$(GLSRC)gscms.h -$(PSSRC)iplugin.h:$(GLSRC)gscspace.h $(PSSRC)iplugin.h:$(GLSRC)gsdevice.h -$(PSSRC)iplugin.h:$(GLSRC)gxarith.h -$(PSSRC)iplugin.h:$(GLSRC)gxhttile.h +$(PSSRC)iplugin.h:$(GLSRC)gscspace.h +$(PSSRC)iplugin.h:$(GLSRC)gsgstate.h $(PSSRC)iplugin.h:$(GLSRC)gsiparam.h -$(PSSRC)iplugin.h:$(GLSRC)gxbitmap.h $(PSSRC)iplugin.h:$(GLSRC)gsmatrix.h -$(PSSRC)iplugin.h:$(GLSRC)gsrefct.h +$(PSSRC)iplugin.h:$(GLSRC)gxhttile.h $(PSSRC)iplugin.h:$(GLSRC)gsparam.h -$(PSSRC)iplugin.h:$(GLSRC)gsccolor.h +$(PSSRC)iplugin.h:$(GLSRC)gsrefct.h +$(PSSRC)iplugin.h:$(GLSRC)memento.h $(PSSRC)iplugin.h:$(GLSRC)gsstruct.h $(PSSRC)iplugin.h:$(GLSRC)gxsync.h +$(PSSRC)iplugin.h:$(GLSRC)gxbitmap.h $(PSSRC)iplugin.h:$(GLSRC)scommon.h -$(PSSRC)iplugin.h:$(GLSRC)memento.h -$(PSSRC)iplugin.h:$(GLSRC)gscsel.h $(PSSRC)iplugin.h:$(GLSRC)gsbitmap.h +$(PSSRC)iplugin.h:$(GLSRC)gsccolor.h +$(PSSRC)iplugin.h:$(GLSRC)gxarith.h +$(PSSRC)iplugin.h:$(GLSRC)gpsync.h $(PSSRC)iplugin.h:$(GLSRC)gsstype.h $(PSSRC)iplugin.h:$(GLSRC)gsmemory.h -$(PSSRC)iplugin.h:$(GLSRC)gpsync.h $(PSSRC)iplugin.h:$(GLSRC)gslibctx.h -$(PSSRC)iplugin.h:$(GLSRC)gs_dll_call.h $(PSSRC)iplugin.h:$(GLSRC)gsalloc.h -$(PSSRC)iplugin.h:$(GLSRC)stdio_.h $(PSSRC)iplugin.h:$(GLSRC)gxcindex.h -$(PSSRC)iplugin.h:$(GLSRC)gsgstate.h +$(PSSRC)iplugin.h:$(GLSRC)stdio_.h $(PSSRC)iplugin.h:$(GLSRC)stdint_.h $(PSSRC)iplugin.h:$(GLSRC)gssprintf.h -$(PSSRC)iplugin.h:$(GLSRC)std.h $(PSSRC)iplugin.h:$(GLSRC)gstypes.h +$(PSSRC)iplugin.h:$(GLSRC)std.h $(PSSRC)iplugin.h:$(GLSRC)stdpre.h $(PSSRC)iplugin.h:$(GLGEN)arch.h +$(PSSRC)iplugin.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifapi.h:$(PSSRC)iplugin.h $(PSSRC)ifapi.h:$(GLSRC)gxfapi.h $(PSSRC)ifapi.h:$(PSSRC)iref.h $(PSSRC)ifapi.h:$(GLSRC)gxalloc.h -$(PSSRC)ifapi.h:$(GLSRC)gstext.h $(PSSRC)ifapi.h:$(GLSRC)gxobj.h +$(PSSRC)ifapi.h:$(GLSRC)gstext.h $(PSSRC)ifapi.h:$(GLSRC)gsnamecl.h $(PSSRC)ifapi.h:$(GLSRC)gxcspace.h -$(PSSRC)ifapi.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifapi.h:$(GLSRC)gscsel.h $(PSSRC)ifapi.h:$(GLSRC)gsfont.h +$(PSSRC)ifapi.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifapi.h:$(GLSRC)gxpath.h $(PSSRC)ifapi.h:$(GLSRC)gxfrac.h $(PSSRC)ifapi.h:$(GLSRC)gscms.h -$(PSSRC)ifapi.h:$(GLSRC)gscspace.h -$(PSSRC)ifapi.h:$(GLSRC)gxpath.h -$(PSSRC)ifapi.h:$(GLSRC)gsdevice.h -$(PSSRC)ifapi.h:$(GLSRC)gxarith.h -$(PSSRC)ifapi.h:$(GLSRC)gspenum.h -$(PSSRC)ifapi.h:$(GLSRC)gxhttile.h $(PSSRC)ifapi.h:$(GLSRC)gsrect.h $(PSSRC)ifapi.h:$(GLSRC)gslparam.h -$(PSSRC)ifapi.h:$(GLSRC)gsiparam.h -$(PSSRC)ifapi.h:$(GLSRC)gxbitmap.h -$(PSSRC)ifapi.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifapi.h:$(GLSRC)gsdevice.h $(PSSRC)ifapi.h:$(GLSRC)gscpm.h +$(PSSRC)ifapi.h:$(GLSRC)gscspace.h +$(PSSRC)ifapi.h:$(GLSRC)gsgstate.h +$(PSSRC)ifapi.h:$(GLSRC)gsiparam.h $(PSSRC)ifapi.h:$(GLSRC)gxfixed.h -$(PSSRC)ifapi.h:$(GLSRC)gsrefct.h +$(PSSRC)ifapi.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifapi.h:$(GLSRC)gspenum.h +$(PSSRC)ifapi.h:$(GLSRC)gxhttile.h $(PSSRC)ifapi.h:$(GLSRC)gsparam.h +$(PSSRC)ifapi.h:$(GLSRC)gsrefct.h $(PSSRC)ifapi.h:$(GLSRC)gp.h -$(PSSRC)ifapi.h:$(GLSRC)gsccolor.h +$(PSSRC)ifapi.h:$(GLSRC)memento.h +$(PSSRC)ifapi.h:$(GLSRC)memory_.h $(PSSRC)ifapi.h:$(GLSRC)gsstruct.h $(PSSRC)ifapi.h:$(GLSRC)gxsync.h +$(PSSRC)ifapi.h:$(GLSRC)gxbitmap.h $(PSSRC)ifapi.h:$(GLSRC)srdline.h $(PSSRC)ifapi.h:$(GLSRC)scommon.h -$(PSSRC)ifapi.h:$(GLSRC)memento.h -$(PSSRC)ifapi.h:$(GLSRC)gscsel.h $(PSSRC)ifapi.h:$(GLSRC)gsbitmap.h -$(PSSRC)ifapi.h:$(GLSRC)gsstype.h +$(PSSRC)ifapi.h:$(GLSRC)gsccolor.h +$(PSSRC)ifapi.h:$(GLSRC)gxarith.h $(PSSRC)ifapi.h:$(GLSRC)stat_.h -$(PSSRC)ifapi.h:$(GLSRC)gsmemory.h $(PSSRC)ifapi.h:$(GLSRC)gpsync.h -$(PSSRC)ifapi.h:$(GLSRC)memory_.h +$(PSSRC)ifapi.h:$(GLSRC)gsstype.h +$(PSSRC)ifapi.h:$(GLSRC)gsmemory.h $(PSSRC)ifapi.h:$(GLSRC)gpgetenv.h -$(PSSRC)ifapi.h:$(GLSRC)gslibctx.h $(PSSRC)ifapi.h:$(GLSRC)gscdefs.h -$(PSSRC)ifapi.h:$(GLSRC)gs_dll_call.h +$(PSSRC)ifapi.h:$(GLSRC)gslibctx.h $(PSSRC)ifapi.h:$(GLSRC)gsalloc.h -$(PSSRC)ifapi.h:$(GLSRC)stdio_.h $(PSSRC)ifapi.h:$(GLSRC)gxcindex.h -$(PSSRC)ifapi.h:$(GLSRC)gsgstate.h +$(PSSRC)ifapi.h:$(GLSRC)stdio_.h +$(PSSRC)ifapi.h:$(GLSRC)gsccode.h $(PSSRC)ifapi.h:$(GLSRC)stdint_.h $(PSSRC)ifapi.h:$(GLSRC)gssprintf.h -$(PSSRC)ifapi.h:$(GLSRC)gsccode.h -$(PSSRC)ifapi.h:$(GLSRC)std.h $(PSSRC)ifapi.h:$(GLSRC)gstypes.h +$(PSSRC)ifapi.h:$(GLSRC)std.h $(PSSRC)ifapi.h:$(GLSRC)stdpre.h $(PSSRC)ifapi.h:$(GLGEN)arch.h +$(PSSRC)ifapi.h:$(GLSRC)gs_dll_call.h $(PSSRC)zht2.h:$(GLSRC)gscspace.h +$(PSSRC)zht2.h:$(GLSRC)gsgstate.h $(PSSRC)zht2.h:$(GLSRC)gsiparam.h -$(PSSRC)zht2.h:$(GLSRC)gxbitmap.h $(PSSRC)zht2.h:$(GLSRC)gsmatrix.h $(PSSRC)zht2.h:$(GLSRC)gsrefct.h -$(PSSRC)zht2.h:$(GLSRC)gsccolor.h -$(PSSRC)zht2.h:$(GLSRC)scommon.h $(PSSRC)zht2.h:$(GLSRC)memento.h +$(PSSRC)zht2.h:$(GLSRC)gxbitmap.h +$(PSSRC)zht2.h:$(GLSRC)scommon.h $(PSSRC)zht2.h:$(GLSRC)gsbitmap.h +$(PSSRC)zht2.h:$(GLSRC)gsccolor.h $(PSSRC)zht2.h:$(GLSRC)gsstype.h $(PSSRC)zht2.h:$(GLSRC)gsmemory.h $(PSSRC)zht2.h:$(GLSRC)gslibctx.h -$(PSSRC)zht2.h:$(GLSRC)gs_dll_call.h $(PSSRC)zht2.h:$(GLSRC)stdio_.h -$(PSSRC)zht2.h:$(GLSRC)gsgstate.h $(PSSRC)zht2.h:$(GLSRC)stdint_.h $(PSSRC)zht2.h:$(GLSRC)gssprintf.h -$(PSSRC)zht2.h:$(GLSRC)std.h $(PSSRC)zht2.h:$(GLSRC)gstypes.h +$(PSSRC)zht2.h:$(GLSRC)std.h $(PSSRC)zht2.h:$(GLSRC)stdpre.h $(PSSRC)zht2.h:$(GLGEN)arch.h +$(PSSRC)zht2.h:$(GLSRC)gs_dll_call.h $(GLSRC)gen_ordered.h:$(GLSRC)stdpre.h $(PSSRC)zchar42.h:$(GLSRC)gxfapi.h $(PSSRC)zchar42.h:$(PSSRC)iref.h $(PSSRC)zchar42.h:$(GLSRC)gxalloc.h -$(PSSRC)zchar42.h:$(GLSRC)gstext.h $(PSSRC)zchar42.h:$(GLSRC)gxobj.h +$(PSSRC)zchar42.h:$(GLSRC)gstext.h $(PSSRC)zchar42.h:$(GLSRC)gsnamecl.h $(PSSRC)zchar42.h:$(GLSRC)gxcspace.h -$(PSSRC)zchar42.h:$(GLSRC)gsdcolor.h +$(PSSRC)zchar42.h:$(GLSRC)gscsel.h $(PSSRC)zchar42.h:$(GLSRC)gsfont.h +$(PSSRC)zchar42.h:$(GLSRC)gsdcolor.h +$(PSSRC)zchar42.h:$(GLSRC)gxpath.h $(PSSRC)zchar42.h:$(GLSRC)gxfrac.h $(PSSRC)zchar42.h:$(GLSRC)gscms.h -$(PSSRC)zchar42.h:$(GLSRC)gscspace.h -$(PSSRC)zchar42.h:$(GLSRC)gxpath.h -$(PSSRC)zchar42.h:$(GLSRC)gsdevice.h -$(PSSRC)zchar42.h:$(GLSRC)gxarith.h -$(PSSRC)zchar42.h:$(GLSRC)gspenum.h -$(PSSRC)zchar42.h:$(GLSRC)gxhttile.h $(PSSRC)zchar42.h:$(GLSRC)gsrect.h $(PSSRC)zchar42.h:$(GLSRC)gslparam.h -$(PSSRC)zchar42.h:$(GLSRC)gsiparam.h -$(PSSRC)zchar42.h:$(GLSRC)gxbitmap.h -$(PSSRC)zchar42.h:$(GLSRC)gsmatrix.h +$(PSSRC)zchar42.h:$(GLSRC)gsdevice.h $(PSSRC)zchar42.h:$(GLSRC)gscpm.h +$(PSSRC)zchar42.h:$(GLSRC)gscspace.h +$(PSSRC)zchar42.h:$(GLSRC)gsgstate.h +$(PSSRC)zchar42.h:$(GLSRC)gsiparam.h $(PSSRC)zchar42.h:$(GLSRC)gxfixed.h -$(PSSRC)zchar42.h:$(GLSRC)gsrefct.h +$(PSSRC)zchar42.h:$(GLSRC)gsmatrix.h +$(PSSRC)zchar42.h:$(GLSRC)gspenum.h +$(PSSRC)zchar42.h:$(GLSRC)gxhttile.h $(PSSRC)zchar42.h:$(GLSRC)gsparam.h -$(PSSRC)zchar42.h:$(GLSRC)gsccolor.h +$(PSSRC)zchar42.h:$(GLSRC)gsrefct.h +$(PSSRC)zchar42.h:$(GLSRC)memento.h $(PSSRC)zchar42.h:$(GLSRC)gsstruct.h $(PSSRC)zchar42.h:$(GLSRC)gxsync.h +$(PSSRC)zchar42.h:$(GLSRC)gxbitmap.h $(PSSRC)zchar42.h:$(GLSRC)scommon.h -$(PSSRC)zchar42.h:$(GLSRC)memento.h -$(PSSRC)zchar42.h:$(GLSRC)gscsel.h $(PSSRC)zchar42.h:$(GLSRC)gsbitmap.h +$(PSSRC)zchar42.h:$(GLSRC)gsccolor.h +$(PSSRC)zchar42.h:$(GLSRC)gxarith.h +$(PSSRC)zchar42.h:$(GLSRC)gpsync.h $(PSSRC)zchar42.h:$(GLSRC)gsstype.h $(PSSRC)zchar42.h:$(GLSRC)gsmemory.h -$(PSSRC)zchar42.h:$(GLSRC)gpsync.h $(PSSRC)zchar42.h:$(GLSRC)gslibctx.h -$(PSSRC)zchar42.h:$(GLSRC)gs_dll_call.h $(PSSRC)zchar42.h:$(GLSRC)gsalloc.h -$(PSSRC)zchar42.h:$(GLSRC)stdio_.h $(PSSRC)zchar42.h:$(GLSRC)gxcindex.h -$(PSSRC)zchar42.h:$(GLSRC)gsgstate.h +$(PSSRC)zchar42.h:$(GLSRC)stdio_.h +$(PSSRC)zchar42.h:$(GLSRC)gsccode.h $(PSSRC)zchar42.h:$(GLSRC)stdint_.h $(PSSRC)zchar42.h:$(GLSRC)gssprintf.h -$(PSSRC)zchar42.h:$(GLSRC)gsccode.h -$(PSSRC)zchar42.h:$(GLSRC)std.h $(PSSRC)zchar42.h:$(GLSRC)gstypes.h +$(PSSRC)zchar42.h:$(GLSRC)std.h $(PSSRC)zchar42.h:$(GLSRC)stdpre.h $(PSSRC)zchar42.h:$(GLGEN)arch.h +$(PSSRC)zchar42.h:$(GLSRC)gs_dll_call.h $(PSSRC)zfunc.h:$(PSSRC)iref.h $(PSSRC)zfunc.h:$(GLSRC)gxalloc.h $(PSSRC)zfunc.h:$(GLSRC)gxobj.h $(PSSRC)zfunc.h:$(GLSRC)gsnamecl.h -$(PSSRC)zfunc.h:$(GLSRC)gxcspace.h $(PSSRC)zfunc.h:$(GLSRC)gsfunc.h +$(PSSRC)zfunc.h:$(GLSRC)gxcspace.h +$(PSSRC)zfunc.h:$(GLSRC)gscsel.h $(PSSRC)zfunc.h:$(GLSRC)gsdcolor.h $(PSSRC)zfunc.h:$(GLSRC)gxfrac.h $(PSSRC)zfunc.h:$(GLSRC)gscms.h -$(PSSRC)zfunc.h:$(GLSRC)gscspace.h $(PSSRC)zfunc.h:$(GLSRC)gsdevice.h -$(PSSRC)zfunc.h:$(GLSRC)gxarith.h -$(PSSRC)zfunc.h:$(GLSRC)gxhttile.h -$(PSSRC)zfunc.h:$(GLSRC)gsiparam.h +$(PSSRC)zfunc.h:$(GLSRC)gscspace.h +$(PSSRC)zfunc.h:$(GLSRC)gsgstate.h $(PSSRC)zfunc.h:$(GLSRC)gsdsrc.h -$(PSSRC)zfunc.h:$(GLSRC)gxbitmap.h +$(PSSRC)zfunc.h:$(GLSRC)gsiparam.h $(PSSRC)zfunc.h:$(GLSRC)gsmatrix.h -$(PSSRC)zfunc.h:$(GLSRC)gsrefct.h +$(PSSRC)zfunc.h:$(GLSRC)gxhttile.h $(PSSRC)zfunc.h:$(GLSRC)gsparam.h -$(PSSRC)zfunc.h:$(GLSRC)gsccolor.h +$(PSSRC)zfunc.h:$(GLSRC)gsrefct.h +$(PSSRC)zfunc.h:$(GLSRC)memento.h $(PSSRC)zfunc.h:$(GLSRC)gsstruct.h $(PSSRC)zfunc.h:$(GLSRC)gxsync.h +$(PSSRC)zfunc.h:$(GLSRC)gxbitmap.h $(PSSRC)zfunc.h:$(GLSRC)scommon.h -$(PSSRC)zfunc.h:$(GLSRC)memento.h -$(PSSRC)zfunc.h:$(GLSRC)gscsel.h $(PSSRC)zfunc.h:$(GLSRC)gsbitmap.h +$(PSSRC)zfunc.h:$(GLSRC)gsccolor.h +$(PSSRC)zfunc.h:$(GLSRC)gxarith.h +$(PSSRC)zfunc.h:$(GLSRC)gpsync.h $(PSSRC)zfunc.h:$(GLSRC)gsstype.h $(PSSRC)zfunc.h:$(GLSRC)gsmemory.h -$(PSSRC)zfunc.h:$(GLSRC)gpsync.h $(PSSRC)zfunc.h:$(GLSRC)gslibctx.h -$(PSSRC)zfunc.h:$(GLSRC)gs_dll_call.h $(PSSRC)zfunc.h:$(GLSRC)gsalloc.h -$(PSSRC)zfunc.h:$(GLSRC)stdio_.h $(PSSRC)zfunc.h:$(GLSRC)gxcindex.h -$(PSSRC)zfunc.h:$(GLSRC)gsgstate.h +$(PSSRC)zfunc.h:$(GLSRC)stdio_.h $(PSSRC)zfunc.h:$(GLSRC)stdint_.h $(PSSRC)zfunc.h:$(GLSRC)gssprintf.h -$(PSSRC)zfunc.h:$(GLSRC)std.h $(PSSRC)zfunc.h:$(GLSRC)gstypes.h +$(PSSRC)zfunc.h:$(GLSRC)std.h $(PSSRC)zfunc.h:$(GLSRC)stdpre.h $(PSSRC)zfunc.h:$(GLGEN)arch.h +$(PSSRC)zfunc.h:$(GLSRC)gs_dll_call.h $(PSSRC)idparam.h:$(PSSRC)iref.h $(PSSRC)idparam.h:$(GLSRC)gxalloc.h $(PSSRC)idparam.h:$(GLSRC)gxobj.h $(PSSRC)idparam.h:$(GLSRC)gsnamecl.h $(PSSRC)idparam.h:$(GLSRC)gxcspace.h -$(PSSRC)idparam.h:$(GLSRC)gsuid.h +$(PSSRC)idparam.h:$(GLSRC)gscsel.h $(PSSRC)idparam.h:$(GLSRC)gsdcolor.h $(PSSRC)idparam.h:$(GLSRC)gxfrac.h $(PSSRC)idparam.h:$(GLSRC)gscms.h -$(PSSRC)idparam.h:$(GLSRC)gscspace.h $(PSSRC)idparam.h:$(GLSRC)gsdevice.h -$(PSSRC)idparam.h:$(GLSRC)gxarith.h -$(PSSRC)idparam.h:$(GLSRC)gxhttile.h +$(PSSRC)idparam.h:$(GLSRC)gscspace.h +$(PSSRC)idparam.h:$(GLSRC)gsgstate.h $(PSSRC)idparam.h:$(GLSRC)gsiparam.h -$(PSSRC)idparam.h:$(GLSRC)gxbitmap.h $(PSSRC)idparam.h:$(GLSRC)gsmatrix.h -$(PSSRC)idparam.h:$(GLSRC)gsrefct.h +$(PSSRC)idparam.h:$(GLSRC)gxhttile.h $(PSSRC)idparam.h:$(GLSRC)gsparam.h -$(PSSRC)idparam.h:$(GLSRC)gsccolor.h +$(PSSRC)idparam.h:$(GLSRC)gsrefct.h +$(PSSRC)idparam.h:$(GLSRC)memento.h +$(PSSRC)idparam.h:$(GLSRC)gsuid.h $(PSSRC)idparam.h:$(GLSRC)gsstruct.h $(PSSRC)idparam.h:$(GLSRC)gxsync.h +$(PSSRC)idparam.h:$(GLSRC)gxbitmap.h $(PSSRC)idparam.h:$(GLSRC)scommon.h -$(PSSRC)idparam.h:$(GLSRC)memento.h -$(PSSRC)idparam.h:$(GLSRC)gscsel.h $(PSSRC)idparam.h:$(GLSRC)gsbitmap.h +$(PSSRC)idparam.h:$(GLSRC)gsccolor.h +$(PSSRC)idparam.h:$(GLSRC)gxarith.h +$(PSSRC)idparam.h:$(GLSRC)gpsync.h $(PSSRC)idparam.h:$(GLSRC)gsstype.h $(PSSRC)idparam.h:$(GLSRC)gsmemory.h -$(PSSRC)idparam.h:$(GLSRC)gpsync.h $(PSSRC)idparam.h:$(GLSRC)gslibctx.h -$(PSSRC)idparam.h:$(GLSRC)gs_dll_call.h $(PSSRC)idparam.h:$(GLSRC)gsalloc.h -$(PSSRC)idparam.h:$(GLSRC)stdio_.h $(PSSRC)idparam.h:$(GLSRC)gxcindex.h -$(PSSRC)idparam.h:$(GLSRC)gsgstate.h +$(PSSRC)idparam.h:$(GLSRC)stdio_.h $(PSSRC)idparam.h:$(GLSRC)stdint_.h $(PSSRC)idparam.h:$(GLSRC)gssprintf.h -$(PSSRC)idparam.h:$(GLSRC)std.h $(PSSRC)idparam.h:$(GLSRC)gstypes.h +$(PSSRC)idparam.h:$(GLSRC)std.h $(PSSRC)idparam.h:$(GLSRC)stdpre.h $(PSSRC)idparam.h:$(GLGEN)arch.h +$(PSSRC)idparam.h:$(GLSRC)gs_dll_call.h $(PSSRC)ilevel.h:$(PSSRC)imemory.h $(PSSRC)ilevel.h:$(PSSRC)ivmspace.h $(PSSRC)ilevel.h:$(PSSRC)iref.h @@ -3096,40 +3096,40 @@ $(PSSRC)ilevel.h:$(GLSRC)gxalloc.h $(PSSRC)ilevel.h:$(GLSRC)gxobj.h $(PSSRC)ilevel.h:$(GLSRC)gsnamecl.h $(PSSRC)ilevel.h:$(GLSRC)gxcspace.h +$(PSSRC)ilevel.h:$(GLSRC)gscsel.h $(PSSRC)ilevel.h:$(GLSRC)gsdcolor.h $(PSSRC)ilevel.h:$(GLSRC)gxfrac.h $(PSSRC)ilevel.h:$(GLSRC)gscms.h -$(PSSRC)ilevel.h:$(GLSRC)gscspace.h $(PSSRC)ilevel.h:$(GLSRC)gsdevice.h -$(PSSRC)ilevel.h:$(GLSRC)gxarith.h -$(PSSRC)ilevel.h:$(GLSRC)gxhttile.h +$(PSSRC)ilevel.h:$(GLSRC)gscspace.h +$(PSSRC)ilevel.h:$(GLSRC)gsgstate.h $(PSSRC)ilevel.h:$(GLSRC)gsiparam.h -$(PSSRC)ilevel.h:$(GLSRC)gxbitmap.h $(PSSRC)ilevel.h:$(GLSRC)gsmatrix.h -$(PSSRC)ilevel.h:$(GLSRC)gsrefct.h +$(PSSRC)ilevel.h:$(GLSRC)gxhttile.h $(PSSRC)ilevel.h:$(GLSRC)gsparam.h -$(PSSRC)ilevel.h:$(GLSRC)gsccolor.h +$(PSSRC)ilevel.h:$(GLSRC)gsrefct.h +$(PSSRC)ilevel.h:$(GLSRC)memento.h $(PSSRC)ilevel.h:$(GLSRC)gsstruct.h $(PSSRC)ilevel.h:$(GLSRC)gxsync.h +$(PSSRC)ilevel.h:$(GLSRC)gxbitmap.h $(PSSRC)ilevel.h:$(GLSRC)scommon.h -$(PSSRC)ilevel.h:$(GLSRC)memento.h -$(PSSRC)ilevel.h:$(GLSRC)gscsel.h $(PSSRC)ilevel.h:$(GLSRC)gsbitmap.h +$(PSSRC)ilevel.h:$(GLSRC)gsccolor.h +$(PSSRC)ilevel.h:$(GLSRC)gxarith.h +$(PSSRC)ilevel.h:$(GLSRC)gpsync.h $(PSSRC)ilevel.h:$(GLSRC)gsstype.h $(PSSRC)ilevel.h:$(GLSRC)gsmemory.h -$(PSSRC)ilevel.h:$(GLSRC)gpsync.h $(PSSRC)ilevel.h:$(GLSRC)gslibctx.h -$(PSSRC)ilevel.h:$(GLSRC)gs_dll_call.h $(PSSRC)ilevel.h:$(GLSRC)gsalloc.h -$(PSSRC)ilevel.h:$(GLSRC)stdio_.h $(PSSRC)ilevel.h:$(GLSRC)gxcindex.h -$(PSSRC)ilevel.h:$(GLSRC)gsgstate.h +$(PSSRC)ilevel.h:$(GLSRC)stdio_.h $(PSSRC)ilevel.h:$(GLSRC)stdint_.h $(PSSRC)ilevel.h:$(GLSRC)gssprintf.h -$(PSSRC)ilevel.h:$(GLSRC)std.h $(PSSRC)ilevel.h:$(GLSRC)gstypes.h +$(PSSRC)ilevel.h:$(GLSRC)std.h $(PSSRC)ilevel.h:$(GLSRC)stdpre.h $(PSSRC)ilevel.h:$(GLGEN)arch.h +$(PSSRC)ilevel.h:$(GLSRC)gs_dll_call.h $(PSSRC)interp.h:$(PSSRC)imemory.h $(PSSRC)interp.h:$(PSSRC)ivmspace.h $(PSSRC)interp.h:$(PSSRC)iref.h @@ -3138,40 +3138,40 @@ $(PSSRC)interp.h:$(GLSRC)gxalloc.h $(PSSRC)interp.h:$(GLSRC)gxobj.h $(PSSRC)interp.h:$(GLSRC)gsnamecl.h $(PSSRC)interp.h:$(GLSRC)gxcspace.h +$(PSSRC)interp.h:$(GLSRC)gscsel.h $(PSSRC)interp.h:$(GLSRC)gsdcolor.h $(PSSRC)interp.h:$(GLSRC)gxfrac.h $(PSSRC)interp.h:$(GLSRC)gscms.h -$(PSSRC)interp.h:$(GLSRC)gscspace.h $(PSSRC)interp.h:$(GLSRC)gsdevice.h -$(PSSRC)interp.h:$(GLSRC)gxarith.h -$(PSSRC)interp.h:$(GLSRC)gxhttile.h +$(PSSRC)interp.h:$(GLSRC)gscspace.h +$(PSSRC)interp.h:$(GLSRC)gsgstate.h $(PSSRC)interp.h:$(GLSRC)gsiparam.h -$(PSSRC)interp.h:$(GLSRC)gxbitmap.h $(PSSRC)interp.h:$(GLSRC)gsmatrix.h -$(PSSRC)interp.h:$(GLSRC)gsrefct.h +$(PSSRC)interp.h:$(GLSRC)gxhttile.h $(PSSRC)interp.h:$(GLSRC)gsparam.h -$(PSSRC)interp.h:$(GLSRC)gsccolor.h +$(PSSRC)interp.h:$(GLSRC)gsrefct.h +$(PSSRC)interp.h:$(GLSRC)memento.h $(PSSRC)interp.h:$(GLSRC)gsstruct.h $(PSSRC)interp.h:$(GLSRC)gxsync.h +$(PSSRC)interp.h:$(GLSRC)gxbitmap.h $(PSSRC)interp.h:$(GLSRC)scommon.h -$(PSSRC)interp.h:$(GLSRC)memento.h -$(PSSRC)interp.h:$(GLSRC)gscsel.h $(PSSRC)interp.h:$(GLSRC)gsbitmap.h +$(PSSRC)interp.h:$(GLSRC)gsccolor.h +$(PSSRC)interp.h:$(GLSRC)gxarith.h +$(PSSRC)interp.h:$(GLSRC)gpsync.h $(PSSRC)interp.h:$(GLSRC)gsstype.h $(PSSRC)interp.h:$(GLSRC)gsmemory.h -$(PSSRC)interp.h:$(GLSRC)gpsync.h $(PSSRC)interp.h:$(GLSRC)gslibctx.h -$(PSSRC)interp.h:$(GLSRC)gs_dll_call.h $(PSSRC)interp.h:$(GLSRC)gsalloc.h -$(PSSRC)interp.h:$(GLSRC)stdio_.h $(PSSRC)interp.h:$(GLSRC)gxcindex.h -$(PSSRC)interp.h:$(GLSRC)gsgstate.h +$(PSSRC)interp.h:$(GLSRC)stdio_.h $(PSSRC)interp.h:$(GLSRC)stdint_.h $(PSSRC)interp.h:$(GLSRC)gssprintf.h -$(PSSRC)interp.h:$(GLSRC)std.h $(PSSRC)interp.h:$(GLSRC)gstypes.h +$(PSSRC)interp.h:$(GLSRC)std.h $(PSSRC)interp.h:$(GLSRC)stdpre.h $(PSSRC)interp.h:$(GLGEN)arch.h +$(PSSRC)interp.h:$(GLSRC)gs_dll_call.h $(PSSRC)iparam.h:$(PSSRC)isdata.h $(PSSRC)iparam.h:$(PSSRC)imemory.h $(PSSRC)iparam.h:$(PSSRC)ivmspace.h @@ -3181,40 +3181,40 @@ $(PSSRC)iparam.h:$(GLSRC)gxalloc.h $(PSSRC)iparam.h:$(GLSRC)gxobj.h $(PSSRC)iparam.h:$(GLSRC)gsnamecl.h $(PSSRC)iparam.h:$(GLSRC)gxcspace.h +$(PSSRC)iparam.h:$(GLSRC)gscsel.h $(PSSRC)iparam.h:$(GLSRC)gsdcolor.h $(PSSRC)iparam.h:$(GLSRC)gxfrac.h $(PSSRC)iparam.h:$(GLSRC)gscms.h -$(PSSRC)iparam.h:$(GLSRC)gscspace.h $(PSSRC)iparam.h:$(GLSRC)gsdevice.h -$(PSSRC)iparam.h:$(GLSRC)gxarith.h -$(PSSRC)iparam.h:$(GLSRC)gxhttile.h +$(PSSRC)iparam.h:$(GLSRC)gscspace.h +$(PSSRC)iparam.h:$(GLSRC)gsgstate.h $(PSSRC)iparam.h:$(GLSRC)gsiparam.h -$(PSSRC)iparam.h:$(GLSRC)gxbitmap.h $(PSSRC)iparam.h:$(GLSRC)gsmatrix.h -$(PSSRC)iparam.h:$(GLSRC)gsrefct.h +$(PSSRC)iparam.h:$(GLSRC)gxhttile.h $(PSSRC)iparam.h:$(GLSRC)gsparam.h -$(PSSRC)iparam.h:$(GLSRC)gsccolor.h +$(PSSRC)iparam.h:$(GLSRC)gsrefct.h +$(PSSRC)iparam.h:$(GLSRC)memento.h $(PSSRC)iparam.h:$(GLSRC)gsstruct.h $(PSSRC)iparam.h:$(GLSRC)gxsync.h +$(PSSRC)iparam.h:$(GLSRC)gxbitmap.h $(PSSRC)iparam.h:$(GLSRC)scommon.h -$(PSSRC)iparam.h:$(GLSRC)memento.h -$(PSSRC)iparam.h:$(GLSRC)gscsel.h $(PSSRC)iparam.h:$(GLSRC)gsbitmap.h +$(PSSRC)iparam.h:$(GLSRC)gsccolor.h +$(PSSRC)iparam.h:$(GLSRC)gxarith.h +$(PSSRC)iparam.h:$(GLSRC)gpsync.h $(PSSRC)iparam.h:$(GLSRC)gsstype.h $(PSSRC)iparam.h:$(GLSRC)gsmemory.h -$(PSSRC)iparam.h:$(GLSRC)gpsync.h $(PSSRC)iparam.h:$(GLSRC)gslibctx.h -$(PSSRC)iparam.h:$(GLSRC)gs_dll_call.h $(PSSRC)iparam.h:$(GLSRC)gsalloc.h -$(PSSRC)iparam.h:$(GLSRC)stdio_.h $(PSSRC)iparam.h:$(GLSRC)gxcindex.h -$(PSSRC)iparam.h:$(GLSRC)gsgstate.h +$(PSSRC)iparam.h:$(GLSRC)stdio_.h $(PSSRC)iparam.h:$(GLSRC)stdint_.h $(PSSRC)iparam.h:$(GLSRC)gssprintf.h -$(PSSRC)iparam.h:$(GLSRC)std.h $(PSSRC)iparam.h:$(GLSRC)gstypes.h +$(PSSRC)iparam.h:$(GLSRC)std.h $(PSSRC)iparam.h:$(GLSRC)stdpre.h $(PSSRC)iparam.h:$(GLGEN)arch.h +$(PSSRC)iparam.h:$(GLSRC)gs_dll_call.h $(PSSRC)isdata.h:$(PSSRC)imemory.h $(PSSRC)isdata.h:$(PSSRC)ivmspace.h $(PSSRC)isdata.h:$(PSSRC)iref.h @@ -3223,40 +3223,40 @@ $(PSSRC)isdata.h:$(GLSRC)gxalloc.h $(PSSRC)isdata.h:$(GLSRC)gxobj.h $(PSSRC)isdata.h:$(GLSRC)gsnamecl.h $(PSSRC)isdata.h:$(GLSRC)gxcspace.h +$(PSSRC)isdata.h:$(GLSRC)gscsel.h $(PSSRC)isdata.h:$(GLSRC)gsdcolor.h $(PSSRC)isdata.h:$(GLSRC)gxfrac.h $(PSSRC)isdata.h:$(GLSRC)gscms.h -$(PSSRC)isdata.h:$(GLSRC)gscspace.h $(PSSRC)isdata.h:$(GLSRC)gsdevice.h -$(PSSRC)isdata.h:$(GLSRC)gxarith.h -$(PSSRC)isdata.h:$(GLSRC)gxhttile.h +$(PSSRC)isdata.h:$(GLSRC)gscspace.h +$(PSSRC)isdata.h:$(GLSRC)gsgstate.h $(PSSRC)isdata.h:$(GLSRC)gsiparam.h -$(PSSRC)isdata.h:$(GLSRC)gxbitmap.h $(PSSRC)isdata.h:$(GLSRC)gsmatrix.h -$(PSSRC)isdata.h:$(GLSRC)gsrefct.h +$(PSSRC)isdata.h:$(GLSRC)gxhttile.h $(PSSRC)isdata.h:$(GLSRC)gsparam.h -$(PSSRC)isdata.h:$(GLSRC)gsccolor.h +$(PSSRC)isdata.h:$(GLSRC)gsrefct.h +$(PSSRC)isdata.h:$(GLSRC)memento.h $(PSSRC)isdata.h:$(GLSRC)gsstruct.h $(PSSRC)isdata.h:$(GLSRC)gxsync.h +$(PSSRC)isdata.h:$(GLSRC)gxbitmap.h $(PSSRC)isdata.h:$(GLSRC)scommon.h -$(PSSRC)isdata.h:$(GLSRC)memento.h -$(PSSRC)isdata.h:$(GLSRC)gscsel.h $(PSSRC)isdata.h:$(GLSRC)gsbitmap.h +$(PSSRC)isdata.h:$(GLSRC)gsccolor.h +$(PSSRC)isdata.h:$(GLSRC)gxarith.h +$(PSSRC)isdata.h:$(GLSRC)gpsync.h $(PSSRC)isdata.h:$(GLSRC)gsstype.h $(PSSRC)isdata.h:$(GLSRC)gsmemory.h -$(PSSRC)isdata.h:$(GLSRC)gpsync.h $(PSSRC)isdata.h:$(GLSRC)gslibctx.h -$(PSSRC)isdata.h:$(GLSRC)gs_dll_call.h $(PSSRC)isdata.h:$(GLSRC)gsalloc.h -$(PSSRC)isdata.h:$(GLSRC)stdio_.h $(PSSRC)isdata.h:$(GLSRC)gxcindex.h -$(PSSRC)isdata.h:$(GLSRC)gsgstate.h +$(PSSRC)isdata.h:$(GLSRC)stdio_.h $(PSSRC)isdata.h:$(GLSRC)stdint_.h $(PSSRC)isdata.h:$(GLSRC)gssprintf.h -$(PSSRC)isdata.h:$(GLSRC)std.h $(PSSRC)isdata.h:$(GLSRC)gstypes.h +$(PSSRC)isdata.h:$(GLSRC)std.h $(PSSRC)isdata.h:$(GLSRC)stdpre.h $(PSSRC)isdata.h:$(GLGEN)arch.h +$(PSSRC)isdata.h:$(GLSRC)gs_dll_call.h $(PSSRC)istack.h:$(PSSRC)isdata.h $(PSSRC)istack.h:$(PSSRC)imemory.h $(PSSRC)istack.h:$(PSSRC)ivmspace.h @@ -3266,237 +3266,237 @@ $(PSSRC)istack.h:$(GLSRC)gxalloc.h $(PSSRC)istack.h:$(GLSRC)gxobj.h $(PSSRC)istack.h:$(GLSRC)gsnamecl.h $(PSSRC)istack.h:$(GLSRC)gxcspace.h +$(PSSRC)istack.h:$(GLSRC)gscsel.h $(PSSRC)istack.h:$(GLSRC)gsdcolor.h $(PSSRC)istack.h:$(GLSRC)gxfrac.h $(PSSRC)istack.h:$(GLSRC)gscms.h -$(PSSRC)istack.h:$(GLSRC)gscspace.h $(PSSRC)istack.h:$(GLSRC)gsdevice.h -$(PSSRC)istack.h:$(GLSRC)gxarith.h -$(PSSRC)istack.h:$(GLSRC)gxhttile.h +$(PSSRC)istack.h:$(GLSRC)gscspace.h +$(PSSRC)istack.h:$(GLSRC)gsgstate.h $(PSSRC)istack.h:$(GLSRC)gsiparam.h -$(PSSRC)istack.h:$(GLSRC)gxbitmap.h $(PSSRC)istack.h:$(GLSRC)gsmatrix.h -$(PSSRC)istack.h:$(GLSRC)gsrefct.h +$(PSSRC)istack.h:$(GLSRC)gxhttile.h $(PSSRC)istack.h:$(GLSRC)gsparam.h -$(PSSRC)istack.h:$(GLSRC)gsccolor.h +$(PSSRC)istack.h:$(GLSRC)gsrefct.h +$(PSSRC)istack.h:$(GLSRC)memento.h $(PSSRC)istack.h:$(GLSRC)gsstruct.h $(PSSRC)istack.h:$(GLSRC)gxsync.h +$(PSSRC)istack.h:$(GLSRC)gxbitmap.h $(PSSRC)istack.h:$(GLSRC)scommon.h -$(PSSRC)istack.h:$(GLSRC)memento.h -$(PSSRC)istack.h:$(GLSRC)gscsel.h $(PSSRC)istack.h:$(GLSRC)gsbitmap.h +$(PSSRC)istack.h:$(GLSRC)gsccolor.h +$(PSSRC)istack.h:$(GLSRC)gxarith.h +$(PSSRC)istack.h:$(GLSRC)gpsync.h $(PSSRC)istack.h:$(GLSRC)gsstype.h $(PSSRC)istack.h:$(GLSRC)gsmemory.h -$(PSSRC)istack.h:$(GLSRC)gpsync.h $(PSSRC)istack.h:$(GLSRC)gslibctx.h -$(PSSRC)istack.h:$(GLSRC)gs_dll_call.h $(PSSRC)istack.h:$(GLSRC)gsalloc.h -$(PSSRC)istack.h:$(GLSRC)stdio_.h $(PSSRC)istack.h:$(GLSRC)gxcindex.h -$(PSSRC)istack.h:$(GLSRC)gsgstate.h +$(PSSRC)istack.h:$(GLSRC)stdio_.h $(PSSRC)istack.h:$(GLSRC)stdint_.h $(PSSRC)istack.h:$(GLSRC)gssprintf.h -$(PSSRC)istack.h:$(GLSRC)std.h $(PSSRC)istack.h:$(GLSRC)gstypes.h +$(PSSRC)istack.h:$(GLSRC)std.h $(PSSRC)istack.h:$(GLSRC)stdpre.h $(PSSRC)istack.h:$(GLGEN)arch.h +$(PSSRC)istack.h:$(GLSRC)gs_dll_call.h $(PSSRC)istkparm.h:$(PSSRC)iref.h $(PSSRC)istkparm.h:$(GLSRC)gxalloc.h $(PSSRC)istkparm.h:$(GLSRC)gxobj.h $(PSSRC)istkparm.h:$(GLSRC)gsnamecl.h $(PSSRC)istkparm.h:$(GLSRC)gxcspace.h +$(PSSRC)istkparm.h:$(GLSRC)gscsel.h $(PSSRC)istkparm.h:$(GLSRC)gsdcolor.h $(PSSRC)istkparm.h:$(GLSRC)gxfrac.h $(PSSRC)istkparm.h:$(GLSRC)gscms.h -$(PSSRC)istkparm.h:$(GLSRC)gscspace.h $(PSSRC)istkparm.h:$(GLSRC)gsdevice.h -$(PSSRC)istkparm.h:$(GLSRC)gxarith.h -$(PSSRC)istkparm.h:$(GLSRC)gxhttile.h +$(PSSRC)istkparm.h:$(GLSRC)gscspace.h +$(PSSRC)istkparm.h:$(GLSRC)gsgstate.h $(PSSRC)istkparm.h:$(GLSRC)gsiparam.h -$(PSSRC)istkparm.h:$(GLSRC)gxbitmap.h $(PSSRC)istkparm.h:$(GLSRC)gsmatrix.h -$(PSSRC)istkparm.h:$(GLSRC)gsrefct.h +$(PSSRC)istkparm.h:$(GLSRC)gxhttile.h $(PSSRC)istkparm.h:$(GLSRC)gsparam.h -$(PSSRC)istkparm.h:$(GLSRC)gsccolor.h +$(PSSRC)istkparm.h:$(GLSRC)gsrefct.h +$(PSSRC)istkparm.h:$(GLSRC)memento.h $(PSSRC)istkparm.h:$(GLSRC)gsstruct.h $(PSSRC)istkparm.h:$(GLSRC)gxsync.h +$(PSSRC)istkparm.h:$(GLSRC)gxbitmap.h $(PSSRC)istkparm.h:$(GLSRC)scommon.h -$(PSSRC)istkparm.h:$(GLSRC)memento.h -$(PSSRC)istkparm.h:$(GLSRC)gscsel.h $(PSSRC)istkparm.h:$(GLSRC)gsbitmap.h +$(PSSRC)istkparm.h:$(GLSRC)gsccolor.h +$(PSSRC)istkparm.h:$(GLSRC)gxarith.h +$(PSSRC)istkparm.h:$(GLSRC)gpsync.h $(PSSRC)istkparm.h:$(GLSRC)gsstype.h $(PSSRC)istkparm.h:$(GLSRC)gsmemory.h -$(PSSRC)istkparm.h:$(GLSRC)gpsync.h $(PSSRC)istkparm.h:$(GLSRC)gslibctx.h -$(PSSRC)istkparm.h:$(GLSRC)gs_dll_call.h $(PSSRC)istkparm.h:$(GLSRC)gsalloc.h -$(PSSRC)istkparm.h:$(GLSRC)stdio_.h $(PSSRC)istkparm.h:$(GLSRC)gxcindex.h -$(PSSRC)istkparm.h:$(GLSRC)gsgstate.h +$(PSSRC)istkparm.h:$(GLSRC)stdio_.h $(PSSRC)istkparm.h:$(GLSRC)stdint_.h $(PSSRC)istkparm.h:$(GLSRC)gssprintf.h -$(PSSRC)istkparm.h:$(GLSRC)std.h $(PSSRC)istkparm.h:$(GLSRC)gstypes.h +$(PSSRC)istkparm.h:$(GLSRC)std.h $(PSSRC)istkparm.h:$(GLSRC)stdpre.h $(PSSRC)istkparm.h:$(GLGEN)arch.h +$(PSSRC)istkparm.h:$(GLSRC)gs_dll_call.h $(PSSRC)iutil2.h:$(PSSRC)iref.h $(PSSRC)iutil2.h:$(GLSRC)gxalloc.h $(PSSRC)iutil2.h:$(GLSRC)gxobj.h $(PSSRC)iutil2.h:$(GLSRC)gsnamecl.h -$(PSSRC)iutil2.h:$(GLSRC)gxcspace.h $(PSSRC)iutil2.h:$(GLSRC)gsfunc.h +$(PSSRC)iutil2.h:$(GLSRC)gxcspace.h +$(PSSRC)iutil2.h:$(GLSRC)gscsel.h $(PSSRC)iutil2.h:$(GLSRC)gsdcolor.h $(PSSRC)iutil2.h:$(GLSRC)gxfrac.h $(PSSRC)iutil2.h:$(GLSRC)gscms.h -$(PSSRC)iutil2.h:$(GLSRC)gscspace.h $(PSSRC)iutil2.h:$(GLSRC)gsdevice.h -$(PSSRC)iutil2.h:$(GLSRC)gxarith.h -$(PSSRC)iutil2.h:$(GLSRC)gxhttile.h -$(PSSRC)iutil2.h:$(GLSRC)gsiparam.h +$(PSSRC)iutil2.h:$(GLSRC)gscspace.h +$(PSSRC)iutil2.h:$(GLSRC)gsgstate.h $(PSSRC)iutil2.h:$(GLSRC)gsdsrc.h -$(PSSRC)iutil2.h:$(GLSRC)gxbitmap.h +$(PSSRC)iutil2.h:$(GLSRC)gsiparam.h $(PSSRC)iutil2.h:$(GLSRC)gsmatrix.h -$(PSSRC)iutil2.h:$(GLSRC)gsrefct.h +$(PSSRC)iutil2.h:$(GLSRC)gxhttile.h $(PSSRC)iutil2.h:$(GLSRC)gsparam.h -$(PSSRC)iutil2.h:$(GLSRC)gsccolor.h +$(PSSRC)iutil2.h:$(GLSRC)gsrefct.h +$(PSSRC)iutil2.h:$(GLSRC)memento.h $(PSSRC)iutil2.h:$(GLSRC)gsstruct.h $(PSSRC)iutil2.h:$(GLSRC)gxsync.h +$(PSSRC)iutil2.h:$(GLSRC)gxbitmap.h $(PSSRC)iutil2.h:$(GLSRC)scommon.h -$(PSSRC)iutil2.h:$(GLSRC)memento.h -$(PSSRC)iutil2.h:$(GLSRC)gscsel.h $(PSSRC)iutil2.h:$(GLSRC)gsbitmap.h +$(PSSRC)iutil2.h:$(GLSRC)gsccolor.h +$(PSSRC)iutil2.h:$(GLSRC)gxarith.h +$(PSSRC)iutil2.h:$(GLSRC)gpsync.h $(PSSRC)iutil2.h:$(GLSRC)gsstype.h $(PSSRC)iutil2.h:$(GLSRC)gsmemory.h -$(PSSRC)iutil2.h:$(GLSRC)gpsync.h $(PSSRC)iutil2.h:$(GLSRC)gslibctx.h -$(PSSRC)iutil2.h:$(GLSRC)gs_dll_call.h $(PSSRC)iutil2.h:$(GLSRC)gsalloc.h -$(PSSRC)iutil2.h:$(GLSRC)stdio_.h $(PSSRC)iutil2.h:$(GLSRC)gxcindex.h -$(PSSRC)iutil2.h:$(GLSRC)gsgstate.h +$(PSSRC)iutil2.h:$(GLSRC)stdio_.h $(PSSRC)iutil2.h:$(GLSRC)stdint_.h $(PSSRC)iutil2.h:$(GLSRC)gssprintf.h -$(PSSRC)iutil2.h:$(GLSRC)std.h $(PSSRC)iutil2.h:$(GLSRC)gstypes.h +$(PSSRC)iutil2.h:$(GLSRC)std.h $(PSSRC)iutil2.h:$(GLSRC)stdpre.h $(PSSRC)iutil2.h:$(GLGEN)arch.h +$(PSSRC)iutil2.h:$(GLSRC)gs_dll_call.h $(PSSRC)oparc.h:$(PSSRC)iref.h $(PSSRC)oparc.h:$(GLSRC)gxalloc.h $(PSSRC)oparc.h:$(GLSRC)gxobj.h $(PSSRC)oparc.h:$(GLSRC)gsnamecl.h $(PSSRC)oparc.h:$(GLSRC)gxcspace.h +$(PSSRC)oparc.h:$(GLSRC)gscsel.h $(PSSRC)oparc.h:$(GLSRC)gsdcolor.h $(PSSRC)oparc.h:$(GLSRC)gxfrac.h $(PSSRC)oparc.h:$(GLSRC)gscms.h -$(PSSRC)oparc.h:$(GLSRC)gscspace.h $(PSSRC)oparc.h:$(GLSRC)gsdevice.h -$(PSSRC)oparc.h:$(GLSRC)gxarith.h -$(PSSRC)oparc.h:$(GLSRC)gxhttile.h +$(PSSRC)oparc.h:$(GLSRC)gscspace.h +$(PSSRC)oparc.h:$(GLSRC)gsgstate.h $(PSSRC)oparc.h:$(GLSRC)gsiparam.h -$(PSSRC)oparc.h:$(GLSRC)gxbitmap.h $(PSSRC)oparc.h:$(GLSRC)gsmatrix.h -$(PSSRC)oparc.h:$(GLSRC)gsrefct.h +$(PSSRC)oparc.h:$(GLSRC)gxhttile.h $(PSSRC)oparc.h:$(GLSRC)gsparam.h -$(PSSRC)oparc.h:$(GLSRC)gsccolor.h +$(PSSRC)oparc.h:$(GLSRC)gsrefct.h +$(PSSRC)oparc.h:$(GLSRC)memento.h $(PSSRC)oparc.h:$(GLSRC)gsstruct.h $(PSSRC)oparc.h:$(GLSRC)gxsync.h +$(PSSRC)oparc.h:$(GLSRC)gxbitmap.h $(PSSRC)oparc.h:$(GLSRC)scommon.h -$(PSSRC)oparc.h:$(GLSRC)memento.h -$(PSSRC)oparc.h:$(GLSRC)gscsel.h $(PSSRC)oparc.h:$(GLSRC)gsbitmap.h +$(PSSRC)oparc.h:$(GLSRC)gsccolor.h +$(PSSRC)oparc.h:$(GLSRC)gxarith.h +$(PSSRC)oparc.h:$(GLSRC)gpsync.h $(PSSRC)oparc.h:$(GLSRC)gsstype.h $(PSSRC)oparc.h:$(GLSRC)gsmemory.h -$(PSSRC)oparc.h:$(GLSRC)gpsync.h $(PSSRC)oparc.h:$(GLSRC)gslibctx.h -$(PSSRC)oparc.h:$(GLSRC)gs_dll_call.h $(PSSRC)oparc.h:$(GLSRC)gsalloc.h -$(PSSRC)oparc.h:$(GLSRC)stdio_.h $(PSSRC)oparc.h:$(GLSRC)gxcindex.h -$(PSSRC)oparc.h:$(GLSRC)gsgstate.h +$(PSSRC)oparc.h:$(GLSRC)stdio_.h $(PSSRC)oparc.h:$(GLSRC)stdint_.h $(PSSRC)oparc.h:$(GLSRC)gssprintf.h -$(PSSRC)oparc.h:$(GLSRC)std.h $(PSSRC)oparc.h:$(GLSRC)gstypes.h +$(PSSRC)oparc.h:$(GLSRC)std.h $(PSSRC)oparc.h:$(GLSRC)stdpre.h $(PSSRC)oparc.h:$(GLGEN)arch.h +$(PSSRC)oparc.h:$(GLSRC)gs_dll_call.h $(PSSRC)opcheck.h:$(PSSRC)iref.h $(PSSRC)opcheck.h:$(GLSRC)gxalloc.h $(PSSRC)opcheck.h:$(GLSRC)gxobj.h $(PSSRC)opcheck.h:$(GLSRC)gsnamecl.h $(PSSRC)opcheck.h:$(GLSRC)gxcspace.h +$(PSSRC)opcheck.h:$(GLSRC)gscsel.h $(PSSRC)opcheck.h:$(GLSRC)gsdcolor.h $(PSSRC)opcheck.h:$(GLSRC)gxfrac.h $(PSSRC)opcheck.h:$(GLSRC)gscms.h -$(PSSRC)opcheck.h:$(GLSRC)gscspace.h $(PSSRC)opcheck.h:$(GLSRC)gsdevice.h -$(PSSRC)opcheck.h:$(GLSRC)gxarith.h -$(PSSRC)opcheck.h:$(GLSRC)gxhttile.h +$(PSSRC)opcheck.h:$(GLSRC)gscspace.h +$(PSSRC)opcheck.h:$(GLSRC)gsgstate.h $(PSSRC)opcheck.h:$(GLSRC)gsiparam.h -$(PSSRC)opcheck.h:$(GLSRC)gxbitmap.h $(PSSRC)opcheck.h:$(GLSRC)gsmatrix.h -$(PSSRC)opcheck.h:$(GLSRC)gsrefct.h +$(PSSRC)opcheck.h:$(GLSRC)gxhttile.h $(PSSRC)opcheck.h:$(GLSRC)gsparam.h -$(PSSRC)opcheck.h:$(GLSRC)gsccolor.h +$(PSSRC)opcheck.h:$(GLSRC)gsrefct.h +$(PSSRC)opcheck.h:$(GLSRC)memento.h $(PSSRC)opcheck.h:$(GLSRC)gsstruct.h $(PSSRC)opcheck.h:$(GLSRC)gxsync.h +$(PSSRC)opcheck.h:$(GLSRC)gxbitmap.h $(PSSRC)opcheck.h:$(GLSRC)scommon.h -$(PSSRC)opcheck.h:$(GLSRC)memento.h -$(PSSRC)opcheck.h:$(GLSRC)gscsel.h $(PSSRC)opcheck.h:$(GLSRC)gsbitmap.h +$(PSSRC)opcheck.h:$(GLSRC)gsccolor.h +$(PSSRC)opcheck.h:$(GLSRC)gxarith.h +$(PSSRC)opcheck.h:$(GLSRC)gpsync.h $(PSSRC)opcheck.h:$(GLSRC)gsstype.h $(PSSRC)opcheck.h:$(GLSRC)gsmemory.h -$(PSSRC)opcheck.h:$(GLSRC)gpsync.h $(PSSRC)opcheck.h:$(GLSRC)gslibctx.h -$(PSSRC)opcheck.h:$(GLSRC)gs_dll_call.h $(PSSRC)opcheck.h:$(GLSRC)gsalloc.h -$(PSSRC)opcheck.h:$(GLSRC)stdio_.h $(PSSRC)opcheck.h:$(GLSRC)gxcindex.h -$(PSSRC)opcheck.h:$(GLSRC)gsgstate.h +$(PSSRC)opcheck.h:$(GLSRC)stdio_.h $(PSSRC)opcheck.h:$(GLSRC)stdint_.h $(PSSRC)opcheck.h:$(GLSRC)gssprintf.h -$(PSSRC)opcheck.h:$(GLSRC)std.h $(PSSRC)opcheck.h:$(GLSRC)gstypes.h +$(PSSRC)opcheck.h:$(GLSRC)std.h $(PSSRC)opcheck.h:$(GLSRC)stdpre.h $(PSSRC)opcheck.h:$(GLGEN)arch.h +$(PSSRC)opcheck.h:$(GLSRC)gs_dll_call.h $(PSSRC)opextern.h:$(PSSRC)iref.h $(PSSRC)opextern.h:$(GLSRC)gxalloc.h $(PSSRC)opextern.h:$(GLSRC)gxobj.h $(PSSRC)opextern.h:$(GLSRC)gsnamecl.h $(PSSRC)opextern.h:$(GLSRC)gxcspace.h +$(PSSRC)opextern.h:$(GLSRC)gscsel.h $(PSSRC)opextern.h:$(GLSRC)gsdcolor.h $(PSSRC)opextern.h:$(GLSRC)gxfrac.h $(PSSRC)opextern.h:$(GLSRC)gscms.h -$(PSSRC)opextern.h:$(GLSRC)gscspace.h $(PSSRC)opextern.h:$(GLSRC)gsdevice.h -$(PSSRC)opextern.h:$(GLSRC)gxarith.h -$(PSSRC)opextern.h:$(GLSRC)gxhttile.h +$(PSSRC)opextern.h:$(GLSRC)gscspace.h +$(PSSRC)opextern.h:$(GLSRC)gsgstate.h $(PSSRC)opextern.h:$(GLSRC)gsiparam.h -$(PSSRC)opextern.h:$(GLSRC)gxbitmap.h $(PSSRC)opextern.h:$(GLSRC)gsmatrix.h -$(PSSRC)opextern.h:$(GLSRC)gsrefct.h +$(PSSRC)opextern.h:$(GLSRC)gxhttile.h $(PSSRC)opextern.h:$(GLSRC)gsparam.h -$(PSSRC)opextern.h:$(GLSRC)gsccolor.h +$(PSSRC)opextern.h:$(GLSRC)gsrefct.h +$(PSSRC)opextern.h:$(GLSRC)memento.h $(PSSRC)opextern.h:$(GLSRC)gsstruct.h $(PSSRC)opextern.h:$(GLSRC)gxsync.h +$(PSSRC)opextern.h:$(GLSRC)gxbitmap.h $(PSSRC)opextern.h:$(GLSRC)scommon.h -$(PSSRC)opextern.h:$(GLSRC)memento.h -$(PSSRC)opextern.h:$(GLSRC)gscsel.h $(PSSRC)opextern.h:$(GLSRC)gsbitmap.h +$(PSSRC)opextern.h:$(GLSRC)gsccolor.h +$(PSSRC)opextern.h:$(GLSRC)gxarith.h +$(PSSRC)opextern.h:$(GLSRC)gpsync.h $(PSSRC)opextern.h:$(GLSRC)gsstype.h $(PSSRC)opextern.h:$(GLSRC)gsmemory.h -$(PSSRC)opextern.h:$(GLSRC)gpsync.h $(PSSRC)opextern.h:$(GLSRC)gslibctx.h -$(PSSRC)opextern.h:$(GLSRC)gs_dll_call.h $(PSSRC)opextern.h:$(GLSRC)gsalloc.h -$(PSSRC)opextern.h:$(GLSRC)stdio_.h $(PSSRC)opextern.h:$(GLSRC)gxcindex.h -$(PSSRC)opextern.h:$(GLSRC)gsgstate.h +$(PSSRC)opextern.h:$(GLSRC)stdio_.h $(PSSRC)opextern.h:$(GLSRC)stdint_.h $(PSSRC)opextern.h:$(GLSRC)gssprintf.h -$(PSSRC)opextern.h:$(GLSRC)std.h $(PSSRC)opextern.h:$(GLSRC)gstypes.h +$(PSSRC)opextern.h:$(GLSRC)std.h $(PSSRC)opextern.h:$(GLSRC)stdpre.h $(PSSRC)opextern.h:$(GLGEN)arch.h +$(PSSRC)opextern.h:$(GLSRC)gs_dll_call.h $(PSSRC)idsdata.h:$(PSSRC)iddstack.h $(PSSRC)idsdata.h:$(PSSRC)isdata.h $(PSSRC)idsdata.h:$(PSSRC)imemory.h @@ -3507,40 +3507,40 @@ $(PSSRC)idsdata.h:$(GLSRC)gxalloc.h $(PSSRC)idsdata.h:$(GLSRC)gxobj.h $(PSSRC)idsdata.h:$(GLSRC)gsnamecl.h $(PSSRC)idsdata.h:$(GLSRC)gxcspace.h +$(PSSRC)idsdata.h:$(GLSRC)gscsel.h $(PSSRC)idsdata.h:$(GLSRC)gsdcolor.h $(PSSRC)idsdata.h:$(GLSRC)gxfrac.h $(PSSRC)idsdata.h:$(GLSRC)gscms.h -$(PSSRC)idsdata.h:$(GLSRC)gscspace.h $(PSSRC)idsdata.h:$(GLSRC)gsdevice.h -$(PSSRC)idsdata.h:$(GLSRC)gxarith.h -$(PSSRC)idsdata.h:$(GLSRC)gxhttile.h +$(PSSRC)idsdata.h:$(GLSRC)gscspace.h +$(PSSRC)idsdata.h:$(GLSRC)gsgstate.h $(PSSRC)idsdata.h:$(GLSRC)gsiparam.h -$(PSSRC)idsdata.h:$(GLSRC)gxbitmap.h $(PSSRC)idsdata.h:$(GLSRC)gsmatrix.h -$(PSSRC)idsdata.h:$(GLSRC)gsrefct.h +$(PSSRC)idsdata.h:$(GLSRC)gxhttile.h $(PSSRC)idsdata.h:$(GLSRC)gsparam.h -$(PSSRC)idsdata.h:$(GLSRC)gsccolor.h +$(PSSRC)idsdata.h:$(GLSRC)gsrefct.h +$(PSSRC)idsdata.h:$(GLSRC)memento.h $(PSSRC)idsdata.h:$(GLSRC)gsstruct.h $(PSSRC)idsdata.h:$(GLSRC)gxsync.h +$(PSSRC)idsdata.h:$(GLSRC)gxbitmap.h $(PSSRC)idsdata.h:$(GLSRC)scommon.h -$(PSSRC)idsdata.h:$(GLSRC)memento.h -$(PSSRC)idsdata.h:$(GLSRC)gscsel.h $(PSSRC)idsdata.h:$(GLSRC)gsbitmap.h +$(PSSRC)idsdata.h:$(GLSRC)gsccolor.h +$(PSSRC)idsdata.h:$(GLSRC)gxarith.h +$(PSSRC)idsdata.h:$(GLSRC)gpsync.h $(PSSRC)idsdata.h:$(GLSRC)gsstype.h $(PSSRC)idsdata.h:$(GLSRC)gsmemory.h -$(PSSRC)idsdata.h:$(GLSRC)gpsync.h $(PSSRC)idsdata.h:$(GLSRC)gslibctx.h -$(PSSRC)idsdata.h:$(GLSRC)gs_dll_call.h $(PSSRC)idsdata.h:$(GLSRC)gsalloc.h -$(PSSRC)idsdata.h:$(GLSRC)stdio_.h $(PSSRC)idsdata.h:$(GLSRC)gxcindex.h -$(PSSRC)idsdata.h:$(GLSRC)gsgstate.h +$(PSSRC)idsdata.h:$(GLSRC)stdio_.h $(PSSRC)idsdata.h:$(GLSRC)stdint_.h $(PSSRC)idsdata.h:$(GLSRC)gssprintf.h -$(PSSRC)idsdata.h:$(GLSRC)std.h $(PSSRC)idsdata.h:$(GLSRC)gstypes.h +$(PSSRC)idsdata.h:$(GLSRC)std.h $(PSSRC)idsdata.h:$(GLSRC)stdpre.h $(PSSRC)idsdata.h:$(GLGEN)arch.h +$(PSSRC)idsdata.h:$(GLSRC)gs_dll_call.h $(PSSRC)idstack.h:$(PSSRC)idsdata.h $(PSSRC)idstack.h:$(PSSRC)iddstack.h $(PSSRC)idstack.h:$(PSSRC)istack.h @@ -3553,40 +3553,40 @@ $(PSSRC)idstack.h:$(GLSRC)gxalloc.h $(PSSRC)idstack.h:$(GLSRC)gxobj.h $(PSSRC)idstack.h:$(GLSRC)gsnamecl.h $(PSSRC)idstack.h:$(GLSRC)gxcspace.h +$(PSSRC)idstack.h:$(GLSRC)gscsel.h $(PSSRC)idstack.h:$(GLSRC)gsdcolor.h $(PSSRC)idstack.h:$(GLSRC)gxfrac.h $(PSSRC)idstack.h:$(GLSRC)gscms.h -$(PSSRC)idstack.h:$(GLSRC)gscspace.h $(PSSRC)idstack.h:$(GLSRC)gsdevice.h -$(PSSRC)idstack.h:$(GLSRC)gxarith.h -$(PSSRC)idstack.h:$(GLSRC)gxhttile.h +$(PSSRC)idstack.h:$(GLSRC)gscspace.h +$(PSSRC)idstack.h:$(GLSRC)gsgstate.h $(PSSRC)idstack.h:$(GLSRC)gsiparam.h -$(PSSRC)idstack.h:$(GLSRC)gxbitmap.h $(PSSRC)idstack.h:$(GLSRC)gsmatrix.h -$(PSSRC)idstack.h:$(GLSRC)gsrefct.h +$(PSSRC)idstack.h:$(GLSRC)gxhttile.h $(PSSRC)idstack.h:$(GLSRC)gsparam.h -$(PSSRC)idstack.h:$(GLSRC)gsccolor.h +$(PSSRC)idstack.h:$(GLSRC)gsrefct.h +$(PSSRC)idstack.h:$(GLSRC)memento.h $(PSSRC)idstack.h:$(GLSRC)gsstruct.h $(PSSRC)idstack.h:$(GLSRC)gxsync.h +$(PSSRC)idstack.h:$(GLSRC)gxbitmap.h $(PSSRC)idstack.h:$(GLSRC)scommon.h -$(PSSRC)idstack.h:$(GLSRC)memento.h -$(PSSRC)idstack.h:$(GLSRC)gscsel.h $(PSSRC)idstack.h:$(GLSRC)gsbitmap.h +$(PSSRC)idstack.h:$(GLSRC)gsccolor.h +$(PSSRC)idstack.h:$(GLSRC)gxarith.h +$(PSSRC)idstack.h:$(GLSRC)gpsync.h $(PSSRC)idstack.h:$(GLSRC)gsstype.h $(PSSRC)idstack.h:$(GLSRC)gsmemory.h -$(PSSRC)idstack.h:$(GLSRC)gpsync.h $(PSSRC)idstack.h:$(GLSRC)gslibctx.h -$(PSSRC)idstack.h:$(GLSRC)gs_dll_call.h $(PSSRC)idstack.h:$(GLSRC)gsalloc.h -$(PSSRC)idstack.h:$(GLSRC)stdio_.h $(PSSRC)idstack.h:$(GLSRC)gxcindex.h -$(PSSRC)idstack.h:$(GLSRC)gsgstate.h +$(PSSRC)idstack.h:$(GLSRC)stdio_.h $(PSSRC)idstack.h:$(GLSRC)stdint_.h $(PSSRC)idstack.h:$(GLSRC)gssprintf.h -$(PSSRC)idstack.h:$(GLSRC)std.h $(PSSRC)idstack.h:$(GLSRC)gstypes.h +$(PSSRC)idstack.h:$(GLSRC)std.h $(PSSRC)idstack.h:$(GLSRC)stdpre.h $(PSSRC)idstack.h:$(GLGEN)arch.h +$(PSSRC)idstack.h:$(GLSRC)gs_dll_call.h $(PSSRC)iesdata.h:$(PSSRC)isdata.h $(PSSRC)iesdata.h:$(PSSRC)imemory.h $(PSSRC)iesdata.h:$(PSSRC)ivmspace.h @@ -3596,40 +3596,40 @@ $(PSSRC)iesdata.h:$(GLSRC)gxalloc.h $(PSSRC)iesdata.h:$(GLSRC)gxobj.h $(PSSRC)iesdata.h:$(GLSRC)gsnamecl.h $(PSSRC)iesdata.h:$(GLSRC)gxcspace.h +$(PSSRC)iesdata.h:$(GLSRC)gscsel.h $(PSSRC)iesdata.h:$(GLSRC)gsdcolor.h $(PSSRC)iesdata.h:$(GLSRC)gxfrac.h $(PSSRC)iesdata.h:$(GLSRC)gscms.h -$(PSSRC)iesdata.h:$(GLSRC)gscspace.h $(PSSRC)iesdata.h:$(GLSRC)gsdevice.h -$(PSSRC)iesdata.h:$(GLSRC)gxarith.h -$(PSSRC)iesdata.h:$(GLSRC)gxhttile.h +$(PSSRC)iesdata.h:$(GLSRC)gscspace.h +$(PSSRC)iesdata.h:$(GLSRC)gsgstate.h $(PSSRC)iesdata.h:$(GLSRC)gsiparam.h -$(PSSRC)iesdata.h:$(GLSRC)gxbitmap.h $(PSSRC)iesdata.h:$(GLSRC)gsmatrix.h -$(PSSRC)iesdata.h:$(GLSRC)gsrefct.h +$(PSSRC)iesdata.h:$(GLSRC)gxhttile.h $(PSSRC)iesdata.h:$(GLSRC)gsparam.h -$(PSSRC)iesdata.h:$(GLSRC)gsccolor.h +$(PSSRC)iesdata.h:$(GLSRC)gsrefct.h +$(PSSRC)iesdata.h:$(GLSRC)memento.h $(PSSRC)iesdata.h:$(GLSRC)gsstruct.h $(PSSRC)iesdata.h:$(GLSRC)gxsync.h +$(PSSRC)iesdata.h:$(GLSRC)gxbitmap.h $(PSSRC)iesdata.h:$(GLSRC)scommon.h -$(PSSRC)iesdata.h:$(GLSRC)memento.h -$(PSSRC)iesdata.h:$(GLSRC)gscsel.h $(PSSRC)iesdata.h:$(GLSRC)gsbitmap.h +$(PSSRC)iesdata.h:$(GLSRC)gsccolor.h +$(PSSRC)iesdata.h:$(GLSRC)gxarith.h +$(PSSRC)iesdata.h:$(GLSRC)gpsync.h $(PSSRC)iesdata.h:$(GLSRC)gsstype.h $(PSSRC)iesdata.h:$(GLSRC)gsmemory.h -$(PSSRC)iesdata.h:$(GLSRC)gpsync.h $(PSSRC)iesdata.h:$(GLSRC)gslibctx.h -$(PSSRC)iesdata.h:$(GLSRC)gs_dll_call.h $(PSSRC)iesdata.h:$(GLSRC)gsalloc.h -$(PSSRC)iesdata.h:$(GLSRC)stdio_.h $(PSSRC)iesdata.h:$(GLSRC)gxcindex.h -$(PSSRC)iesdata.h:$(GLSRC)gsgstate.h +$(PSSRC)iesdata.h:$(GLSRC)stdio_.h $(PSSRC)iesdata.h:$(GLSRC)stdint_.h $(PSSRC)iesdata.h:$(GLSRC)gssprintf.h -$(PSSRC)iesdata.h:$(GLSRC)std.h $(PSSRC)iesdata.h:$(GLSRC)gstypes.h +$(PSSRC)iesdata.h:$(GLSRC)std.h $(PSSRC)iesdata.h:$(GLSRC)stdpre.h $(PSSRC)iesdata.h:$(GLGEN)arch.h +$(PSSRC)iesdata.h:$(GLSRC)gs_dll_call.h $(PSSRC)iestack.h:$(PSSRC)iesdata.h $(PSSRC)iestack.h:$(PSSRC)istack.h $(PSSRC)iestack.h:$(PSSRC)isdata.h @@ -3641,40 +3641,40 @@ $(PSSRC)iestack.h:$(GLSRC)gxalloc.h $(PSSRC)iestack.h:$(GLSRC)gxobj.h $(PSSRC)iestack.h:$(GLSRC)gsnamecl.h $(PSSRC)iestack.h:$(GLSRC)gxcspace.h +$(PSSRC)iestack.h:$(GLSRC)gscsel.h $(PSSRC)iestack.h:$(GLSRC)gsdcolor.h $(PSSRC)iestack.h:$(GLSRC)gxfrac.h $(PSSRC)iestack.h:$(GLSRC)gscms.h -$(PSSRC)iestack.h:$(GLSRC)gscspace.h $(PSSRC)iestack.h:$(GLSRC)gsdevice.h -$(PSSRC)iestack.h:$(GLSRC)gxarith.h -$(PSSRC)iestack.h:$(GLSRC)gxhttile.h +$(PSSRC)iestack.h:$(GLSRC)gscspace.h +$(PSSRC)iestack.h:$(GLSRC)gsgstate.h $(PSSRC)iestack.h:$(GLSRC)gsiparam.h -$(PSSRC)iestack.h:$(GLSRC)gxbitmap.h $(PSSRC)iestack.h:$(GLSRC)gsmatrix.h -$(PSSRC)iestack.h:$(GLSRC)gsrefct.h +$(PSSRC)iestack.h:$(GLSRC)gxhttile.h $(PSSRC)iestack.h:$(GLSRC)gsparam.h -$(PSSRC)iestack.h:$(GLSRC)gsccolor.h +$(PSSRC)iestack.h:$(GLSRC)gsrefct.h +$(PSSRC)iestack.h:$(GLSRC)memento.h $(PSSRC)iestack.h:$(GLSRC)gsstruct.h $(PSSRC)iestack.h:$(GLSRC)gxsync.h +$(PSSRC)iestack.h:$(GLSRC)gxbitmap.h $(PSSRC)iestack.h:$(GLSRC)scommon.h -$(PSSRC)iestack.h:$(GLSRC)memento.h -$(PSSRC)iestack.h:$(GLSRC)gscsel.h $(PSSRC)iestack.h:$(GLSRC)gsbitmap.h +$(PSSRC)iestack.h:$(GLSRC)gsccolor.h +$(PSSRC)iestack.h:$(GLSRC)gxarith.h +$(PSSRC)iestack.h:$(GLSRC)gpsync.h $(PSSRC)iestack.h:$(GLSRC)gsstype.h $(PSSRC)iestack.h:$(GLSRC)gsmemory.h -$(PSSRC)iestack.h:$(GLSRC)gpsync.h $(PSSRC)iestack.h:$(GLSRC)gslibctx.h -$(PSSRC)iestack.h:$(GLSRC)gs_dll_call.h $(PSSRC)iestack.h:$(GLSRC)gsalloc.h -$(PSSRC)iestack.h:$(GLSRC)stdio_.h $(PSSRC)iestack.h:$(GLSRC)gxcindex.h -$(PSSRC)iestack.h:$(GLSRC)gsgstate.h +$(PSSRC)iestack.h:$(GLSRC)stdio_.h $(PSSRC)iestack.h:$(GLSRC)stdint_.h $(PSSRC)iestack.h:$(GLSRC)gssprintf.h -$(PSSRC)iestack.h:$(GLSRC)std.h $(PSSRC)iestack.h:$(GLSRC)gstypes.h +$(PSSRC)iestack.h:$(GLSRC)std.h $(PSSRC)iestack.h:$(GLSRC)stdpre.h $(PSSRC)iestack.h:$(GLGEN)arch.h +$(PSSRC)iestack.h:$(GLSRC)gs_dll_call.h $(PSSRC)iosdata.h:$(PSSRC)isdata.h $(PSSRC)iosdata.h:$(PSSRC)imemory.h $(PSSRC)iosdata.h:$(PSSRC)ivmspace.h @@ -3684,40 +3684,40 @@ $(PSSRC)iosdata.h:$(GLSRC)gxalloc.h $(PSSRC)iosdata.h:$(GLSRC)gxobj.h $(PSSRC)iosdata.h:$(GLSRC)gsnamecl.h $(PSSRC)iosdata.h:$(GLSRC)gxcspace.h +$(PSSRC)iosdata.h:$(GLSRC)gscsel.h $(PSSRC)iosdata.h:$(GLSRC)gsdcolor.h $(PSSRC)iosdata.h:$(GLSRC)gxfrac.h $(PSSRC)iosdata.h:$(GLSRC)gscms.h -$(PSSRC)iosdata.h:$(GLSRC)gscspace.h $(PSSRC)iosdata.h:$(GLSRC)gsdevice.h -$(PSSRC)iosdata.h:$(GLSRC)gxarith.h -$(PSSRC)iosdata.h:$(GLSRC)gxhttile.h +$(PSSRC)iosdata.h:$(GLSRC)gscspace.h +$(PSSRC)iosdata.h:$(GLSRC)gsgstate.h $(PSSRC)iosdata.h:$(GLSRC)gsiparam.h -$(PSSRC)iosdata.h:$(GLSRC)gxbitmap.h $(PSSRC)iosdata.h:$(GLSRC)gsmatrix.h -$(PSSRC)iosdata.h:$(GLSRC)gsrefct.h +$(PSSRC)iosdata.h:$(GLSRC)gxhttile.h $(PSSRC)iosdata.h:$(GLSRC)gsparam.h -$(PSSRC)iosdata.h:$(GLSRC)gsccolor.h +$(PSSRC)iosdata.h:$(GLSRC)gsrefct.h +$(PSSRC)iosdata.h:$(GLSRC)memento.h $(PSSRC)iosdata.h:$(GLSRC)gsstruct.h $(PSSRC)iosdata.h:$(GLSRC)gxsync.h +$(PSSRC)iosdata.h:$(GLSRC)gxbitmap.h $(PSSRC)iosdata.h:$(GLSRC)scommon.h -$(PSSRC)iosdata.h:$(GLSRC)memento.h -$(PSSRC)iosdata.h:$(GLSRC)gscsel.h $(PSSRC)iosdata.h:$(GLSRC)gsbitmap.h +$(PSSRC)iosdata.h:$(GLSRC)gsccolor.h +$(PSSRC)iosdata.h:$(GLSRC)gxarith.h +$(PSSRC)iosdata.h:$(GLSRC)gpsync.h $(PSSRC)iosdata.h:$(GLSRC)gsstype.h $(PSSRC)iosdata.h:$(GLSRC)gsmemory.h -$(PSSRC)iosdata.h:$(GLSRC)gpsync.h $(PSSRC)iosdata.h:$(GLSRC)gslibctx.h -$(PSSRC)iosdata.h:$(GLSRC)gs_dll_call.h $(PSSRC)iosdata.h:$(GLSRC)gsalloc.h -$(PSSRC)iosdata.h:$(GLSRC)stdio_.h $(PSSRC)iosdata.h:$(GLSRC)gxcindex.h -$(PSSRC)iosdata.h:$(GLSRC)gsgstate.h +$(PSSRC)iosdata.h:$(GLSRC)stdio_.h $(PSSRC)iosdata.h:$(GLSRC)stdint_.h $(PSSRC)iosdata.h:$(GLSRC)gssprintf.h -$(PSSRC)iosdata.h:$(GLSRC)std.h $(PSSRC)iosdata.h:$(GLSRC)gstypes.h +$(PSSRC)iosdata.h:$(GLSRC)std.h $(PSSRC)iosdata.h:$(GLSRC)stdpre.h $(PSSRC)iosdata.h:$(GLGEN)arch.h +$(PSSRC)iosdata.h:$(GLSRC)gs_dll_call.h $(PSSRC)iostack.h:$(PSSRC)istack.h $(PSSRC)iostack.h:$(PSSRC)iosdata.h $(PSSRC)iostack.h:$(PSSRC)isdata.h @@ -3729,45 +3729,45 @@ $(PSSRC)iostack.h:$(GLSRC)gxalloc.h $(PSSRC)iostack.h:$(GLSRC)gxobj.h $(PSSRC)iostack.h:$(GLSRC)gsnamecl.h $(PSSRC)iostack.h:$(GLSRC)gxcspace.h +$(PSSRC)iostack.h:$(GLSRC)gscsel.h $(PSSRC)iostack.h:$(GLSRC)gsdcolor.h $(PSSRC)iostack.h:$(GLSRC)gxfrac.h $(PSSRC)iostack.h:$(GLSRC)gscms.h -$(PSSRC)iostack.h:$(GLSRC)gscspace.h $(PSSRC)iostack.h:$(GLSRC)gsdevice.h -$(PSSRC)iostack.h:$(GLSRC)gxarith.h -$(PSSRC)iostack.h:$(GLSRC)gxhttile.h +$(PSSRC)iostack.h:$(GLSRC)gscspace.h +$(PSSRC)iostack.h:$(GLSRC)gsgstate.h $(PSSRC)iostack.h:$(GLSRC)gsiparam.h -$(PSSRC)iostack.h:$(GLSRC)gxbitmap.h $(PSSRC)iostack.h:$(GLSRC)gsmatrix.h -$(PSSRC)iostack.h:$(GLSRC)gsrefct.h +$(PSSRC)iostack.h:$(GLSRC)gxhttile.h $(PSSRC)iostack.h:$(GLSRC)gsparam.h -$(PSSRC)iostack.h:$(GLSRC)gsccolor.h +$(PSSRC)iostack.h:$(GLSRC)gsrefct.h +$(PSSRC)iostack.h:$(GLSRC)memento.h $(PSSRC)iostack.h:$(GLSRC)gsstruct.h $(PSSRC)iostack.h:$(GLSRC)gxsync.h +$(PSSRC)iostack.h:$(GLSRC)gxbitmap.h $(PSSRC)iostack.h:$(GLSRC)scommon.h -$(PSSRC)iostack.h:$(GLSRC)memento.h -$(PSSRC)iostack.h:$(GLSRC)gscsel.h $(PSSRC)iostack.h:$(GLSRC)gsbitmap.h +$(PSSRC)iostack.h:$(GLSRC)gsccolor.h +$(PSSRC)iostack.h:$(GLSRC)gxarith.h +$(PSSRC)iostack.h:$(GLSRC)gpsync.h $(PSSRC)iostack.h:$(GLSRC)gsstype.h $(PSSRC)iostack.h:$(GLSRC)gsmemory.h -$(PSSRC)iostack.h:$(GLSRC)gpsync.h $(PSSRC)iostack.h:$(GLSRC)gslibctx.h -$(PSSRC)iostack.h:$(GLSRC)gs_dll_call.h $(PSSRC)iostack.h:$(GLSRC)gsalloc.h -$(PSSRC)iostack.h:$(GLSRC)stdio_.h $(PSSRC)iostack.h:$(GLSRC)gxcindex.h -$(PSSRC)iostack.h:$(GLSRC)gsgstate.h +$(PSSRC)iostack.h:$(GLSRC)stdio_.h $(PSSRC)iostack.h:$(GLSRC)stdint_.h $(PSSRC)iostack.h:$(GLSRC)gssprintf.h -$(PSSRC)iostack.h:$(GLSRC)std.h $(PSSRC)iostack.h:$(GLSRC)gstypes.h +$(PSSRC)iostack.h:$(GLSRC)std.h $(PSSRC)iostack.h:$(GLSRC)stdpre.h $(PSSRC)iostack.h:$(GLGEN)arch.h +$(PSSRC)iostack.h:$(GLSRC)gs_dll_call.h $(PSSRC)icstate.h:$(PSSRC)idsdata.h $(PSSRC)icstate.h:$(PSSRC)iesdata.h $(PSSRC)icstate.h:$(PSSRC)interp.h -$(PSSRC)icstate.h:$(PSSRC)opdef.h $(PSSRC)icstate.h:$(PSSRC)files.h +$(PSSRC)icstate.h:$(PSSRC)opdef.h $(PSSRC)icstate.h:$(PSSRC)iddstack.h $(PSSRC)icstate.h:$(PSSRC)store.h $(PSSRC)icstate.h:$(PSSRC)iosdata.h @@ -3784,53 +3784,53 @@ $(PSSRC)icstate.h:$(GLSRC)gsnamecl.h $(PSSRC)icstate.h:$(GLSRC)stream.h $(PSSRC)icstate.h:$(GLSRC)gxcspace.h $(PSSRC)icstate.h:$(GLSRC)gxiodev.h +$(PSSRC)icstate.h:$(GLSRC)gscsel.h $(PSSRC)icstate.h:$(GLSRC)gsdcolor.h $(PSSRC)icstate.h:$(GLSRC)gxfrac.h $(PSSRC)icstate.h:$(GLSRC)gscms.h -$(PSSRC)icstate.h:$(GLSRC)gscspace.h $(PSSRC)icstate.h:$(GLSRC)gsdevice.h -$(PSSRC)icstate.h:$(GLSRC)gxarith.h -$(PSSRC)icstate.h:$(GLSRC)gxhttile.h +$(PSSRC)icstate.h:$(GLSRC)gscspace.h +$(PSSRC)icstate.h:$(GLSRC)gsgstate.h $(PSSRC)icstate.h:$(GLSRC)gsiparam.h -$(PSSRC)icstate.h:$(GLSRC)gxbitmap.h $(PSSRC)icstate.h:$(GLSRC)gsmatrix.h -$(PSSRC)icstate.h:$(GLSRC)gsrefct.h +$(PSSRC)icstate.h:$(GLSRC)gxhttile.h $(PSSRC)icstate.h:$(GLSRC)gsparam.h +$(PSSRC)icstate.h:$(GLSRC)gsrefct.h $(PSSRC)icstate.h:$(GLSRC)gp.h -$(PSSRC)icstate.h:$(GLSRC)gsccolor.h +$(PSSRC)icstate.h:$(GLSRC)memento.h +$(PSSRC)icstate.h:$(GLSRC)memory_.h $(PSSRC)icstate.h:$(GLSRC)gsstruct.h $(PSSRC)icstate.h:$(GLSRC)gxsync.h +$(PSSRC)icstate.h:$(GLSRC)gxbitmap.h $(PSSRC)icstate.h:$(GLSRC)srdline.h $(PSSRC)icstate.h:$(GLSRC)scommon.h -$(PSSRC)icstate.h:$(GLSRC)memento.h -$(PSSRC)icstate.h:$(GLSRC)gscsel.h -$(PSSRC)icstate.h:$(GLSRC)gsbitmap.h $(PSSRC)icstate.h:$(GLSRC)gsfname.h -$(PSSRC)icstate.h:$(GLSRC)gsstype.h +$(PSSRC)icstate.h:$(GLSRC)gsbitmap.h +$(PSSRC)icstate.h:$(GLSRC)gsccolor.h +$(PSSRC)icstate.h:$(GLSRC)gxarith.h $(PSSRC)icstate.h:$(GLSRC)stat_.h -$(PSSRC)icstate.h:$(GLSRC)gsmemory.h $(PSSRC)icstate.h:$(GLSRC)gpsync.h -$(PSSRC)icstate.h:$(GLSRC)memory_.h +$(PSSRC)icstate.h:$(GLSRC)gsstype.h +$(PSSRC)icstate.h:$(GLSRC)gsmemory.h $(PSSRC)icstate.h:$(GLSRC)gpgetenv.h -$(PSSRC)icstate.h:$(GLSRC)gslibctx.h $(PSSRC)icstate.h:$(GLSRC)gscdefs.h -$(PSSRC)icstate.h:$(GLSRC)gs_dll_call.h +$(PSSRC)icstate.h:$(GLSRC)gslibctx.h $(PSSRC)icstate.h:$(GLSRC)gsalloc.h -$(PSSRC)icstate.h:$(GLSRC)stdio_.h $(PSSRC)icstate.h:$(GLSRC)gxcindex.h -$(PSSRC)icstate.h:$(GLSRC)gsgstate.h +$(PSSRC)icstate.h:$(GLSRC)stdio_.h $(PSSRC)icstate.h:$(GLSRC)stdint_.h $(PSSRC)icstate.h:$(GLSRC)gssprintf.h -$(PSSRC)icstate.h:$(GLSRC)std.h $(PSSRC)icstate.h:$(GLSRC)gstypes.h +$(PSSRC)icstate.h:$(GLSRC)std.h $(PSSRC)icstate.h:$(GLSRC)stdpre.h $(PSSRC)icstate.h:$(GLGEN)arch.h +$(PSSRC)icstate.h:$(GLSRC)gs_dll_call.h $(PSSRC)iddict.h:$(PSSRC)icstate.h $(PSSRC)iddict.h:$(PSSRC)idsdata.h $(PSSRC)iddict.h:$(PSSRC)iesdata.h $(PSSRC)iddict.h:$(PSSRC)interp.h -$(PSSRC)iddict.h:$(PSSRC)opdef.h $(PSSRC)iddict.h:$(PSSRC)files.h +$(PSSRC)iddict.h:$(PSSRC)opdef.h $(PSSRC)iddict.h:$(PSSRC)idict.h $(PSSRC)iddict.h:$(PSSRC)iddstack.h $(PSSRC)iddict.h:$(PSSRC)store.h @@ -3848,54 +3848,54 @@ $(PSSRC)iddict.h:$(GLSRC)gsnamecl.h $(PSSRC)iddict.h:$(GLSRC)stream.h $(PSSRC)iddict.h:$(GLSRC)gxcspace.h $(PSSRC)iddict.h:$(GLSRC)gxiodev.h +$(PSSRC)iddict.h:$(GLSRC)gscsel.h $(PSSRC)iddict.h:$(GLSRC)gsdcolor.h $(PSSRC)iddict.h:$(GLSRC)gxfrac.h $(PSSRC)iddict.h:$(GLSRC)gscms.h -$(PSSRC)iddict.h:$(GLSRC)gscspace.h $(PSSRC)iddict.h:$(GLSRC)gsdevice.h -$(PSSRC)iddict.h:$(GLSRC)gxarith.h -$(PSSRC)iddict.h:$(GLSRC)gxhttile.h +$(PSSRC)iddict.h:$(GLSRC)gscspace.h +$(PSSRC)iddict.h:$(GLSRC)gsgstate.h $(PSSRC)iddict.h:$(GLSRC)gsiparam.h -$(PSSRC)iddict.h:$(GLSRC)gxbitmap.h $(PSSRC)iddict.h:$(GLSRC)gsmatrix.h -$(PSSRC)iddict.h:$(GLSRC)gsrefct.h +$(PSSRC)iddict.h:$(GLSRC)gxhttile.h $(PSSRC)iddict.h:$(GLSRC)gsparam.h +$(PSSRC)iddict.h:$(GLSRC)gsrefct.h $(PSSRC)iddict.h:$(GLSRC)gp.h -$(PSSRC)iddict.h:$(GLSRC)gsccolor.h +$(PSSRC)iddict.h:$(GLSRC)memento.h +$(PSSRC)iddict.h:$(GLSRC)memory_.h $(PSSRC)iddict.h:$(GLSRC)gsstruct.h $(PSSRC)iddict.h:$(GLSRC)gxsync.h +$(PSSRC)iddict.h:$(GLSRC)gxbitmap.h $(PSSRC)iddict.h:$(GLSRC)srdline.h $(PSSRC)iddict.h:$(GLSRC)scommon.h -$(PSSRC)iddict.h:$(GLSRC)memento.h -$(PSSRC)iddict.h:$(GLSRC)gscsel.h -$(PSSRC)iddict.h:$(GLSRC)gsbitmap.h $(PSSRC)iddict.h:$(GLSRC)gsfname.h -$(PSSRC)iddict.h:$(GLSRC)gsstype.h +$(PSSRC)iddict.h:$(GLSRC)gsbitmap.h +$(PSSRC)iddict.h:$(GLSRC)gsccolor.h +$(PSSRC)iddict.h:$(GLSRC)gxarith.h $(PSSRC)iddict.h:$(GLSRC)stat_.h -$(PSSRC)iddict.h:$(GLSRC)gsmemory.h $(PSSRC)iddict.h:$(GLSRC)gpsync.h -$(PSSRC)iddict.h:$(GLSRC)memory_.h +$(PSSRC)iddict.h:$(GLSRC)gsstype.h +$(PSSRC)iddict.h:$(GLSRC)gsmemory.h $(PSSRC)iddict.h:$(GLSRC)gpgetenv.h -$(PSSRC)iddict.h:$(GLSRC)gslibctx.h $(PSSRC)iddict.h:$(GLSRC)gscdefs.h -$(PSSRC)iddict.h:$(GLSRC)gs_dll_call.h +$(PSSRC)iddict.h:$(GLSRC)gslibctx.h $(PSSRC)iddict.h:$(GLSRC)gsalloc.h -$(PSSRC)iddict.h:$(GLSRC)stdio_.h $(PSSRC)iddict.h:$(GLSRC)gxcindex.h -$(PSSRC)iddict.h:$(GLSRC)gsgstate.h +$(PSSRC)iddict.h:$(GLSRC)stdio_.h $(PSSRC)iddict.h:$(GLSRC)stdint_.h $(PSSRC)iddict.h:$(GLSRC)gssprintf.h -$(PSSRC)iddict.h:$(GLSRC)std.h $(PSSRC)iddict.h:$(GLSRC)gstypes.h +$(PSSRC)iddict.h:$(GLSRC)std.h $(PSSRC)iddict.h:$(GLSRC)stdpre.h $(PSSRC)iddict.h:$(GLGEN)arch.h +$(PSSRC)iddict.h:$(GLSRC)gs_dll_call.h $(PSSRC)dstack.h:$(PSSRC)idstack.h $(PSSRC)dstack.h:$(PSSRC)icstate.h $(PSSRC)dstack.h:$(PSSRC)idsdata.h $(PSSRC)dstack.h:$(PSSRC)iesdata.h $(PSSRC)dstack.h:$(PSSRC)interp.h -$(PSSRC)dstack.h:$(PSSRC)opdef.h $(PSSRC)dstack.h:$(PSSRC)files.h +$(PSSRC)dstack.h:$(PSSRC)opdef.h $(PSSRC)dstack.h:$(PSSRC)iddstack.h $(PSSRC)dstack.h:$(PSSRC)istack.h $(PSSRC)dstack.h:$(PSSRC)store.h @@ -3913,54 +3913,54 @@ $(PSSRC)dstack.h:$(GLSRC)gsnamecl.h $(PSSRC)dstack.h:$(GLSRC)stream.h $(PSSRC)dstack.h:$(GLSRC)gxcspace.h $(PSSRC)dstack.h:$(GLSRC)gxiodev.h +$(PSSRC)dstack.h:$(GLSRC)gscsel.h $(PSSRC)dstack.h:$(GLSRC)gsdcolor.h $(PSSRC)dstack.h:$(GLSRC)gxfrac.h $(PSSRC)dstack.h:$(GLSRC)gscms.h -$(PSSRC)dstack.h:$(GLSRC)gscspace.h $(PSSRC)dstack.h:$(GLSRC)gsdevice.h -$(PSSRC)dstack.h:$(GLSRC)gxarith.h -$(PSSRC)dstack.h:$(GLSRC)gxhttile.h +$(PSSRC)dstack.h:$(GLSRC)gscspace.h +$(PSSRC)dstack.h:$(GLSRC)gsgstate.h $(PSSRC)dstack.h:$(GLSRC)gsiparam.h -$(PSSRC)dstack.h:$(GLSRC)gxbitmap.h $(PSSRC)dstack.h:$(GLSRC)gsmatrix.h -$(PSSRC)dstack.h:$(GLSRC)gsrefct.h +$(PSSRC)dstack.h:$(GLSRC)gxhttile.h $(PSSRC)dstack.h:$(GLSRC)gsparam.h +$(PSSRC)dstack.h:$(GLSRC)gsrefct.h $(PSSRC)dstack.h:$(GLSRC)gp.h -$(PSSRC)dstack.h:$(GLSRC)gsccolor.h +$(PSSRC)dstack.h:$(GLSRC)memento.h +$(PSSRC)dstack.h:$(GLSRC)memory_.h $(PSSRC)dstack.h:$(GLSRC)gsstruct.h $(PSSRC)dstack.h:$(GLSRC)gxsync.h +$(PSSRC)dstack.h:$(GLSRC)gxbitmap.h $(PSSRC)dstack.h:$(GLSRC)srdline.h $(PSSRC)dstack.h:$(GLSRC)scommon.h -$(PSSRC)dstack.h:$(GLSRC)memento.h -$(PSSRC)dstack.h:$(GLSRC)gscsel.h -$(PSSRC)dstack.h:$(GLSRC)gsbitmap.h $(PSSRC)dstack.h:$(GLSRC)gsfname.h -$(PSSRC)dstack.h:$(GLSRC)gsstype.h +$(PSSRC)dstack.h:$(GLSRC)gsbitmap.h +$(PSSRC)dstack.h:$(GLSRC)gsccolor.h +$(PSSRC)dstack.h:$(GLSRC)gxarith.h $(PSSRC)dstack.h:$(GLSRC)stat_.h -$(PSSRC)dstack.h:$(GLSRC)gsmemory.h $(PSSRC)dstack.h:$(GLSRC)gpsync.h -$(PSSRC)dstack.h:$(GLSRC)memory_.h +$(PSSRC)dstack.h:$(GLSRC)gsstype.h +$(PSSRC)dstack.h:$(GLSRC)gsmemory.h $(PSSRC)dstack.h:$(GLSRC)gpgetenv.h -$(PSSRC)dstack.h:$(GLSRC)gslibctx.h $(PSSRC)dstack.h:$(GLSRC)gscdefs.h -$(PSSRC)dstack.h:$(GLSRC)gs_dll_call.h +$(PSSRC)dstack.h:$(GLSRC)gslibctx.h $(PSSRC)dstack.h:$(GLSRC)gsalloc.h -$(PSSRC)dstack.h:$(GLSRC)stdio_.h $(PSSRC)dstack.h:$(GLSRC)gxcindex.h -$(PSSRC)dstack.h:$(GLSRC)gsgstate.h +$(PSSRC)dstack.h:$(GLSRC)stdio_.h $(PSSRC)dstack.h:$(GLSRC)stdint_.h $(PSSRC)dstack.h:$(GLSRC)gssprintf.h -$(PSSRC)dstack.h:$(GLSRC)std.h $(PSSRC)dstack.h:$(GLSRC)gstypes.h +$(PSSRC)dstack.h:$(GLSRC)std.h $(PSSRC)dstack.h:$(GLSRC)stdpre.h $(PSSRC)dstack.h:$(GLGEN)arch.h +$(PSSRC)dstack.h:$(GLSRC)gs_dll_call.h $(PSSRC)estack.h:$(PSSRC)iestack.h $(PSSRC)estack.h:$(PSSRC)icstate.h $(PSSRC)estack.h:$(PSSRC)idsdata.h $(PSSRC)estack.h:$(PSSRC)iesdata.h $(PSSRC)estack.h:$(PSSRC)interp.h -$(PSSRC)estack.h:$(PSSRC)opdef.h $(PSSRC)estack.h:$(PSSRC)files.h +$(PSSRC)estack.h:$(PSSRC)opdef.h $(PSSRC)estack.h:$(PSSRC)iddstack.h $(PSSRC)estack.h:$(PSSRC)istack.h $(PSSRC)estack.h:$(PSSRC)store.h @@ -3978,54 +3978,54 @@ $(PSSRC)estack.h:$(GLSRC)gsnamecl.h $(PSSRC)estack.h:$(GLSRC)stream.h $(PSSRC)estack.h:$(GLSRC)gxcspace.h $(PSSRC)estack.h:$(GLSRC)gxiodev.h +$(PSSRC)estack.h:$(GLSRC)gscsel.h $(PSSRC)estack.h:$(GLSRC)gsdcolor.h $(PSSRC)estack.h:$(GLSRC)gxfrac.h $(PSSRC)estack.h:$(GLSRC)gscms.h -$(PSSRC)estack.h:$(GLSRC)gscspace.h $(PSSRC)estack.h:$(GLSRC)gsdevice.h -$(PSSRC)estack.h:$(GLSRC)gxarith.h -$(PSSRC)estack.h:$(GLSRC)gxhttile.h +$(PSSRC)estack.h:$(GLSRC)gscspace.h +$(PSSRC)estack.h:$(GLSRC)gsgstate.h $(PSSRC)estack.h:$(GLSRC)gsiparam.h -$(PSSRC)estack.h:$(GLSRC)gxbitmap.h $(PSSRC)estack.h:$(GLSRC)gsmatrix.h -$(PSSRC)estack.h:$(GLSRC)gsrefct.h +$(PSSRC)estack.h:$(GLSRC)gxhttile.h $(PSSRC)estack.h:$(GLSRC)gsparam.h +$(PSSRC)estack.h:$(GLSRC)gsrefct.h $(PSSRC)estack.h:$(GLSRC)gp.h -$(PSSRC)estack.h:$(GLSRC)gsccolor.h +$(PSSRC)estack.h:$(GLSRC)memento.h +$(PSSRC)estack.h:$(GLSRC)memory_.h $(PSSRC)estack.h:$(GLSRC)gsstruct.h $(PSSRC)estack.h:$(GLSRC)gxsync.h +$(PSSRC)estack.h:$(GLSRC)gxbitmap.h $(PSSRC)estack.h:$(GLSRC)srdline.h $(PSSRC)estack.h:$(GLSRC)scommon.h -$(PSSRC)estack.h:$(GLSRC)memento.h -$(PSSRC)estack.h:$(GLSRC)gscsel.h -$(PSSRC)estack.h:$(GLSRC)gsbitmap.h $(PSSRC)estack.h:$(GLSRC)gsfname.h -$(PSSRC)estack.h:$(GLSRC)gsstype.h +$(PSSRC)estack.h:$(GLSRC)gsbitmap.h +$(PSSRC)estack.h:$(GLSRC)gsccolor.h +$(PSSRC)estack.h:$(GLSRC)gxarith.h $(PSSRC)estack.h:$(GLSRC)stat_.h -$(PSSRC)estack.h:$(GLSRC)gsmemory.h $(PSSRC)estack.h:$(GLSRC)gpsync.h -$(PSSRC)estack.h:$(GLSRC)memory_.h +$(PSSRC)estack.h:$(GLSRC)gsstype.h +$(PSSRC)estack.h:$(GLSRC)gsmemory.h $(PSSRC)estack.h:$(GLSRC)gpgetenv.h -$(PSSRC)estack.h:$(GLSRC)gslibctx.h $(PSSRC)estack.h:$(GLSRC)gscdefs.h -$(PSSRC)estack.h:$(GLSRC)gs_dll_call.h +$(PSSRC)estack.h:$(GLSRC)gslibctx.h $(PSSRC)estack.h:$(GLSRC)gsalloc.h -$(PSSRC)estack.h:$(GLSRC)stdio_.h $(PSSRC)estack.h:$(GLSRC)gxcindex.h -$(PSSRC)estack.h:$(GLSRC)gsgstate.h +$(PSSRC)estack.h:$(GLSRC)stdio_.h $(PSSRC)estack.h:$(GLSRC)stdint_.h $(PSSRC)estack.h:$(GLSRC)gssprintf.h -$(PSSRC)estack.h:$(GLSRC)std.h $(PSSRC)estack.h:$(GLSRC)gstypes.h +$(PSSRC)estack.h:$(GLSRC)std.h $(PSSRC)estack.h:$(GLSRC)stdpre.h $(PSSRC)estack.h:$(GLGEN)arch.h +$(PSSRC)estack.h:$(GLSRC)gs_dll_call.h $(PSSRC)ostack.h:$(PSSRC)icstate.h $(PSSRC)ostack.h:$(PSSRC)idsdata.h $(PSSRC)ostack.h:$(PSSRC)iesdata.h $(PSSRC)ostack.h:$(PSSRC)iostack.h $(PSSRC)ostack.h:$(PSSRC)interp.h -$(PSSRC)ostack.h:$(PSSRC)opdef.h $(PSSRC)ostack.h:$(PSSRC)files.h +$(PSSRC)ostack.h:$(PSSRC)opdef.h $(PSSRC)ostack.h:$(PSSRC)iddstack.h $(PSSRC)ostack.h:$(PSSRC)istack.h $(PSSRC)ostack.h:$(PSSRC)store.h @@ -4043,55 +4043,55 @@ $(PSSRC)ostack.h:$(GLSRC)gsnamecl.h $(PSSRC)ostack.h:$(GLSRC)stream.h $(PSSRC)ostack.h:$(GLSRC)gxcspace.h $(PSSRC)ostack.h:$(GLSRC)gxiodev.h +$(PSSRC)ostack.h:$(GLSRC)gscsel.h $(PSSRC)ostack.h:$(GLSRC)gsdcolor.h $(PSSRC)ostack.h:$(GLSRC)gxfrac.h $(PSSRC)ostack.h:$(GLSRC)gscms.h -$(PSSRC)ostack.h:$(GLSRC)gscspace.h $(PSSRC)ostack.h:$(GLSRC)gsdevice.h -$(PSSRC)ostack.h:$(GLSRC)gxarith.h -$(PSSRC)ostack.h:$(GLSRC)gxhttile.h +$(PSSRC)ostack.h:$(GLSRC)gscspace.h +$(PSSRC)ostack.h:$(GLSRC)gsgstate.h $(PSSRC)ostack.h:$(GLSRC)gsiparam.h -$(PSSRC)ostack.h:$(GLSRC)gxbitmap.h $(PSSRC)ostack.h:$(GLSRC)gsmatrix.h -$(PSSRC)ostack.h:$(GLSRC)gsrefct.h +$(PSSRC)ostack.h:$(GLSRC)gxhttile.h $(PSSRC)ostack.h:$(GLSRC)gsparam.h +$(PSSRC)ostack.h:$(GLSRC)gsrefct.h $(PSSRC)ostack.h:$(GLSRC)gp.h -$(PSSRC)ostack.h:$(GLSRC)gsccolor.h +$(PSSRC)ostack.h:$(GLSRC)memento.h +$(PSSRC)ostack.h:$(GLSRC)memory_.h $(PSSRC)ostack.h:$(GLSRC)gsstruct.h $(PSSRC)ostack.h:$(GLSRC)gxsync.h +$(PSSRC)ostack.h:$(GLSRC)gxbitmap.h $(PSSRC)ostack.h:$(GLSRC)srdline.h $(PSSRC)ostack.h:$(GLSRC)scommon.h -$(PSSRC)ostack.h:$(GLSRC)memento.h -$(PSSRC)ostack.h:$(GLSRC)gscsel.h -$(PSSRC)ostack.h:$(GLSRC)gsbitmap.h $(PSSRC)ostack.h:$(GLSRC)gsfname.h -$(PSSRC)ostack.h:$(GLSRC)gsstype.h +$(PSSRC)ostack.h:$(GLSRC)gsbitmap.h +$(PSSRC)ostack.h:$(GLSRC)gsccolor.h +$(PSSRC)ostack.h:$(GLSRC)gxarith.h $(PSSRC)ostack.h:$(GLSRC)stat_.h -$(PSSRC)ostack.h:$(GLSRC)gsmemory.h $(PSSRC)ostack.h:$(GLSRC)gpsync.h -$(PSSRC)ostack.h:$(GLSRC)memory_.h +$(PSSRC)ostack.h:$(GLSRC)gsstype.h +$(PSSRC)ostack.h:$(GLSRC)gsmemory.h $(PSSRC)ostack.h:$(GLSRC)gpgetenv.h -$(PSSRC)ostack.h:$(GLSRC)gslibctx.h $(PSSRC)ostack.h:$(GLSRC)gscdefs.h -$(PSSRC)ostack.h:$(GLSRC)gs_dll_call.h +$(PSSRC)ostack.h:$(GLSRC)gslibctx.h $(PSSRC)ostack.h:$(GLSRC)gsalloc.h -$(PSSRC)ostack.h:$(GLSRC)stdio_.h $(PSSRC)ostack.h:$(GLSRC)gxcindex.h -$(PSSRC)ostack.h:$(GLSRC)gsgstate.h +$(PSSRC)ostack.h:$(GLSRC)stdio_.h $(PSSRC)ostack.h:$(GLSRC)stdint_.h $(PSSRC)ostack.h:$(GLSRC)gssprintf.h -$(PSSRC)ostack.h:$(GLSRC)std.h $(PSSRC)ostack.h:$(GLSRC)gstypes.h +$(PSSRC)ostack.h:$(GLSRC)std.h $(PSSRC)ostack.h:$(GLSRC)stdpre.h $(PSSRC)ostack.h:$(GLGEN)arch.h +$(PSSRC)ostack.h:$(GLSRC)gs_dll_call.h $(PSSRC)oper.h:$(PSSRC)ostack.h $(PSSRC)oper.h:$(PSSRC)icstate.h $(PSSRC)oper.h:$(PSSRC)idsdata.h $(PSSRC)oper.h:$(PSSRC)iesdata.h $(PSSRC)oper.h:$(PSSRC)iostack.h $(PSSRC)oper.h:$(PSSRC)interp.h -$(PSSRC)oper.h:$(PSSRC)opdef.h $(PSSRC)oper.h:$(PSSRC)files.h +$(PSSRC)oper.h:$(PSSRC)opdef.h $(PSSRC)oper.h:$(PSSRC)iddstack.h $(PSSRC)oper.h:$(PSSRC)istack.h $(PSSRC)oper.h:$(PSSRC)store.h @@ -4113,87 +4113,87 @@ $(PSSRC)oper.h:$(GLSRC)gsnamecl.h $(PSSRC)oper.h:$(GLSRC)stream.h $(PSSRC)oper.h:$(GLSRC)gxcspace.h $(PSSRC)oper.h:$(GLSRC)gxiodev.h +$(PSSRC)oper.h:$(GLSRC)gscsel.h $(PSSRC)oper.h:$(GLSRC)gsdcolor.h $(PSSRC)oper.h:$(GLSRC)gxfrac.h $(PSSRC)oper.h:$(GLSRC)gscms.h -$(PSSRC)oper.h:$(GLSRC)gscspace.h $(PSSRC)oper.h:$(GLSRC)gsdevice.h -$(PSSRC)oper.h:$(GLSRC)gxarith.h -$(PSSRC)oper.h:$(GLSRC)gxhttile.h +$(PSSRC)oper.h:$(GLSRC)gscspace.h +$(PSSRC)oper.h:$(GLSRC)gsgstate.h $(PSSRC)oper.h:$(GLSRC)gsiparam.h -$(PSSRC)oper.h:$(GLSRC)gxbitmap.h $(PSSRC)oper.h:$(GLSRC)gsmatrix.h -$(PSSRC)oper.h:$(GLSRC)gsrefct.h +$(PSSRC)oper.h:$(GLSRC)gxhttile.h $(PSSRC)oper.h:$(GLSRC)gsparam.h +$(PSSRC)oper.h:$(GLSRC)gsrefct.h $(PSSRC)oper.h:$(GLSRC)gp.h -$(PSSRC)oper.h:$(GLSRC)gsccolor.h +$(PSSRC)oper.h:$(GLSRC)memento.h +$(PSSRC)oper.h:$(GLSRC)memory_.h $(PSSRC)oper.h:$(GLSRC)gsstruct.h $(PSSRC)oper.h:$(GLSRC)gxsync.h -$(PSSRC)oper.h:$(GLSRC)srdline.h $(PSSRC)oper.h:$(GLSRC)gserrors.h +$(PSSRC)oper.h:$(GLSRC)gxbitmap.h +$(PSSRC)oper.h:$(GLSRC)srdline.h $(PSSRC)oper.h:$(GLSRC)scommon.h -$(PSSRC)oper.h:$(GLSRC)memento.h -$(PSSRC)oper.h:$(GLSRC)gscsel.h -$(PSSRC)oper.h:$(GLSRC)gsbitmap.h $(PSSRC)oper.h:$(GLSRC)gsfname.h -$(PSSRC)oper.h:$(GLSRC)gsstype.h +$(PSSRC)oper.h:$(GLSRC)gsbitmap.h +$(PSSRC)oper.h:$(GLSRC)gsccolor.h +$(PSSRC)oper.h:$(GLSRC)gxarith.h $(PSSRC)oper.h:$(GLSRC)stat_.h -$(PSSRC)oper.h:$(GLSRC)gsmemory.h $(PSSRC)oper.h:$(GLSRC)gpsync.h -$(PSSRC)oper.h:$(GLSRC)memory_.h +$(PSSRC)oper.h:$(GLSRC)gsstype.h +$(PSSRC)oper.h:$(GLSRC)gsmemory.h $(PSSRC)oper.h:$(GLSRC)gpgetenv.h -$(PSSRC)oper.h:$(GLSRC)gslibctx.h $(PSSRC)oper.h:$(GLSRC)gscdefs.h -$(PSSRC)oper.h:$(GLSRC)gs_dll_call.h +$(PSSRC)oper.h:$(GLSRC)gslibctx.h $(PSSRC)oper.h:$(GLSRC)gsalloc.h -$(PSSRC)oper.h:$(GLSRC)stdio_.h $(PSSRC)oper.h:$(GLSRC)gxcindex.h -$(PSSRC)oper.h:$(GLSRC)gsgstate.h +$(PSSRC)oper.h:$(GLSRC)stdio_.h $(PSSRC)oper.h:$(GLSRC)stdint_.h $(PSSRC)oper.h:$(GLSRC)gssprintf.h -$(PSSRC)oper.h:$(GLSRC)std.h $(PSSRC)oper.h:$(GLSRC)gstypes.h +$(PSSRC)oper.h:$(GLSRC)std.h $(PSSRC)oper.h:$(GLSRC)stdpre.h $(PSSRC)oper.h:$(GLGEN)arch.h +$(PSSRC)oper.h:$(GLSRC)gs_dll_call.h $(PSSRC)btoken.h:$(PSSRC)iref.h $(PSSRC)btoken.h:$(GLSRC)gxalloc.h $(PSSRC)btoken.h:$(GLSRC)gxobj.h $(PSSRC)btoken.h:$(GLSRC)gsnamecl.h $(PSSRC)btoken.h:$(GLSRC)gxcspace.h +$(PSSRC)btoken.h:$(GLSRC)gscsel.h $(PSSRC)btoken.h:$(GLSRC)gsdcolor.h $(PSSRC)btoken.h:$(GLSRC)gxfrac.h $(PSSRC)btoken.h:$(GLSRC)gscms.h -$(PSSRC)btoken.h:$(GLSRC)gscspace.h $(PSSRC)btoken.h:$(GLSRC)gsdevice.h -$(PSSRC)btoken.h:$(GLSRC)gxarith.h -$(PSSRC)btoken.h:$(GLSRC)gxhttile.h +$(PSSRC)btoken.h:$(GLSRC)gscspace.h +$(PSSRC)btoken.h:$(GLSRC)gsgstate.h $(PSSRC)btoken.h:$(GLSRC)gsiparam.h -$(PSSRC)btoken.h:$(GLSRC)gxbitmap.h $(PSSRC)btoken.h:$(GLSRC)gsmatrix.h -$(PSSRC)btoken.h:$(GLSRC)gsrefct.h +$(PSSRC)btoken.h:$(GLSRC)gxhttile.h $(PSSRC)btoken.h:$(GLSRC)gsparam.h -$(PSSRC)btoken.h:$(GLSRC)gsccolor.h +$(PSSRC)btoken.h:$(GLSRC)gsrefct.h +$(PSSRC)btoken.h:$(GLSRC)memento.h $(PSSRC)btoken.h:$(GLSRC)gsstruct.h $(PSSRC)btoken.h:$(GLSRC)gxsync.h +$(PSSRC)btoken.h:$(GLSRC)gxbitmap.h $(PSSRC)btoken.h:$(GLSRC)scommon.h -$(PSSRC)btoken.h:$(GLSRC)memento.h -$(PSSRC)btoken.h:$(GLSRC)gscsel.h $(PSSRC)btoken.h:$(GLSRC)gsbitmap.h +$(PSSRC)btoken.h:$(GLSRC)gsccolor.h +$(PSSRC)btoken.h:$(GLSRC)gxarith.h +$(PSSRC)btoken.h:$(GLSRC)gpsync.h $(PSSRC)btoken.h:$(GLSRC)gsstype.h $(PSSRC)btoken.h:$(GLSRC)gsmemory.h -$(PSSRC)btoken.h:$(GLSRC)gpsync.h $(PSSRC)btoken.h:$(GLSRC)gslibctx.h -$(PSSRC)btoken.h:$(GLSRC)gs_dll_call.h $(PSSRC)btoken.h:$(GLSRC)gsalloc.h -$(PSSRC)btoken.h:$(GLSRC)stdio_.h $(PSSRC)btoken.h:$(GLSRC)gxcindex.h -$(PSSRC)btoken.h:$(GLSRC)gsgstate.h +$(PSSRC)btoken.h:$(GLSRC)stdio_.h $(PSSRC)btoken.h:$(GLSRC)stdint_.h $(PSSRC)btoken.h:$(GLSRC)gssprintf.h -$(PSSRC)btoken.h:$(GLSRC)std.h $(PSSRC)btoken.h:$(GLSRC)gstypes.h +$(PSSRC)btoken.h:$(GLSRC)std.h $(PSSRC)btoken.h:$(GLSRC)stdpre.h $(PSSRC)btoken.h:$(GLGEN)arch.h +$(PSSRC)btoken.h:$(GLSRC)gs_dll_call.h $(PSSRC)files.h:$(PSSRC)store.h $(PSSRC)files.h:$(PSSRC)ialloc.h $(PSSRC)files.h:$(PSSRC)idosave.h @@ -4207,63 +4207,63 @@ $(PSSRC)files.h:$(GLSRC)gsnamecl.h $(PSSRC)files.h:$(GLSRC)stream.h $(PSSRC)files.h:$(GLSRC)gxcspace.h $(PSSRC)files.h:$(GLSRC)gxiodev.h +$(PSSRC)files.h:$(GLSRC)gscsel.h $(PSSRC)files.h:$(GLSRC)gsdcolor.h $(PSSRC)files.h:$(GLSRC)gxfrac.h $(PSSRC)files.h:$(GLSRC)gscms.h -$(PSSRC)files.h:$(GLSRC)gscspace.h $(PSSRC)files.h:$(GLSRC)gsdevice.h -$(PSSRC)files.h:$(GLSRC)gxarith.h -$(PSSRC)files.h:$(GLSRC)gxhttile.h +$(PSSRC)files.h:$(GLSRC)gscspace.h +$(PSSRC)files.h:$(GLSRC)gsgstate.h $(PSSRC)files.h:$(GLSRC)gsiparam.h -$(PSSRC)files.h:$(GLSRC)gxbitmap.h $(PSSRC)files.h:$(GLSRC)gsmatrix.h -$(PSSRC)files.h:$(GLSRC)gsrefct.h +$(PSSRC)files.h:$(GLSRC)gxhttile.h $(PSSRC)files.h:$(GLSRC)gsparam.h +$(PSSRC)files.h:$(GLSRC)gsrefct.h $(PSSRC)files.h:$(GLSRC)gp.h -$(PSSRC)files.h:$(GLSRC)gsccolor.h +$(PSSRC)files.h:$(GLSRC)memento.h +$(PSSRC)files.h:$(GLSRC)memory_.h $(PSSRC)files.h:$(GLSRC)gsstruct.h $(PSSRC)files.h:$(GLSRC)gxsync.h +$(PSSRC)files.h:$(GLSRC)gxbitmap.h $(PSSRC)files.h:$(GLSRC)srdline.h $(PSSRC)files.h:$(GLSRC)scommon.h -$(PSSRC)files.h:$(GLSRC)memento.h -$(PSSRC)files.h:$(GLSRC)gscsel.h -$(PSSRC)files.h:$(GLSRC)gsbitmap.h $(PSSRC)files.h:$(GLSRC)gsfname.h -$(PSSRC)files.h:$(GLSRC)gsstype.h +$(PSSRC)files.h:$(GLSRC)gsbitmap.h +$(PSSRC)files.h:$(GLSRC)gsccolor.h +$(PSSRC)files.h:$(GLSRC)gxarith.h $(PSSRC)files.h:$(GLSRC)stat_.h -$(PSSRC)files.h:$(GLSRC)gsmemory.h $(PSSRC)files.h:$(GLSRC)gpsync.h -$(PSSRC)files.h:$(GLSRC)memory_.h +$(PSSRC)files.h:$(GLSRC)gsstype.h +$(PSSRC)files.h:$(GLSRC)gsmemory.h $(PSSRC)files.h:$(GLSRC)gpgetenv.h -$(PSSRC)files.h:$(GLSRC)gslibctx.h $(PSSRC)files.h:$(GLSRC)gscdefs.h -$(PSSRC)files.h:$(GLSRC)gs_dll_call.h +$(PSSRC)files.h:$(GLSRC)gslibctx.h $(PSSRC)files.h:$(GLSRC)gsalloc.h -$(PSSRC)files.h:$(GLSRC)stdio_.h $(PSSRC)files.h:$(GLSRC)gxcindex.h -$(PSSRC)files.h:$(GLSRC)gsgstate.h +$(PSSRC)files.h:$(GLSRC)stdio_.h $(PSSRC)files.h:$(GLSRC)stdint_.h $(PSSRC)files.h:$(GLSRC)gssprintf.h -$(PSSRC)files.h:$(GLSRC)std.h $(PSSRC)files.h:$(GLSRC)gstypes.h +$(PSSRC)files.h:$(GLSRC)std.h $(PSSRC)files.h:$(GLSRC)stdpre.h $(PSSRC)files.h:$(GLGEN)arch.h +$(PSSRC)files.h:$(GLSRC)gs_dll_call.h $(PSSRC)psapi.h:$(GLSRC)gsdevice.h +$(PSSRC)psapi.h:$(GLSRC)gsgstate.h $(PSSRC)psapi.h:$(GLSRC)gsmatrix.h $(PSSRC)psapi.h:$(GLSRC)gsparam.h $(PSSRC)psapi.h:$(GLSRC)scommon.h $(PSSRC)psapi.h:$(GLSRC)gsstype.h $(PSSRC)psapi.h:$(GLSRC)gsmemory.h $(PSSRC)psapi.h:$(GLSRC)gslibctx.h -$(PSSRC)psapi.h:$(GLSRC)gs_dll_call.h $(PSSRC)psapi.h:$(GLSRC)stdio_.h -$(PSSRC)psapi.h:$(GLSRC)gsgstate.h $(PSSRC)psapi.h:$(GLSRC)stdint_.h $(PSSRC)psapi.h:$(GLSRC)gssprintf.h -$(PSSRC)psapi.h:$(GLSRC)std.h $(PSSRC)psapi.h:$(GLSRC)gstypes.h +$(PSSRC)psapi.h:$(GLSRC)std.h $(PSSRC)psapi.h:$(GLSRC)stdpre.h $(PSSRC)psapi.h:$(GLGEN)arch.h +$(PSSRC)psapi.h:$(GLSRC)gs_dll_call.h $(PSSRC)ichar.h:$(PSSRC)iostack.h $(PSSRC)ichar.h:$(PSSRC)istack.h $(PSSRC)ichar.h:$(PSSRC)iosdata.h @@ -4274,297 +4274,297 @@ $(PSSRC)ichar.h:$(PSSRC)ivmspace.h $(PSSRC)ichar.h:$(PSSRC)iref.h $(PSSRC)ichar.h:$(GLSRC)gsgc.h $(PSSRC)ichar.h:$(GLSRC)gxalloc.h -$(PSSRC)ichar.h:$(GLSRC)gstext.h $(PSSRC)ichar.h:$(GLSRC)gxobj.h +$(PSSRC)ichar.h:$(GLSRC)gstext.h $(PSSRC)ichar.h:$(GLSRC)gsnamecl.h $(PSSRC)ichar.h:$(GLSRC)gxcspace.h -$(PSSRC)ichar.h:$(GLSRC)gsdcolor.h +$(PSSRC)ichar.h:$(GLSRC)gscsel.h $(PSSRC)ichar.h:$(GLSRC)gsfont.h +$(PSSRC)ichar.h:$(GLSRC)gsdcolor.h +$(PSSRC)ichar.h:$(GLSRC)gxpath.h $(PSSRC)ichar.h:$(GLSRC)gxfrac.h $(PSSRC)ichar.h:$(GLSRC)gscms.h -$(PSSRC)ichar.h:$(GLSRC)gscspace.h -$(PSSRC)ichar.h:$(GLSRC)gxpath.h -$(PSSRC)ichar.h:$(GLSRC)gsdevice.h -$(PSSRC)ichar.h:$(GLSRC)gxarith.h -$(PSSRC)ichar.h:$(GLSRC)gspenum.h -$(PSSRC)ichar.h:$(GLSRC)gxhttile.h $(PSSRC)ichar.h:$(GLSRC)gsrect.h $(PSSRC)ichar.h:$(GLSRC)gslparam.h -$(PSSRC)ichar.h:$(GLSRC)gsiparam.h -$(PSSRC)ichar.h:$(GLSRC)gxbitmap.h -$(PSSRC)ichar.h:$(GLSRC)gsmatrix.h +$(PSSRC)ichar.h:$(GLSRC)gsdevice.h $(PSSRC)ichar.h:$(GLSRC)gscpm.h +$(PSSRC)ichar.h:$(GLSRC)gscspace.h +$(PSSRC)ichar.h:$(GLSRC)gsgstate.h +$(PSSRC)ichar.h:$(GLSRC)gsiparam.h $(PSSRC)ichar.h:$(GLSRC)gxfixed.h -$(PSSRC)ichar.h:$(GLSRC)gsrefct.h +$(PSSRC)ichar.h:$(GLSRC)gsmatrix.h +$(PSSRC)ichar.h:$(GLSRC)gspenum.h +$(PSSRC)ichar.h:$(GLSRC)gxhttile.h $(PSSRC)ichar.h:$(GLSRC)gsparam.h -$(PSSRC)ichar.h:$(GLSRC)gsccolor.h +$(PSSRC)ichar.h:$(GLSRC)gsrefct.h +$(PSSRC)ichar.h:$(GLSRC)memento.h $(PSSRC)ichar.h:$(GLSRC)gsstruct.h $(PSSRC)ichar.h:$(GLSRC)gxsync.h +$(PSSRC)ichar.h:$(GLSRC)gxbitmap.h $(PSSRC)ichar.h:$(GLSRC)scommon.h -$(PSSRC)ichar.h:$(GLSRC)memento.h -$(PSSRC)ichar.h:$(GLSRC)gscsel.h $(PSSRC)ichar.h:$(GLSRC)gsbitmap.h +$(PSSRC)ichar.h:$(GLSRC)gsccolor.h +$(PSSRC)ichar.h:$(GLSRC)gxarith.h +$(PSSRC)ichar.h:$(GLSRC)gpsync.h $(PSSRC)ichar.h:$(GLSRC)gsstype.h $(PSSRC)ichar.h:$(GLSRC)gsmemory.h -$(PSSRC)ichar.h:$(GLSRC)gpsync.h $(PSSRC)ichar.h:$(GLSRC)gslibctx.h -$(PSSRC)ichar.h:$(GLSRC)gs_dll_call.h $(PSSRC)ichar.h:$(GLSRC)gsalloc.h -$(PSSRC)ichar.h:$(GLSRC)stdio_.h $(PSSRC)ichar.h:$(GLSRC)gxcindex.h -$(PSSRC)ichar.h:$(GLSRC)gsgstate.h +$(PSSRC)ichar.h:$(GLSRC)stdio_.h +$(PSSRC)ichar.h:$(GLSRC)gsccode.h $(PSSRC)ichar.h:$(GLSRC)stdint_.h $(PSSRC)ichar.h:$(GLSRC)gssprintf.h -$(PSSRC)ichar.h:$(GLSRC)gsccode.h -$(PSSRC)ichar.h:$(GLSRC)std.h $(PSSRC)ichar.h:$(GLSRC)gstypes.h +$(PSSRC)ichar.h:$(GLSRC)std.h $(PSSRC)ichar.h:$(GLSRC)stdpre.h $(PSSRC)ichar.h:$(GLGEN)arch.h +$(PSSRC)ichar.h:$(GLSRC)gs_dll_call.h $(PSSRC)ichar1.h:$(GLSRC)gstype1.h $(PSSRC)ichar1.h:$(GLSRC)gxfont.h $(PSSRC)ichar1.h:$(GLSRC)gspath.h -$(PSSRC)ichar1.h:$(GLSRC)gxmatrix.h $(PSSRC)ichar1.h:$(GLSRC)gsgdata.h -$(PSSRC)ichar1.h:$(GLSRC)gsgcache.h +$(PSSRC)ichar1.h:$(GLSRC)gxmatrix.h $(PSSRC)ichar1.h:$(GLSRC)gxfapi.h -$(PSSRC)ichar1.h:$(GLSRC)gsnotify.h $(PSSRC)ichar1.h:$(GLSRC)gsfcmap.h $(PSSRC)ichar1.h:$(PSSRC)iref.h $(PSSRC)ichar1.h:$(GLSRC)gxalloc.h -$(PSSRC)ichar1.h:$(GLSRC)gstext.h $(PSSRC)ichar1.h:$(GLSRC)gxobj.h +$(PSSRC)ichar1.h:$(GLSRC)gstext.h $(PSSRC)ichar1.h:$(GLSRC)gsnamecl.h $(PSSRC)ichar1.h:$(GLSRC)gxcspace.h -$(PSSRC)ichar1.h:$(GLSRC)gsuid.h -$(PSSRC)ichar1.h:$(GLSRC)gsdcolor.h +$(PSSRC)ichar1.h:$(GLSRC)gscsel.h $(PSSRC)ichar1.h:$(GLSRC)gsfont.h -$(PSSRC)ichar1.h:$(GLSRC)gxftype.h +$(PSSRC)ichar1.h:$(GLSRC)gsdcolor.h +$(PSSRC)ichar1.h:$(GLSRC)gxpath.h $(PSSRC)ichar1.h:$(GLSRC)gxfrac.h +$(PSSRC)ichar1.h:$(GLSRC)gxftype.h $(PSSRC)ichar1.h:$(GLSRC)gscms.h -$(PSSRC)ichar1.h:$(GLSRC)gscspace.h -$(PSSRC)ichar1.h:$(GLSRC)gxpath.h -$(PSSRC)ichar1.h:$(GLSRC)gsdevice.h -$(PSSRC)ichar1.h:$(GLSRC)gxarith.h -$(PSSRC)ichar1.h:$(GLSRC)gspenum.h -$(PSSRC)ichar1.h:$(GLSRC)gxhttile.h $(PSSRC)ichar1.h:$(GLSRC)gsrect.h $(PSSRC)ichar1.h:$(GLSRC)gslparam.h -$(PSSRC)ichar1.h:$(GLSRC)gsiparam.h -$(PSSRC)ichar1.h:$(GLSRC)gxbitmap.h -$(PSSRC)ichar1.h:$(GLSRC)gsmatrix.h +$(PSSRC)ichar1.h:$(GLSRC)gsdevice.h $(PSSRC)ichar1.h:$(GLSRC)gscpm.h +$(PSSRC)ichar1.h:$(GLSRC)gsgcache.h +$(PSSRC)ichar1.h:$(GLSRC)gscspace.h +$(PSSRC)ichar1.h:$(GLSRC)gsgstate.h +$(PSSRC)ichar1.h:$(GLSRC)gsnotify.h +$(PSSRC)ichar1.h:$(GLSRC)gsiparam.h $(PSSRC)ichar1.h:$(GLSRC)gxfixed.h -$(PSSRC)ichar1.h:$(GLSRC)gsrefct.h +$(PSSRC)ichar1.h:$(GLSRC)gsmatrix.h +$(PSSRC)ichar1.h:$(GLSRC)gspenum.h +$(PSSRC)ichar1.h:$(GLSRC)gxhttile.h $(PSSRC)ichar1.h:$(GLSRC)gsparam.h -$(PSSRC)ichar1.h:$(GLSRC)gsccolor.h +$(PSSRC)ichar1.h:$(GLSRC)gsrefct.h +$(PSSRC)ichar1.h:$(GLSRC)memento.h +$(PSSRC)ichar1.h:$(GLSRC)gsuid.h $(PSSRC)ichar1.h:$(GLSRC)gsstruct.h $(PSSRC)ichar1.h:$(GLSRC)gxsync.h +$(PSSRC)ichar1.h:$(GLSRC)gxbitmap.h $(PSSRC)ichar1.h:$(GLSRC)scommon.h -$(PSSRC)ichar1.h:$(GLSRC)memento.h -$(PSSRC)ichar1.h:$(GLSRC)gscsel.h $(PSSRC)ichar1.h:$(GLSRC)gsbitmap.h +$(PSSRC)ichar1.h:$(GLSRC)gsccolor.h +$(PSSRC)ichar1.h:$(GLSRC)gxarith.h +$(PSSRC)ichar1.h:$(GLSRC)gpsync.h $(PSSRC)ichar1.h:$(GLSRC)gsstype.h $(PSSRC)ichar1.h:$(GLSRC)gsmemory.h -$(PSSRC)ichar1.h:$(GLSRC)gpsync.h $(PSSRC)ichar1.h:$(GLSRC)gslibctx.h -$(PSSRC)ichar1.h:$(GLSRC)gs_dll_call.h $(PSSRC)ichar1.h:$(GLSRC)gsalloc.h -$(PSSRC)ichar1.h:$(GLSRC)stdio_.h $(PSSRC)ichar1.h:$(GLSRC)gxcindex.h -$(PSSRC)ichar1.h:$(GLSRC)gsgstate.h +$(PSSRC)ichar1.h:$(GLSRC)stdio_.h +$(PSSRC)ichar1.h:$(GLSRC)gsccode.h $(PSSRC)ichar1.h:$(GLSRC)stdint_.h $(PSSRC)ichar1.h:$(GLSRC)gssprintf.h -$(PSSRC)ichar1.h:$(GLSRC)gsccode.h -$(PSSRC)ichar1.h:$(GLSRC)std.h $(PSSRC)ichar1.h:$(GLSRC)gstypes.h +$(PSSRC)ichar1.h:$(GLSRC)std.h $(PSSRC)ichar1.h:$(GLSRC)stdpre.h $(PSSRC)ichar1.h:$(GLGEN)arch.h +$(PSSRC)ichar1.h:$(GLSRC)gs_dll_call.h $(PSSRC)icharout.h:$(GLSRC)gsgdata.h -$(PSSRC)icharout.h:$(GLSRC)gsgcache.h $(PSSRC)icharout.h:$(GLSRC)gxfapi.h $(PSSRC)icharout.h:$(PSSRC)iref.h $(PSSRC)icharout.h:$(GLSRC)gxalloc.h -$(PSSRC)icharout.h:$(GLSRC)gstext.h $(PSSRC)icharout.h:$(GLSRC)gxobj.h +$(PSSRC)icharout.h:$(GLSRC)gstext.h $(PSSRC)icharout.h:$(GLSRC)gsnamecl.h $(PSSRC)icharout.h:$(GLSRC)gxcspace.h -$(PSSRC)icharout.h:$(GLSRC)gsdcolor.h +$(PSSRC)icharout.h:$(GLSRC)gscsel.h $(PSSRC)icharout.h:$(GLSRC)gsfont.h +$(PSSRC)icharout.h:$(GLSRC)gsdcolor.h +$(PSSRC)icharout.h:$(GLSRC)gxpath.h $(PSSRC)icharout.h:$(GLSRC)gxfrac.h $(PSSRC)icharout.h:$(GLSRC)gscms.h -$(PSSRC)icharout.h:$(GLSRC)gscspace.h -$(PSSRC)icharout.h:$(GLSRC)gxpath.h -$(PSSRC)icharout.h:$(GLSRC)gsdevice.h -$(PSSRC)icharout.h:$(GLSRC)gxarith.h -$(PSSRC)icharout.h:$(GLSRC)gspenum.h -$(PSSRC)icharout.h:$(GLSRC)gxhttile.h $(PSSRC)icharout.h:$(GLSRC)gsrect.h $(PSSRC)icharout.h:$(GLSRC)gslparam.h -$(PSSRC)icharout.h:$(GLSRC)gsiparam.h -$(PSSRC)icharout.h:$(GLSRC)gxbitmap.h -$(PSSRC)icharout.h:$(GLSRC)gsmatrix.h +$(PSSRC)icharout.h:$(GLSRC)gsdevice.h $(PSSRC)icharout.h:$(GLSRC)gscpm.h +$(PSSRC)icharout.h:$(GLSRC)gsgcache.h +$(PSSRC)icharout.h:$(GLSRC)gscspace.h +$(PSSRC)icharout.h:$(GLSRC)gsgstate.h +$(PSSRC)icharout.h:$(GLSRC)gsiparam.h $(PSSRC)icharout.h:$(GLSRC)gxfixed.h -$(PSSRC)icharout.h:$(GLSRC)gsrefct.h +$(PSSRC)icharout.h:$(GLSRC)gsmatrix.h +$(PSSRC)icharout.h:$(GLSRC)gspenum.h +$(PSSRC)icharout.h:$(GLSRC)gxhttile.h $(PSSRC)icharout.h:$(GLSRC)gsparam.h -$(PSSRC)icharout.h:$(GLSRC)gsccolor.h +$(PSSRC)icharout.h:$(GLSRC)gsrefct.h +$(PSSRC)icharout.h:$(GLSRC)memento.h $(PSSRC)icharout.h:$(GLSRC)gsstruct.h $(PSSRC)icharout.h:$(GLSRC)gxsync.h +$(PSSRC)icharout.h:$(GLSRC)gxbitmap.h $(PSSRC)icharout.h:$(GLSRC)scommon.h -$(PSSRC)icharout.h:$(GLSRC)memento.h -$(PSSRC)icharout.h:$(GLSRC)gscsel.h $(PSSRC)icharout.h:$(GLSRC)gsbitmap.h +$(PSSRC)icharout.h:$(GLSRC)gsccolor.h +$(PSSRC)icharout.h:$(GLSRC)gxarith.h +$(PSSRC)icharout.h:$(GLSRC)gpsync.h $(PSSRC)icharout.h:$(GLSRC)gsstype.h $(PSSRC)icharout.h:$(GLSRC)gsmemory.h -$(PSSRC)icharout.h:$(GLSRC)gpsync.h $(PSSRC)icharout.h:$(GLSRC)gslibctx.h -$(PSSRC)icharout.h:$(GLSRC)gs_dll_call.h $(PSSRC)icharout.h:$(GLSRC)gsalloc.h -$(PSSRC)icharout.h:$(GLSRC)stdio_.h $(PSSRC)icharout.h:$(GLSRC)gxcindex.h -$(PSSRC)icharout.h:$(GLSRC)gsgstate.h +$(PSSRC)icharout.h:$(GLSRC)stdio_.h +$(PSSRC)icharout.h:$(GLSRC)gsccode.h $(PSSRC)icharout.h:$(GLSRC)stdint_.h $(PSSRC)icharout.h:$(GLSRC)gssprintf.h -$(PSSRC)icharout.h:$(GLSRC)gsccode.h -$(PSSRC)icharout.h:$(GLSRC)std.h $(PSSRC)icharout.h:$(GLSRC)gstypes.h +$(PSSRC)icharout.h:$(GLSRC)std.h $(PSSRC)icharout.h:$(GLSRC)stdpre.h $(PSSRC)icharout.h:$(GLGEN)arch.h +$(PSSRC)icharout.h:$(GLSRC)gs_dll_call.h $(PSSRC)icolor.h:$(PSSRC)iref.h $(PSSRC)icolor.h:$(GLSRC)gxalloc.h $(PSSRC)icolor.h:$(GLSRC)gxobj.h $(PSSRC)icolor.h:$(GLSRC)gsnamecl.h $(PSSRC)icolor.h:$(GLSRC)gxcspace.h +$(PSSRC)icolor.h:$(GLSRC)gscsel.h $(PSSRC)icolor.h:$(GLSRC)gsdcolor.h $(PSSRC)icolor.h:$(GLSRC)gxfrac.h +$(PSSRC)icolor.h:$(GLSRC)gxtmap.h $(PSSRC)icolor.h:$(GLSRC)gscms.h -$(PSSRC)icolor.h:$(GLSRC)gscspace.h $(PSSRC)icolor.h:$(GLSRC)gsdevice.h -$(PSSRC)icolor.h:$(GLSRC)gxarith.h -$(PSSRC)icolor.h:$(GLSRC)gxhttile.h +$(PSSRC)icolor.h:$(GLSRC)gscspace.h +$(PSSRC)icolor.h:$(GLSRC)gsgstate.h $(PSSRC)icolor.h:$(GLSRC)gsiparam.h -$(PSSRC)icolor.h:$(GLSRC)gxbitmap.h $(PSSRC)icolor.h:$(GLSRC)gsmatrix.h -$(PSSRC)icolor.h:$(GLSRC)gsrefct.h +$(PSSRC)icolor.h:$(GLSRC)gxhttile.h $(PSSRC)icolor.h:$(GLSRC)gsparam.h -$(PSSRC)icolor.h:$(GLSRC)gsccolor.h +$(PSSRC)icolor.h:$(GLSRC)gsrefct.h +$(PSSRC)icolor.h:$(GLSRC)memento.h $(PSSRC)icolor.h:$(GLSRC)gsstruct.h $(PSSRC)icolor.h:$(GLSRC)gxsync.h +$(PSSRC)icolor.h:$(GLSRC)gxbitmap.h $(PSSRC)icolor.h:$(GLSRC)scommon.h -$(PSSRC)icolor.h:$(GLSRC)memento.h -$(PSSRC)icolor.h:$(GLSRC)gscsel.h $(PSSRC)icolor.h:$(GLSRC)gsbitmap.h +$(PSSRC)icolor.h:$(GLSRC)gsccolor.h +$(PSSRC)icolor.h:$(GLSRC)gxarith.h +$(PSSRC)icolor.h:$(GLSRC)gpsync.h $(PSSRC)icolor.h:$(GLSRC)gsstype.h -$(PSSRC)icolor.h:$(GLSRC)gxtmap.h $(PSSRC)icolor.h:$(GLSRC)gsmemory.h -$(PSSRC)icolor.h:$(GLSRC)gpsync.h $(PSSRC)icolor.h:$(GLSRC)gslibctx.h -$(PSSRC)icolor.h:$(GLSRC)gs_dll_call.h $(PSSRC)icolor.h:$(GLSRC)gsalloc.h -$(PSSRC)icolor.h:$(GLSRC)stdio_.h $(PSSRC)icolor.h:$(GLSRC)gxcindex.h -$(PSSRC)icolor.h:$(GLSRC)gsgstate.h +$(PSSRC)icolor.h:$(GLSRC)stdio_.h $(PSSRC)icolor.h:$(GLSRC)stdint_.h $(PSSRC)icolor.h:$(GLSRC)gssprintf.h -$(PSSRC)icolor.h:$(GLSRC)std.h $(PSSRC)icolor.h:$(GLSRC)gstypes.h +$(PSSRC)icolor.h:$(GLSRC)std.h $(PSSRC)icolor.h:$(GLSRC)stdpre.h $(PSSRC)icolor.h:$(GLGEN)arch.h +$(PSSRC)icolor.h:$(GLSRC)gs_dll_call.h $(PSSRC)icremap.h:$(PSSRC)igstate.h $(PSSRC)icremap.h:$(GLSRC)gsstate.h $(PSSRC)icremap.h:$(GLSRC)gsovrc.h $(PSSRC)icremap.h:$(GLSRC)gscolor.h -$(PSSRC)icremap.h:$(GLSRC)gxcomp.h $(PSSRC)icremap.h:$(GLSRC)gsline.h +$(PSSRC)icremap.h:$(GLSRC)gxcomp.h $(PSSRC)icremap.h:$(PSSRC)istruct.h -$(PSSRC)icremap.h:$(GLSRC)gxbitfmt.h $(PSSRC)icremap.h:$(PSSRC)imemory.h -$(PSSRC)icremap.h:$(PSSRC)ivmspace.h $(PSSRC)icremap.h:$(GLSRC)gsht.h +$(PSSRC)icremap.h:$(PSSRC)ivmspace.h $(PSSRC)icremap.h:$(PSSRC)iref.h $(PSSRC)icremap.h:$(GLSRC)gsgc.h $(PSSRC)icremap.h:$(GLSRC)gxalloc.h $(PSSRC)icremap.h:$(GLSRC)gxobj.h -$(PSSRC)icremap.h:$(GLSRC)gsnamecl.h $(PSSRC)icremap.h:$(GLSRC)gxstate.h +$(PSSRC)icremap.h:$(GLSRC)gsnamecl.h $(PSSRC)icremap.h:$(GLSRC)gxcspace.h +$(PSSRC)icremap.h:$(GLSRC)gscsel.h $(PSSRC)icremap.h:$(GLSRC)gsdcolor.h $(PSSRC)icremap.h:$(GLSRC)gxfrac.h +$(PSSRC)icremap.h:$(GLSRC)gxtmap.h $(PSSRC)icremap.h:$(GLSRC)gscms.h -$(PSSRC)icremap.h:$(GLSRC)gscspace.h -$(PSSRC)icremap.h:$(GLSRC)gsdevice.h -$(PSSRC)icremap.h:$(GLSRC)gxarith.h -$(PSSRC)icremap.h:$(GLSRC)gxhttile.h $(PSSRC)icremap.h:$(GLSRC)gslparam.h +$(PSSRC)icremap.h:$(GLSRC)gsdevice.h +$(PSSRC)icremap.h:$(GLSRC)gxbitfmt.h +$(PSSRC)icremap.h:$(GLSRC)gscpm.h +$(PSSRC)icremap.h:$(GLSRC)gscspace.h +$(PSSRC)icremap.h:$(GLSRC)gsgstate.h $(PSSRC)icremap.h:$(GLSRC)gsiparam.h -$(PSSRC)icremap.h:$(GLSRC)gxbitmap.h +$(PSSRC)icremap.h:$(GLSRC)gscompt.h $(PSSRC)icremap.h:$(GLSRC)gsmatrix.h -$(PSSRC)icremap.h:$(GLSRC)gscpm.h -$(PSSRC)icremap.h:$(GLSRC)gsrefct.h +$(PSSRC)icremap.h:$(GLSRC)gxhttile.h $(PSSRC)icremap.h:$(GLSRC)gsparam.h -$(PSSRC)icremap.h:$(GLSRC)gsccolor.h +$(PSSRC)icremap.h:$(GLSRC)gsrefct.h +$(PSSRC)icremap.h:$(GLSRC)memento.h $(PSSRC)icremap.h:$(GLSRC)gsstruct.h $(PSSRC)icremap.h:$(GLSRC)gxsync.h +$(PSSRC)icremap.h:$(GLSRC)gxbitmap.h $(PSSRC)icremap.h:$(GLSRC)scommon.h -$(PSSRC)icremap.h:$(GLSRC)memento.h -$(PSSRC)icremap.h:$(GLSRC)gscsel.h $(PSSRC)icremap.h:$(GLSRC)gsbitmap.h +$(PSSRC)icremap.h:$(GLSRC)gsccolor.h +$(PSSRC)icremap.h:$(GLSRC)gxarith.h +$(PSSRC)icremap.h:$(GLSRC)gpsync.h $(PSSRC)icremap.h:$(GLSRC)gsstype.h -$(PSSRC)icremap.h:$(GLSRC)gxtmap.h $(PSSRC)icremap.h:$(GLSRC)gsmemory.h -$(PSSRC)icremap.h:$(GLSRC)gpsync.h $(PSSRC)icremap.h:$(GLSRC)gslibctx.h -$(PSSRC)icremap.h:$(GLSRC)gs_dll_call.h $(PSSRC)icremap.h:$(GLSRC)gsalloc.h -$(PSSRC)icremap.h:$(GLSRC)stdio_.h -$(PSSRC)icremap.h:$(GLSRC)gscompt.h $(PSSRC)icremap.h:$(GLSRC)gxcindex.h -$(PSSRC)icremap.h:$(GLSRC)gsgstate.h +$(PSSRC)icremap.h:$(GLSRC)stdio_.h $(PSSRC)icremap.h:$(GLSRC)stdint_.h $(PSSRC)icremap.h:$(GLSRC)gssprintf.h -$(PSSRC)icremap.h:$(GLSRC)std.h $(PSSRC)icremap.h:$(GLSRC)gstypes.h +$(PSSRC)icremap.h:$(GLSRC)std.h $(PSSRC)icremap.h:$(GLSRC)stdpre.h $(PSSRC)icremap.h:$(GLGEN)arch.h +$(PSSRC)icremap.h:$(GLSRC)gs_dll_call.h $(PSSRC)icsmap.h:$(PSSRC)iref.h $(PSSRC)icsmap.h:$(GLSRC)gxalloc.h $(PSSRC)icsmap.h:$(GLSRC)gxobj.h $(PSSRC)icsmap.h:$(GLSRC)gsnamecl.h $(PSSRC)icsmap.h:$(GLSRC)gxcspace.h +$(PSSRC)icsmap.h:$(GLSRC)gscsel.h $(PSSRC)icsmap.h:$(GLSRC)gsdcolor.h $(PSSRC)icsmap.h:$(GLSRC)gxfrac.h $(PSSRC)icsmap.h:$(GLSRC)gscms.h -$(PSSRC)icsmap.h:$(GLSRC)gscspace.h $(PSSRC)icsmap.h:$(GLSRC)gsdevice.h -$(PSSRC)icsmap.h:$(GLSRC)gxarith.h -$(PSSRC)icsmap.h:$(GLSRC)gxhttile.h +$(PSSRC)icsmap.h:$(GLSRC)gscspace.h +$(PSSRC)icsmap.h:$(GLSRC)gsgstate.h $(PSSRC)icsmap.h:$(GLSRC)gsiparam.h -$(PSSRC)icsmap.h:$(GLSRC)gxbitmap.h $(PSSRC)icsmap.h:$(GLSRC)gsmatrix.h -$(PSSRC)icsmap.h:$(GLSRC)gsrefct.h +$(PSSRC)icsmap.h:$(GLSRC)gxhttile.h $(PSSRC)icsmap.h:$(GLSRC)gsparam.h -$(PSSRC)icsmap.h:$(GLSRC)gsccolor.h +$(PSSRC)icsmap.h:$(GLSRC)gsrefct.h +$(PSSRC)icsmap.h:$(GLSRC)memento.h $(PSSRC)icsmap.h:$(GLSRC)gsstruct.h $(PSSRC)icsmap.h:$(GLSRC)gxsync.h +$(PSSRC)icsmap.h:$(GLSRC)gxbitmap.h $(PSSRC)icsmap.h:$(GLSRC)scommon.h -$(PSSRC)icsmap.h:$(GLSRC)memento.h -$(PSSRC)icsmap.h:$(GLSRC)gscsel.h $(PSSRC)icsmap.h:$(GLSRC)gsbitmap.h +$(PSSRC)icsmap.h:$(GLSRC)gsccolor.h +$(PSSRC)icsmap.h:$(GLSRC)gxarith.h +$(PSSRC)icsmap.h:$(GLSRC)gpsync.h $(PSSRC)icsmap.h:$(GLSRC)gsstype.h $(PSSRC)icsmap.h:$(GLSRC)gsmemory.h -$(PSSRC)icsmap.h:$(GLSRC)gpsync.h $(PSSRC)icsmap.h:$(GLSRC)gslibctx.h -$(PSSRC)icsmap.h:$(GLSRC)gs_dll_call.h $(PSSRC)icsmap.h:$(GLSRC)gsalloc.h -$(PSSRC)icsmap.h:$(GLSRC)stdio_.h $(PSSRC)icsmap.h:$(GLSRC)gxcindex.h -$(PSSRC)icsmap.h:$(GLSRC)gsgstate.h +$(PSSRC)icsmap.h:$(GLSRC)stdio_.h $(PSSRC)icsmap.h:$(GLSRC)stdint_.h $(PSSRC)icsmap.h:$(GLSRC)gssprintf.h -$(PSSRC)icsmap.h:$(GLSRC)std.h $(PSSRC)icsmap.h:$(GLSRC)gstypes.h +$(PSSRC)icsmap.h:$(GLSRC)std.h $(PSSRC)icsmap.h:$(GLSRC)stdpre.h $(PSSRC)icsmap.h:$(GLGEN)arch.h +$(PSSRC)icsmap.h:$(GLSRC)gs_dll_call.h $(PSSRC)idisp.h:$(PSSRC)imain.h $(PSSRC)idisp.h:$(GLSRC)gsexit.h $(PSSRC)idisp.h:$(PSSRC)iref.h @@ -4572,48 +4572,48 @@ $(PSSRC)idisp.h:$(GLSRC)gxalloc.h $(PSSRC)idisp.h:$(GLSRC)gxobj.h $(PSSRC)idisp.h:$(GLSRC)gsnamecl.h $(PSSRC)idisp.h:$(GLSRC)gxcspace.h +$(PSSRC)idisp.h:$(GLSRC)gscsel.h $(PSSRC)idisp.h:$(GLSRC)gsdcolor.h $(PSSRC)idisp.h:$(GLSRC)gxfrac.h $(PSSRC)idisp.h:$(GLSRC)gscms.h -$(PSSRC)idisp.h:$(GLSRC)gscspace.h $(PSSRC)idisp.h:$(GLSRC)gsdevice.h -$(PSSRC)idisp.h:$(GLSRC)gxarith.h -$(PSSRC)idisp.h:$(GLSRC)gxhttile.h +$(PSSRC)idisp.h:$(GLSRC)gscspace.h +$(PSSRC)idisp.h:$(GLSRC)gsgstate.h $(PSSRC)idisp.h:$(GLSRC)gsiparam.h -$(PSSRC)idisp.h:$(GLSRC)gxbitmap.h $(PSSRC)idisp.h:$(GLSRC)gsmatrix.h -$(PSSRC)idisp.h:$(GLSRC)gsrefct.h +$(PSSRC)idisp.h:$(GLSRC)gxhttile.h $(PSSRC)idisp.h:$(GLSRC)gsparam.h -$(PSSRC)idisp.h:$(GLSRC)gsccolor.h +$(PSSRC)idisp.h:$(GLSRC)gsrefct.h +$(PSSRC)idisp.h:$(GLSRC)memento.h $(PSSRC)idisp.h:$(GLSRC)gsstruct.h $(PSSRC)idisp.h:$(GLSRC)gxsync.h +$(PSSRC)idisp.h:$(GLSRC)gxbitmap.h $(PSSRC)idisp.h:$(GLSRC)scommon.h -$(PSSRC)idisp.h:$(GLSRC)memento.h -$(PSSRC)idisp.h:$(GLSRC)gscsel.h $(PSSRC)idisp.h:$(GLSRC)gsbitmap.h +$(PSSRC)idisp.h:$(GLSRC)gsccolor.h +$(PSSRC)idisp.h:$(GLSRC)gxarith.h +$(PSSRC)idisp.h:$(GLSRC)gpsync.h $(PSSRC)idisp.h:$(GLSRC)gsstype.h $(PSSRC)idisp.h:$(GLSRC)gsmemory.h -$(PSSRC)idisp.h:$(GLSRC)gpsync.h $(PSSRC)idisp.h:$(GLSRC)gslibctx.h -$(PSSRC)idisp.h:$(GLSRC)gs_dll_call.h $(PSSRC)idisp.h:$(GLSRC)gsalloc.h -$(PSSRC)idisp.h:$(GLSRC)stdio_.h $(PSSRC)idisp.h:$(GLSRC)gxcindex.h -$(PSSRC)idisp.h:$(GLSRC)gsgstate.h +$(PSSRC)idisp.h:$(GLSRC)stdio_.h $(PSSRC)idisp.h:$(GLSRC)stdint_.h $(PSSRC)idisp.h:$(GLSRC)gssprintf.h -$(PSSRC)idisp.h:$(GLSRC)std.h $(PSSRC)idisp.h:$(GLSRC)gstypes.h +$(PSSRC)idisp.h:$(GLSRC)std.h $(PSSRC)idisp.h:$(GLSRC)stdpre.h $(PSSRC)idisp.h:$(GLGEN)arch.h +$(PSSRC)idisp.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifilter2.h:$(GLSRC)scfx.h $(PSSRC)ifilter2.h:$(GLSRC)slzwx.h $(PSSRC)ifilter2.h:$(GLSRC)spdiffx.h $(PSSRC)ifilter2.h:$(GLSRC)spngpx.h $(PSSRC)ifilter2.h:$(PSSRC)iostack.h $(PSSRC)ifilter2.h:$(PSSRC)istack.h -$(PSSRC)ifilter2.h:$(PSSRC)iosdata.h $(PSSRC)ifilter2.h:$(GLSRC)shc.h +$(PSSRC)ifilter2.h:$(PSSRC)iosdata.h $(PSSRC)ifilter2.h:$(PSSRC)isdata.h $(PSSRC)ifilter2.h:$(PSSRC)imemory.h $(PSSRC)ifilter2.h:$(PSSRC)ivmspace.h @@ -4623,99 +4623,99 @@ $(PSSRC)ifilter2.h:$(GLSRC)gxalloc.h $(PSSRC)ifilter2.h:$(GLSRC)gxobj.h $(PSSRC)ifilter2.h:$(GLSRC)gsnamecl.h $(PSSRC)ifilter2.h:$(GLSRC)gxcspace.h +$(PSSRC)ifilter2.h:$(GLSRC)gscsel.h $(PSSRC)ifilter2.h:$(GLSRC)gsdcolor.h $(PSSRC)ifilter2.h:$(GLSRC)gxfrac.h $(PSSRC)ifilter2.h:$(GLSRC)gscms.h -$(PSSRC)ifilter2.h:$(GLSRC)gscspace.h $(PSSRC)ifilter2.h:$(GLSRC)gsdevice.h -$(PSSRC)ifilter2.h:$(GLSRC)gxarith.h -$(PSSRC)ifilter2.h:$(GLSRC)gxhttile.h +$(PSSRC)ifilter2.h:$(GLSRC)gscspace.h +$(PSSRC)ifilter2.h:$(GLSRC)gsgstate.h $(PSSRC)ifilter2.h:$(GLSRC)gsiparam.h -$(PSSRC)ifilter2.h:$(GLSRC)gxbitmap.h $(PSSRC)ifilter2.h:$(GLSRC)gsmatrix.h -$(PSSRC)ifilter2.h:$(GLSRC)gsrefct.h +$(PSSRC)ifilter2.h:$(GLSRC)gxhttile.h $(PSSRC)ifilter2.h:$(GLSRC)gsparam.h -$(PSSRC)ifilter2.h:$(GLSRC)gsccolor.h +$(PSSRC)ifilter2.h:$(GLSRC)gsrefct.h +$(PSSRC)ifilter2.h:$(GLSRC)memento.h $(PSSRC)ifilter2.h:$(GLSRC)gsstruct.h $(PSSRC)ifilter2.h:$(GLSRC)gxsync.h +$(PSSRC)ifilter2.h:$(GLSRC)gxbitmap.h $(PSSRC)ifilter2.h:$(GLSRC)scommon.h -$(PSSRC)ifilter2.h:$(GLSRC)memento.h -$(PSSRC)ifilter2.h:$(GLSRC)gscsel.h $(PSSRC)ifilter2.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifilter2.h:$(GLSRC)gsccolor.h +$(PSSRC)ifilter2.h:$(GLSRC)gxarith.h +$(PSSRC)ifilter2.h:$(GLSRC)gpsync.h $(PSSRC)ifilter2.h:$(GLSRC)gsstype.h $(PSSRC)ifilter2.h:$(GLSRC)gsmemory.h -$(PSSRC)ifilter2.h:$(GLSRC)gpsync.h $(PSSRC)ifilter2.h:$(GLSRC)gslibctx.h -$(PSSRC)ifilter2.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifilter2.h:$(GLSRC)gsalloc.h -$(PSSRC)ifilter2.h:$(GLSRC)stdio_.h -$(PSSRC)ifilter2.h:$(GLSRC)gsbittab.h $(PSSRC)ifilter2.h:$(GLSRC)gxcindex.h -$(PSSRC)ifilter2.h:$(GLSRC)gsgstate.h +$(PSSRC)ifilter2.h:$(GLSRC)stdio_.h $(PSSRC)ifilter2.h:$(GLSRC)stdint_.h $(PSSRC)ifilter2.h:$(GLSRC)gssprintf.h -$(PSSRC)ifilter2.h:$(GLSRC)std.h +$(PSSRC)ifilter2.h:$(GLSRC)gsbittab.h $(PSSRC)ifilter2.h:$(GLSRC)gstypes.h +$(PSSRC)ifilter2.h:$(GLSRC)std.h $(PSSRC)ifilter2.h:$(GLSRC)stdpre.h $(PSSRC)ifilter2.h:$(GLGEN)arch.h +$(PSSRC)ifilter2.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifont.h:$(GLSRC)gxfont.h $(PSSRC)ifont.h:$(GLSRC)gspath.h -$(PSSRC)ifont.h:$(GLSRC)gxmatrix.h $(PSSRC)ifont.h:$(GLSRC)gsgdata.h -$(PSSRC)ifont.h:$(GLSRC)gsgcache.h +$(PSSRC)ifont.h:$(GLSRC)gxmatrix.h $(PSSRC)ifont.h:$(GLSRC)gxfapi.h -$(PSSRC)ifont.h:$(GLSRC)gsnotify.h $(PSSRC)ifont.h:$(GLSRC)gsfcmap.h $(PSSRC)ifont.h:$(PSSRC)iref.h $(PSSRC)ifont.h:$(GLSRC)gxalloc.h -$(PSSRC)ifont.h:$(GLSRC)gstext.h $(PSSRC)ifont.h:$(GLSRC)gxobj.h +$(PSSRC)ifont.h:$(GLSRC)gstext.h $(PSSRC)ifont.h:$(GLSRC)gsnamecl.h $(PSSRC)ifont.h:$(GLSRC)gxcspace.h -$(PSSRC)ifont.h:$(GLSRC)gsuid.h -$(PSSRC)ifont.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifont.h:$(GLSRC)gscsel.h $(PSSRC)ifont.h:$(GLSRC)gsfont.h -$(PSSRC)ifont.h:$(GLSRC)gxftype.h +$(PSSRC)ifont.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifont.h:$(GLSRC)gxpath.h $(PSSRC)ifont.h:$(GLSRC)gxfrac.h +$(PSSRC)ifont.h:$(GLSRC)gxftype.h $(PSSRC)ifont.h:$(GLSRC)gscms.h -$(PSSRC)ifont.h:$(GLSRC)gscspace.h -$(PSSRC)ifont.h:$(GLSRC)gxpath.h -$(PSSRC)ifont.h:$(GLSRC)gsdevice.h -$(PSSRC)ifont.h:$(GLSRC)gxarith.h -$(PSSRC)ifont.h:$(GLSRC)gspenum.h -$(PSSRC)ifont.h:$(GLSRC)gxhttile.h $(PSSRC)ifont.h:$(GLSRC)gsrect.h $(PSSRC)ifont.h:$(GLSRC)gslparam.h -$(PSSRC)ifont.h:$(GLSRC)gsiparam.h -$(PSSRC)ifont.h:$(GLSRC)gxbitmap.h -$(PSSRC)ifont.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifont.h:$(GLSRC)gsdevice.h $(PSSRC)ifont.h:$(GLSRC)gscpm.h +$(PSSRC)ifont.h:$(GLSRC)gsgcache.h +$(PSSRC)ifont.h:$(GLSRC)gscspace.h +$(PSSRC)ifont.h:$(GLSRC)gsgstate.h +$(PSSRC)ifont.h:$(GLSRC)gsnotify.h +$(PSSRC)ifont.h:$(GLSRC)gsiparam.h $(PSSRC)ifont.h:$(GLSRC)gxfixed.h -$(PSSRC)ifont.h:$(GLSRC)gsrefct.h +$(PSSRC)ifont.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifont.h:$(GLSRC)gspenum.h +$(PSSRC)ifont.h:$(GLSRC)gxhttile.h $(PSSRC)ifont.h:$(GLSRC)gsparam.h -$(PSSRC)ifont.h:$(GLSRC)gsccolor.h +$(PSSRC)ifont.h:$(GLSRC)gsrefct.h +$(PSSRC)ifont.h:$(GLSRC)memento.h +$(PSSRC)ifont.h:$(GLSRC)gsuid.h $(PSSRC)ifont.h:$(GLSRC)gsstruct.h $(PSSRC)ifont.h:$(GLSRC)gxsync.h +$(PSSRC)ifont.h:$(GLSRC)gxbitmap.h $(PSSRC)ifont.h:$(GLSRC)scommon.h -$(PSSRC)ifont.h:$(GLSRC)memento.h -$(PSSRC)ifont.h:$(GLSRC)gscsel.h $(PSSRC)ifont.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifont.h:$(GLSRC)gsccolor.h +$(PSSRC)ifont.h:$(GLSRC)gxarith.h +$(PSSRC)ifont.h:$(GLSRC)gpsync.h $(PSSRC)ifont.h:$(GLSRC)gsstype.h $(PSSRC)ifont.h:$(GLSRC)gsmemory.h -$(PSSRC)ifont.h:$(GLSRC)gpsync.h $(PSSRC)ifont.h:$(GLSRC)gslibctx.h -$(PSSRC)ifont.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifont.h:$(GLSRC)gsalloc.h -$(PSSRC)ifont.h:$(GLSRC)stdio_.h $(PSSRC)ifont.h:$(GLSRC)gxcindex.h -$(PSSRC)ifont.h:$(GLSRC)gsgstate.h +$(PSSRC)ifont.h:$(GLSRC)stdio_.h +$(PSSRC)ifont.h:$(GLSRC)gsccode.h $(PSSRC)ifont.h:$(GLSRC)stdint_.h $(PSSRC)ifont.h:$(GLSRC)gssprintf.h -$(PSSRC)ifont.h:$(GLSRC)gsccode.h -$(PSSRC)ifont.h:$(GLSRC)std.h $(PSSRC)ifont.h:$(GLSRC)gstypes.h +$(PSSRC)ifont.h:$(GLSRC)std.h $(PSSRC)ifont.h:$(GLSRC)stdpre.h $(PSSRC)ifont.h:$(GLGEN)arch.h +$(PSSRC)ifont.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifont1.h:$(PSSRC)ichar1.h $(PSSRC)ifont1.h:$(GLSRC)gxfont1.h $(PSSRC)ifont1.h:$(PSSRC)bfont.h @@ -4725,67 +4725,67 @@ $(PSSRC)ifont1.h:$(GLSRC)gxfont.h $(PSSRC)ifont1.h:$(PSSRC)iostack.h $(PSSRC)ifont1.h:$(GLSRC)gspath.h $(PSSRC)ifont1.h:$(PSSRC)istack.h -$(PSSRC)ifont1.h:$(GLSRC)gxmatrix.h $(PSSRC)ifont1.h:$(GLSRC)gsgdata.h $(PSSRC)ifont1.h:$(PSSRC)iosdata.h -$(PSSRC)ifont1.h:$(GLSRC)gsgcache.h +$(PSSRC)ifont1.h:$(GLSRC)gxmatrix.h $(PSSRC)ifont1.h:$(GLSRC)gxfapi.h -$(PSSRC)ifont1.h:$(GLSRC)gsnotify.h -$(PSSRC)ifont1.h:$(GLSRC)gsfcmap.h $(PSSRC)ifont1.h:$(PSSRC)isdata.h $(PSSRC)ifont1.h:$(PSSRC)imemory.h +$(PSSRC)ifont1.h:$(GLSRC)gsfcmap.h $(PSSRC)ifont1.h:$(PSSRC)ivmspace.h $(PSSRC)ifont1.h:$(PSSRC)iref.h $(PSSRC)ifont1.h:$(GLSRC)gsgc.h $(PSSRC)ifont1.h:$(GLSRC)gxalloc.h -$(PSSRC)ifont1.h:$(GLSRC)gstext.h $(PSSRC)ifont1.h:$(GLSRC)gxobj.h +$(PSSRC)ifont1.h:$(GLSRC)gstext.h $(PSSRC)ifont1.h:$(GLSRC)gsnamecl.h $(PSSRC)ifont1.h:$(GLSRC)gxcspace.h -$(PSSRC)ifont1.h:$(GLSRC)gsuid.h -$(PSSRC)ifont1.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifont1.h:$(GLSRC)gscsel.h $(PSSRC)ifont1.h:$(GLSRC)gsfont.h -$(PSSRC)ifont1.h:$(GLSRC)gxftype.h +$(PSSRC)ifont1.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifont1.h:$(GLSRC)gxpath.h $(PSSRC)ifont1.h:$(GLSRC)gxfrac.h +$(PSSRC)ifont1.h:$(GLSRC)gxftype.h $(PSSRC)ifont1.h:$(GLSRC)gscms.h -$(PSSRC)ifont1.h:$(GLSRC)gscspace.h -$(PSSRC)ifont1.h:$(GLSRC)gxpath.h -$(PSSRC)ifont1.h:$(GLSRC)gsdevice.h -$(PSSRC)ifont1.h:$(GLSRC)gxarith.h -$(PSSRC)ifont1.h:$(GLSRC)gspenum.h -$(PSSRC)ifont1.h:$(GLSRC)gxhttile.h $(PSSRC)ifont1.h:$(GLSRC)gsrect.h $(PSSRC)ifont1.h:$(GLSRC)gslparam.h -$(PSSRC)ifont1.h:$(GLSRC)gsiparam.h -$(PSSRC)ifont1.h:$(GLSRC)gxbitmap.h -$(PSSRC)ifont1.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifont1.h:$(GLSRC)gsdevice.h $(PSSRC)ifont1.h:$(GLSRC)gscpm.h +$(PSSRC)ifont1.h:$(GLSRC)gsgcache.h +$(PSSRC)ifont1.h:$(GLSRC)gscspace.h +$(PSSRC)ifont1.h:$(GLSRC)gsgstate.h +$(PSSRC)ifont1.h:$(GLSRC)gsnotify.h +$(PSSRC)ifont1.h:$(GLSRC)gsiparam.h $(PSSRC)ifont1.h:$(GLSRC)gxfixed.h -$(PSSRC)ifont1.h:$(GLSRC)gsrefct.h +$(PSSRC)ifont1.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifont1.h:$(GLSRC)gspenum.h +$(PSSRC)ifont1.h:$(GLSRC)gxhttile.h $(PSSRC)ifont1.h:$(GLSRC)gsparam.h -$(PSSRC)ifont1.h:$(GLSRC)gsccolor.h +$(PSSRC)ifont1.h:$(GLSRC)gsrefct.h +$(PSSRC)ifont1.h:$(GLSRC)memento.h +$(PSSRC)ifont1.h:$(GLSRC)gsuid.h $(PSSRC)ifont1.h:$(GLSRC)gsstruct.h $(PSSRC)ifont1.h:$(GLSRC)gxsync.h +$(PSSRC)ifont1.h:$(GLSRC)gxbitmap.h $(PSSRC)ifont1.h:$(GLSRC)scommon.h -$(PSSRC)ifont1.h:$(GLSRC)memento.h -$(PSSRC)ifont1.h:$(GLSRC)gscsel.h $(PSSRC)ifont1.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifont1.h:$(GLSRC)gsccolor.h +$(PSSRC)ifont1.h:$(GLSRC)gxarith.h +$(PSSRC)ifont1.h:$(GLSRC)gpsync.h $(PSSRC)ifont1.h:$(GLSRC)gsstype.h $(PSSRC)ifont1.h:$(GLSRC)gsmemory.h -$(PSSRC)ifont1.h:$(GLSRC)gpsync.h $(PSSRC)ifont1.h:$(GLSRC)gslibctx.h -$(PSSRC)ifont1.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifont1.h:$(GLSRC)gsalloc.h -$(PSSRC)ifont1.h:$(GLSRC)stdio_.h $(PSSRC)ifont1.h:$(GLSRC)gxcindex.h -$(PSSRC)ifont1.h:$(GLSRC)gsgstate.h +$(PSSRC)ifont1.h:$(GLSRC)stdio_.h +$(PSSRC)ifont1.h:$(GLSRC)gsccode.h $(PSSRC)ifont1.h:$(GLSRC)stdint_.h $(PSSRC)ifont1.h:$(GLSRC)gssprintf.h -$(PSSRC)ifont1.h:$(GLSRC)gsccode.h -$(PSSRC)ifont1.h:$(GLSRC)std.h $(PSSRC)ifont1.h:$(GLSRC)gstypes.h +$(PSSRC)ifont1.h:$(GLSRC)std.h $(PSSRC)ifont1.h:$(GLSRC)stdpre.h $(PSSRC)ifont1.h:$(GLGEN)arch.h +$(PSSRC)ifont1.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifont2.h:$(PSSRC)ifont1.h $(PSSRC)ifont2.h:$(PSSRC)ichar1.h $(PSSRC)ifont2.h:$(GLSRC)gxfont1.h @@ -4796,67 +4796,67 @@ $(PSSRC)ifont2.h:$(GLSRC)gxfont.h $(PSSRC)ifont2.h:$(PSSRC)iostack.h $(PSSRC)ifont2.h:$(GLSRC)gspath.h $(PSSRC)ifont2.h:$(PSSRC)istack.h -$(PSSRC)ifont2.h:$(GLSRC)gxmatrix.h $(PSSRC)ifont2.h:$(GLSRC)gsgdata.h $(PSSRC)ifont2.h:$(PSSRC)iosdata.h -$(PSSRC)ifont2.h:$(GLSRC)gsgcache.h +$(PSSRC)ifont2.h:$(GLSRC)gxmatrix.h $(PSSRC)ifont2.h:$(GLSRC)gxfapi.h -$(PSSRC)ifont2.h:$(GLSRC)gsnotify.h -$(PSSRC)ifont2.h:$(GLSRC)gsfcmap.h $(PSSRC)ifont2.h:$(PSSRC)isdata.h $(PSSRC)ifont2.h:$(PSSRC)imemory.h +$(PSSRC)ifont2.h:$(GLSRC)gsfcmap.h $(PSSRC)ifont2.h:$(PSSRC)ivmspace.h $(PSSRC)ifont2.h:$(PSSRC)iref.h $(PSSRC)ifont2.h:$(GLSRC)gsgc.h $(PSSRC)ifont2.h:$(GLSRC)gxalloc.h -$(PSSRC)ifont2.h:$(GLSRC)gstext.h $(PSSRC)ifont2.h:$(GLSRC)gxobj.h +$(PSSRC)ifont2.h:$(GLSRC)gstext.h $(PSSRC)ifont2.h:$(GLSRC)gsnamecl.h $(PSSRC)ifont2.h:$(GLSRC)gxcspace.h -$(PSSRC)ifont2.h:$(GLSRC)gsuid.h -$(PSSRC)ifont2.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifont2.h:$(GLSRC)gscsel.h $(PSSRC)ifont2.h:$(GLSRC)gsfont.h -$(PSSRC)ifont2.h:$(GLSRC)gxftype.h +$(PSSRC)ifont2.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifont2.h:$(GLSRC)gxpath.h $(PSSRC)ifont2.h:$(GLSRC)gxfrac.h +$(PSSRC)ifont2.h:$(GLSRC)gxftype.h $(PSSRC)ifont2.h:$(GLSRC)gscms.h -$(PSSRC)ifont2.h:$(GLSRC)gscspace.h -$(PSSRC)ifont2.h:$(GLSRC)gxpath.h -$(PSSRC)ifont2.h:$(GLSRC)gsdevice.h -$(PSSRC)ifont2.h:$(GLSRC)gxarith.h -$(PSSRC)ifont2.h:$(GLSRC)gspenum.h -$(PSSRC)ifont2.h:$(GLSRC)gxhttile.h $(PSSRC)ifont2.h:$(GLSRC)gsrect.h $(PSSRC)ifont2.h:$(GLSRC)gslparam.h -$(PSSRC)ifont2.h:$(GLSRC)gsiparam.h -$(PSSRC)ifont2.h:$(GLSRC)gxbitmap.h -$(PSSRC)ifont2.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifont2.h:$(GLSRC)gsdevice.h $(PSSRC)ifont2.h:$(GLSRC)gscpm.h +$(PSSRC)ifont2.h:$(GLSRC)gsgcache.h +$(PSSRC)ifont2.h:$(GLSRC)gscspace.h +$(PSSRC)ifont2.h:$(GLSRC)gsgstate.h +$(PSSRC)ifont2.h:$(GLSRC)gsnotify.h +$(PSSRC)ifont2.h:$(GLSRC)gsiparam.h $(PSSRC)ifont2.h:$(GLSRC)gxfixed.h -$(PSSRC)ifont2.h:$(GLSRC)gsrefct.h +$(PSSRC)ifont2.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifont2.h:$(GLSRC)gspenum.h +$(PSSRC)ifont2.h:$(GLSRC)gxhttile.h $(PSSRC)ifont2.h:$(GLSRC)gsparam.h -$(PSSRC)ifont2.h:$(GLSRC)gsccolor.h +$(PSSRC)ifont2.h:$(GLSRC)gsrefct.h +$(PSSRC)ifont2.h:$(GLSRC)memento.h +$(PSSRC)ifont2.h:$(GLSRC)gsuid.h $(PSSRC)ifont2.h:$(GLSRC)gsstruct.h $(PSSRC)ifont2.h:$(GLSRC)gxsync.h +$(PSSRC)ifont2.h:$(GLSRC)gxbitmap.h $(PSSRC)ifont2.h:$(GLSRC)scommon.h -$(PSSRC)ifont2.h:$(GLSRC)memento.h -$(PSSRC)ifont2.h:$(GLSRC)gscsel.h $(PSSRC)ifont2.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifont2.h:$(GLSRC)gsccolor.h +$(PSSRC)ifont2.h:$(GLSRC)gxarith.h +$(PSSRC)ifont2.h:$(GLSRC)gpsync.h $(PSSRC)ifont2.h:$(GLSRC)gsstype.h $(PSSRC)ifont2.h:$(GLSRC)gsmemory.h -$(PSSRC)ifont2.h:$(GLSRC)gpsync.h $(PSSRC)ifont2.h:$(GLSRC)gslibctx.h -$(PSSRC)ifont2.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifont2.h:$(GLSRC)gsalloc.h -$(PSSRC)ifont2.h:$(GLSRC)stdio_.h $(PSSRC)ifont2.h:$(GLSRC)gxcindex.h -$(PSSRC)ifont2.h:$(GLSRC)gsgstate.h +$(PSSRC)ifont2.h:$(GLSRC)stdio_.h +$(PSSRC)ifont2.h:$(GLSRC)gsccode.h $(PSSRC)ifont2.h:$(GLSRC)stdint_.h $(PSSRC)ifont2.h:$(GLSRC)gssprintf.h -$(PSSRC)ifont2.h:$(GLSRC)gsccode.h -$(PSSRC)ifont2.h:$(GLSRC)std.h $(PSSRC)ifont2.h:$(GLSRC)gstypes.h +$(PSSRC)ifont2.h:$(GLSRC)std.h $(PSSRC)ifont2.h:$(GLSRC)stdpre.h $(PSSRC)ifont2.h:$(GLGEN)arch.h +$(PSSRC)ifont2.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifont42.h:$(PSSRC)bfont.h $(PSSRC)ifont42.h:$(PSSRC)ifont.h $(PSSRC)ifont42.h:$(GLSRC)gxfont42.h @@ -4864,148 +4864,148 @@ $(PSSRC)ifont42.h:$(GLSRC)gxfont.h $(PSSRC)ifont42.h:$(PSSRC)iostack.h $(PSSRC)ifont42.h:$(GLSRC)gspath.h $(PSSRC)ifont42.h:$(PSSRC)istack.h -$(PSSRC)ifont42.h:$(GLSRC)gxmatrix.h $(PSSRC)ifont42.h:$(GLSRC)gsgdata.h $(PSSRC)ifont42.h:$(PSSRC)iosdata.h -$(PSSRC)ifont42.h:$(GLSRC)gsgcache.h +$(PSSRC)ifont42.h:$(GLSRC)gxmatrix.h $(PSSRC)ifont42.h:$(GLSRC)gxfapi.h -$(PSSRC)ifont42.h:$(GLSRC)gsnotify.h -$(PSSRC)ifont42.h:$(GLSRC)gsfcmap.h $(PSSRC)ifont42.h:$(PSSRC)isdata.h $(PSSRC)ifont42.h:$(PSSRC)imemory.h +$(PSSRC)ifont42.h:$(GLSRC)gsfcmap.h $(PSSRC)ifont42.h:$(PSSRC)ivmspace.h $(PSSRC)ifont42.h:$(PSSRC)iref.h $(PSSRC)ifont42.h:$(GLSRC)gsgc.h $(PSSRC)ifont42.h:$(GLSRC)gxalloc.h -$(PSSRC)ifont42.h:$(GLSRC)gstext.h $(PSSRC)ifont42.h:$(GLSRC)gxobj.h +$(PSSRC)ifont42.h:$(GLSRC)gstext.h $(PSSRC)ifont42.h:$(GLSRC)gsnamecl.h -$(PSSRC)ifont42.h:$(GLSRC)gxfcache.h $(PSSRC)ifont42.h:$(GLSRC)gxcspace.h -$(PSSRC)ifont42.h:$(GLSRC)gsuid.h -$(PSSRC)ifont42.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifont42.h:$(GLSRC)gscsel.h +$(PSSRC)ifont42.h:$(GLSRC)gxfcache.h $(PSSRC)ifont42.h:$(GLSRC)gsfont.h -$(PSSRC)ifont42.h:$(GLSRC)gxftype.h +$(PSSRC)ifont42.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifont42.h:$(GLSRC)gxbcache.h +$(PSSRC)ifont42.h:$(GLSRC)gxpath.h $(PSSRC)ifont42.h:$(GLSRC)gxfrac.h +$(PSSRC)ifont42.h:$(GLSRC)gxftype.h $(PSSRC)ifont42.h:$(GLSRC)gscms.h -$(PSSRC)ifont42.h:$(GLSRC)gscspace.h -$(PSSRC)ifont42.h:$(GLSRC)gxpath.h -$(PSSRC)ifont42.h:$(GLSRC)gxbcache.h -$(PSSRC)ifont42.h:$(GLSRC)gsdevice.h -$(PSSRC)ifont42.h:$(GLSRC)gxarith.h -$(PSSRC)ifont42.h:$(GLSRC)gspenum.h -$(PSSRC)ifont42.h:$(GLSRC)gxhttile.h $(PSSRC)ifont42.h:$(GLSRC)gsrect.h $(PSSRC)ifont42.h:$(GLSRC)gslparam.h +$(PSSRC)ifont42.h:$(GLSRC)gsdevice.h +$(PSSRC)ifont42.h:$(GLSRC)gscpm.h +$(PSSRC)ifont42.h:$(GLSRC)gsgcache.h +$(PSSRC)ifont42.h:$(GLSRC)gscspace.h +$(PSSRC)ifont42.h:$(GLSRC)gsgstate.h +$(PSSRC)ifont42.h:$(GLSRC)gsnotify.h $(PSSRC)ifont42.h:$(GLSRC)gsxfont.h $(PSSRC)ifont42.h:$(GLSRC)gsiparam.h -$(PSSRC)ifont42.h:$(GLSRC)gxbitmap.h -$(PSSRC)ifont42.h:$(GLSRC)gsmatrix.h -$(PSSRC)ifont42.h:$(GLSRC)gscpm.h $(PSSRC)ifont42.h:$(GLSRC)gxfixed.h -$(PSSRC)ifont42.h:$(GLSRC)gsrefct.h +$(PSSRC)ifont42.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifont42.h:$(GLSRC)gspenum.h +$(PSSRC)ifont42.h:$(GLSRC)gxhttile.h $(PSSRC)ifont42.h:$(GLSRC)gsparam.h -$(PSSRC)ifont42.h:$(GLSRC)gsccolor.h +$(PSSRC)ifont42.h:$(GLSRC)gsrefct.h +$(PSSRC)ifont42.h:$(GLSRC)memento.h +$(PSSRC)ifont42.h:$(GLSRC)gsuid.h $(PSSRC)ifont42.h:$(GLSRC)gsstruct.h $(PSSRC)ifont42.h:$(GLSRC)gxsync.h +$(PSSRC)ifont42.h:$(GLSRC)gxbitmap.h $(PSSRC)ifont42.h:$(GLSRC)scommon.h -$(PSSRC)ifont42.h:$(GLSRC)memento.h -$(PSSRC)ifont42.h:$(GLSRC)gscsel.h $(PSSRC)ifont42.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifont42.h:$(GLSRC)gsccolor.h +$(PSSRC)ifont42.h:$(GLSRC)gxarith.h +$(PSSRC)ifont42.h:$(GLSRC)gpsync.h $(PSSRC)ifont42.h:$(GLSRC)gsstype.h $(PSSRC)ifont42.h:$(GLSRC)gsmemory.h -$(PSSRC)ifont42.h:$(GLSRC)gpsync.h $(PSSRC)ifont42.h:$(GLSRC)gslibctx.h -$(PSSRC)ifont42.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifont42.h:$(GLSRC)gsalloc.h -$(PSSRC)ifont42.h:$(GLSRC)stdio_.h $(PSSRC)ifont42.h:$(GLSRC)gxcindex.h -$(PSSRC)ifont42.h:$(GLSRC)gsgstate.h +$(PSSRC)ifont42.h:$(GLSRC)stdio_.h +$(PSSRC)ifont42.h:$(GLSRC)gsccode.h $(PSSRC)ifont42.h:$(GLSRC)stdint_.h $(PSSRC)ifont42.h:$(GLSRC)gssprintf.h -$(PSSRC)ifont42.h:$(GLSRC)gsccode.h -$(PSSRC)ifont42.h:$(GLSRC)std.h $(PSSRC)ifont42.h:$(GLSRC)gstypes.h +$(PSSRC)ifont42.h:$(GLSRC)std.h $(PSSRC)ifont42.h:$(GLSRC)stdpre.h $(PSSRC)ifont42.h:$(GLGEN)arch.h +$(PSSRC)ifont42.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifrpred.h:$(PSSRC)iref.h $(PSSRC)ifrpred.h:$(GLSRC)gxalloc.h $(PSSRC)ifrpred.h:$(GLSRC)gxobj.h $(PSSRC)ifrpred.h:$(GLSRC)gsnamecl.h $(PSSRC)ifrpred.h:$(GLSRC)gxcspace.h +$(PSSRC)ifrpred.h:$(GLSRC)gscsel.h $(PSSRC)ifrpred.h:$(GLSRC)gsdcolor.h $(PSSRC)ifrpred.h:$(GLSRC)gxfrac.h $(PSSRC)ifrpred.h:$(GLSRC)gscms.h -$(PSSRC)ifrpred.h:$(GLSRC)gscspace.h $(PSSRC)ifrpred.h:$(GLSRC)gsdevice.h -$(PSSRC)ifrpred.h:$(GLSRC)gxarith.h -$(PSSRC)ifrpred.h:$(GLSRC)gxhttile.h +$(PSSRC)ifrpred.h:$(GLSRC)gscspace.h +$(PSSRC)ifrpred.h:$(GLSRC)gsgstate.h $(PSSRC)ifrpred.h:$(GLSRC)gsiparam.h -$(PSSRC)ifrpred.h:$(GLSRC)gxbitmap.h $(PSSRC)ifrpred.h:$(GLSRC)gsmatrix.h -$(PSSRC)ifrpred.h:$(GLSRC)gsrefct.h +$(PSSRC)ifrpred.h:$(GLSRC)gxhttile.h $(PSSRC)ifrpred.h:$(GLSRC)gsparam.h -$(PSSRC)ifrpred.h:$(GLSRC)gsccolor.h +$(PSSRC)ifrpred.h:$(GLSRC)gsrefct.h +$(PSSRC)ifrpred.h:$(GLSRC)memento.h $(PSSRC)ifrpred.h:$(GLSRC)gsstruct.h $(PSSRC)ifrpred.h:$(GLSRC)gxsync.h +$(PSSRC)ifrpred.h:$(GLSRC)gxbitmap.h $(PSSRC)ifrpred.h:$(GLSRC)scommon.h -$(PSSRC)ifrpred.h:$(GLSRC)memento.h -$(PSSRC)ifrpred.h:$(GLSRC)gscsel.h $(PSSRC)ifrpred.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifrpred.h:$(GLSRC)gsccolor.h +$(PSSRC)ifrpred.h:$(GLSRC)gxarith.h +$(PSSRC)ifrpred.h:$(GLSRC)gpsync.h $(PSSRC)ifrpred.h:$(GLSRC)gsstype.h $(PSSRC)ifrpred.h:$(GLSRC)gsmemory.h -$(PSSRC)ifrpred.h:$(GLSRC)gpsync.h $(PSSRC)ifrpred.h:$(GLSRC)gslibctx.h -$(PSSRC)ifrpred.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifrpred.h:$(GLSRC)gsalloc.h -$(PSSRC)ifrpred.h:$(GLSRC)stdio_.h $(PSSRC)ifrpred.h:$(GLSRC)gxcindex.h -$(PSSRC)ifrpred.h:$(GLSRC)gsgstate.h +$(PSSRC)ifrpred.h:$(GLSRC)stdio_.h $(PSSRC)ifrpred.h:$(GLSRC)stdint_.h $(PSSRC)ifrpred.h:$(GLSRC)gssprintf.h -$(PSSRC)ifrpred.h:$(GLSRC)std.h $(PSSRC)ifrpred.h:$(GLSRC)gstypes.h +$(PSSRC)ifrpred.h:$(GLSRC)std.h $(PSSRC)ifrpred.h:$(GLSRC)stdpre.h $(PSSRC)ifrpred.h:$(GLGEN)arch.h +$(PSSRC)ifrpred.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifwpred.h:$(PSSRC)iref.h $(PSSRC)ifwpred.h:$(GLSRC)gxalloc.h $(PSSRC)ifwpred.h:$(GLSRC)gxobj.h $(PSSRC)ifwpred.h:$(GLSRC)gsnamecl.h $(PSSRC)ifwpred.h:$(GLSRC)gxcspace.h +$(PSSRC)ifwpred.h:$(GLSRC)gscsel.h $(PSSRC)ifwpred.h:$(GLSRC)gsdcolor.h $(PSSRC)ifwpred.h:$(GLSRC)gxfrac.h $(PSSRC)ifwpred.h:$(GLSRC)gscms.h -$(PSSRC)ifwpred.h:$(GLSRC)gscspace.h $(PSSRC)ifwpred.h:$(GLSRC)gsdevice.h -$(PSSRC)ifwpred.h:$(GLSRC)gxarith.h -$(PSSRC)ifwpred.h:$(GLSRC)gxhttile.h +$(PSSRC)ifwpred.h:$(GLSRC)gscspace.h +$(PSSRC)ifwpred.h:$(GLSRC)gsgstate.h $(PSSRC)ifwpred.h:$(GLSRC)gsiparam.h -$(PSSRC)ifwpred.h:$(GLSRC)gxbitmap.h $(PSSRC)ifwpred.h:$(GLSRC)gsmatrix.h -$(PSSRC)ifwpred.h:$(GLSRC)gsrefct.h +$(PSSRC)ifwpred.h:$(GLSRC)gxhttile.h $(PSSRC)ifwpred.h:$(GLSRC)gsparam.h -$(PSSRC)ifwpred.h:$(GLSRC)gsccolor.h +$(PSSRC)ifwpred.h:$(GLSRC)gsrefct.h +$(PSSRC)ifwpred.h:$(GLSRC)memento.h $(PSSRC)ifwpred.h:$(GLSRC)gsstruct.h $(PSSRC)ifwpred.h:$(GLSRC)gxsync.h +$(PSSRC)ifwpred.h:$(GLSRC)gxbitmap.h $(PSSRC)ifwpred.h:$(GLSRC)scommon.h -$(PSSRC)ifwpred.h:$(GLSRC)memento.h -$(PSSRC)ifwpred.h:$(GLSRC)gscsel.h $(PSSRC)ifwpred.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifwpred.h:$(GLSRC)gsccolor.h +$(PSSRC)ifwpred.h:$(GLSRC)gxarith.h +$(PSSRC)ifwpred.h:$(GLSRC)gpsync.h $(PSSRC)ifwpred.h:$(GLSRC)gsstype.h $(PSSRC)ifwpred.h:$(GLSRC)gsmemory.h -$(PSSRC)ifwpred.h:$(GLSRC)gpsync.h $(PSSRC)ifwpred.h:$(GLSRC)gslibctx.h -$(PSSRC)ifwpred.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifwpred.h:$(GLSRC)gsalloc.h -$(PSSRC)ifwpred.h:$(GLSRC)stdio_.h $(PSSRC)ifwpred.h:$(GLSRC)gxcindex.h -$(PSSRC)ifwpred.h:$(GLSRC)gsgstate.h +$(PSSRC)ifwpred.h:$(GLSRC)stdio_.h $(PSSRC)ifwpred.h:$(GLSRC)stdint_.h $(PSSRC)ifwpred.h:$(GLSRC)gssprintf.h -$(PSSRC)ifwpred.h:$(GLSRC)std.h $(PSSRC)ifwpred.h:$(GLSRC)gstypes.h +$(PSSRC)ifwpred.h:$(GLSRC)std.h $(PSSRC)ifwpred.h:$(GLSRC)stdpre.h $(PSSRC)ifwpred.h:$(GLGEN)arch.h +$(PSSRC)ifwpred.h:$(GLSRC)gs_dll_call.h $(PSSRC)iht.h:$(GLSRC)gxht.h $(PSSRC)iht.h:$(GLSRC)gxhttype.h $(PSSRC)iht.h:$(GLSRC)gsht1.h @@ -5014,88 +5014,88 @@ $(PSSRC)iht.h:$(PSSRC)istack.h $(PSSRC)iht.h:$(PSSRC)iosdata.h $(PSSRC)iht.h:$(PSSRC)isdata.h $(PSSRC)iht.h:$(PSSRC)imemory.h -$(PSSRC)iht.h:$(PSSRC)ivmspace.h $(PSSRC)iht.h:$(GLSRC)gsht.h +$(PSSRC)iht.h:$(PSSRC)ivmspace.h $(PSSRC)iht.h:$(PSSRC)iref.h $(PSSRC)iht.h:$(GLSRC)gsgc.h $(PSSRC)iht.h:$(GLSRC)gxalloc.h $(PSSRC)iht.h:$(GLSRC)gxobj.h $(PSSRC)iht.h:$(GLSRC)gsnamecl.h $(PSSRC)iht.h:$(GLSRC)gxcspace.h +$(PSSRC)iht.h:$(GLSRC)gscsel.h $(PSSRC)iht.h:$(GLSRC)gsdcolor.h $(PSSRC)iht.h:$(GLSRC)gxfrac.h +$(PSSRC)iht.h:$(GLSRC)gxtmap.h $(PSSRC)iht.h:$(GLSRC)gscms.h -$(PSSRC)iht.h:$(GLSRC)gscspace.h $(PSSRC)iht.h:$(GLSRC)gsdevice.h -$(PSSRC)iht.h:$(GLSRC)gxarith.h -$(PSSRC)iht.h:$(GLSRC)gxhttile.h +$(PSSRC)iht.h:$(GLSRC)gscspace.h +$(PSSRC)iht.h:$(GLSRC)gsgstate.h $(PSSRC)iht.h:$(GLSRC)gsiparam.h -$(PSSRC)iht.h:$(GLSRC)gxbitmap.h $(PSSRC)iht.h:$(GLSRC)gsmatrix.h -$(PSSRC)iht.h:$(GLSRC)gsrefct.h +$(PSSRC)iht.h:$(GLSRC)gxhttile.h $(PSSRC)iht.h:$(GLSRC)gsparam.h -$(PSSRC)iht.h:$(GLSRC)gsccolor.h +$(PSSRC)iht.h:$(GLSRC)gsrefct.h +$(PSSRC)iht.h:$(GLSRC)memento.h $(PSSRC)iht.h:$(GLSRC)gsstruct.h $(PSSRC)iht.h:$(GLSRC)gxsync.h +$(PSSRC)iht.h:$(GLSRC)gxbitmap.h $(PSSRC)iht.h:$(GLSRC)scommon.h -$(PSSRC)iht.h:$(GLSRC)memento.h -$(PSSRC)iht.h:$(GLSRC)gscsel.h $(PSSRC)iht.h:$(GLSRC)gsbitmap.h +$(PSSRC)iht.h:$(GLSRC)gsccolor.h +$(PSSRC)iht.h:$(GLSRC)gxarith.h +$(PSSRC)iht.h:$(GLSRC)gpsync.h $(PSSRC)iht.h:$(GLSRC)gsstype.h -$(PSSRC)iht.h:$(GLSRC)gxtmap.h $(PSSRC)iht.h:$(GLSRC)gsmemory.h -$(PSSRC)iht.h:$(GLSRC)gpsync.h $(PSSRC)iht.h:$(GLSRC)gslibctx.h -$(PSSRC)iht.h:$(GLSRC)gs_dll_call.h $(PSSRC)iht.h:$(GLSRC)gsalloc.h -$(PSSRC)iht.h:$(GLSRC)stdio_.h $(PSSRC)iht.h:$(GLSRC)gxcindex.h -$(PSSRC)iht.h:$(GLSRC)gsgstate.h +$(PSSRC)iht.h:$(GLSRC)stdio_.h $(PSSRC)iht.h:$(GLSRC)stdint_.h $(PSSRC)iht.h:$(GLSRC)gssprintf.h -$(PSSRC)iht.h:$(GLSRC)std.h $(PSSRC)iht.h:$(GLSRC)gstypes.h +$(PSSRC)iht.h:$(GLSRC)std.h $(PSSRC)iht.h:$(GLSRC)stdpre.h $(PSSRC)iht.h:$(GLGEN)arch.h +$(PSSRC)iht.h:$(GLSRC)gs_dll_call.h $(PSSRC)iimage.h:$(PSSRC)iref.h $(PSSRC)iimage.h:$(GLSRC)gxalloc.h $(PSSRC)iimage.h:$(GLSRC)gxobj.h $(PSSRC)iimage.h:$(GLSRC)gsnamecl.h $(PSSRC)iimage.h:$(GLSRC)gxcspace.h +$(PSSRC)iimage.h:$(GLSRC)gscsel.h $(PSSRC)iimage.h:$(GLSRC)gsdcolor.h $(PSSRC)iimage.h:$(GLSRC)gxfrac.h $(PSSRC)iimage.h:$(GLSRC)gscms.h -$(PSSRC)iimage.h:$(GLSRC)gscspace.h $(PSSRC)iimage.h:$(GLSRC)gsdevice.h -$(PSSRC)iimage.h:$(GLSRC)gxarith.h -$(PSSRC)iimage.h:$(GLSRC)gxhttile.h +$(PSSRC)iimage.h:$(GLSRC)gscspace.h +$(PSSRC)iimage.h:$(GLSRC)gsgstate.h $(PSSRC)iimage.h:$(GLSRC)gsiparam.h -$(PSSRC)iimage.h:$(GLSRC)gxbitmap.h $(PSSRC)iimage.h:$(GLSRC)gsmatrix.h -$(PSSRC)iimage.h:$(GLSRC)gsrefct.h +$(PSSRC)iimage.h:$(GLSRC)gxhttile.h $(PSSRC)iimage.h:$(GLSRC)gsparam.h -$(PSSRC)iimage.h:$(GLSRC)gsccolor.h +$(PSSRC)iimage.h:$(GLSRC)gsrefct.h +$(PSSRC)iimage.h:$(GLSRC)memento.h $(PSSRC)iimage.h:$(GLSRC)gsstruct.h $(PSSRC)iimage.h:$(GLSRC)gxsync.h +$(PSSRC)iimage.h:$(GLSRC)gxbitmap.h $(PSSRC)iimage.h:$(GLSRC)scommon.h -$(PSSRC)iimage.h:$(GLSRC)memento.h -$(PSSRC)iimage.h:$(GLSRC)gscsel.h $(PSSRC)iimage.h:$(GLSRC)gsbitmap.h +$(PSSRC)iimage.h:$(GLSRC)gsccolor.h +$(PSSRC)iimage.h:$(GLSRC)gxarith.h +$(PSSRC)iimage.h:$(GLSRC)gpsync.h $(PSSRC)iimage.h:$(GLSRC)gsstype.h $(PSSRC)iimage.h:$(GLSRC)gsmemory.h -$(PSSRC)iimage.h:$(GLSRC)gpsync.h $(PSSRC)iimage.h:$(GLSRC)gslibctx.h -$(PSSRC)iimage.h:$(GLSRC)gs_dll_call.h $(PSSRC)iimage.h:$(GLSRC)gsalloc.h -$(PSSRC)iimage.h:$(GLSRC)stdio_.h $(PSSRC)iimage.h:$(GLSRC)gxcindex.h -$(PSSRC)iimage.h:$(GLSRC)gsgstate.h +$(PSSRC)iimage.h:$(GLSRC)stdio_.h $(PSSRC)iimage.h:$(GLSRC)stdint_.h $(PSSRC)iimage.h:$(GLSRC)gssprintf.h -$(PSSRC)iimage.h:$(GLSRC)std.h $(PSSRC)iimage.h:$(GLSRC)gstypes.h +$(PSSRC)iimage.h:$(GLSRC)std.h $(PSSRC)iimage.h:$(GLSRC)stdpre.h $(PSSRC)iimage.h:$(GLGEN)arch.h +$(PSSRC)iimage.h:$(GLSRC)gs_dll_call.h $(PSSRC)iinit.h:$(PSSRC)imemory.h $(PSSRC)iinit.h:$(PSSRC)ivmspace.h $(PSSRC)iinit.h:$(PSSRC)iref.h @@ -5104,80 +5104,80 @@ $(PSSRC)iinit.h:$(GLSRC)gxalloc.h $(PSSRC)iinit.h:$(GLSRC)gxobj.h $(PSSRC)iinit.h:$(GLSRC)gsnamecl.h $(PSSRC)iinit.h:$(GLSRC)gxcspace.h +$(PSSRC)iinit.h:$(GLSRC)gscsel.h $(PSSRC)iinit.h:$(GLSRC)gsdcolor.h $(PSSRC)iinit.h:$(GLSRC)gxfrac.h $(PSSRC)iinit.h:$(GLSRC)gscms.h -$(PSSRC)iinit.h:$(GLSRC)gscspace.h $(PSSRC)iinit.h:$(GLSRC)gsdevice.h -$(PSSRC)iinit.h:$(GLSRC)gxarith.h -$(PSSRC)iinit.h:$(GLSRC)gxhttile.h +$(PSSRC)iinit.h:$(GLSRC)gscspace.h +$(PSSRC)iinit.h:$(GLSRC)gsgstate.h $(PSSRC)iinit.h:$(GLSRC)gsiparam.h -$(PSSRC)iinit.h:$(GLSRC)gxbitmap.h $(PSSRC)iinit.h:$(GLSRC)gsmatrix.h -$(PSSRC)iinit.h:$(GLSRC)gsrefct.h +$(PSSRC)iinit.h:$(GLSRC)gxhttile.h $(PSSRC)iinit.h:$(GLSRC)gsparam.h -$(PSSRC)iinit.h:$(GLSRC)gsccolor.h +$(PSSRC)iinit.h:$(GLSRC)gsrefct.h +$(PSSRC)iinit.h:$(GLSRC)memento.h $(PSSRC)iinit.h:$(GLSRC)gsstruct.h $(PSSRC)iinit.h:$(GLSRC)gxsync.h +$(PSSRC)iinit.h:$(GLSRC)gxbitmap.h $(PSSRC)iinit.h:$(GLSRC)scommon.h -$(PSSRC)iinit.h:$(GLSRC)memento.h -$(PSSRC)iinit.h:$(GLSRC)gscsel.h $(PSSRC)iinit.h:$(GLSRC)gsbitmap.h +$(PSSRC)iinit.h:$(GLSRC)gsccolor.h +$(PSSRC)iinit.h:$(GLSRC)gxarith.h +$(PSSRC)iinit.h:$(GLSRC)gpsync.h $(PSSRC)iinit.h:$(GLSRC)gsstype.h $(PSSRC)iinit.h:$(GLSRC)gsmemory.h -$(PSSRC)iinit.h:$(GLSRC)gpsync.h $(PSSRC)iinit.h:$(GLSRC)gslibctx.h -$(PSSRC)iinit.h:$(GLSRC)gs_dll_call.h $(PSSRC)iinit.h:$(GLSRC)gsalloc.h -$(PSSRC)iinit.h:$(GLSRC)stdio_.h $(PSSRC)iinit.h:$(GLSRC)gxcindex.h -$(PSSRC)iinit.h:$(GLSRC)gsgstate.h +$(PSSRC)iinit.h:$(GLSRC)stdio_.h $(PSSRC)iinit.h:$(GLSRC)stdint_.h $(PSSRC)iinit.h:$(GLSRC)gssprintf.h -$(PSSRC)iinit.h:$(GLSRC)std.h $(PSSRC)iinit.h:$(GLSRC)gstypes.h +$(PSSRC)iinit.h:$(GLSRC)std.h $(PSSRC)iinit.h:$(GLSRC)stdpre.h $(PSSRC)iinit.h:$(GLGEN)arch.h +$(PSSRC)iinit.h:$(GLSRC)gs_dll_call.h $(PSSRC)imain.h:$(GLSRC)gsexit.h $(PSSRC)imain.h:$(PSSRC)iref.h $(PSSRC)imain.h:$(GLSRC)gxalloc.h $(PSSRC)imain.h:$(GLSRC)gxobj.h $(PSSRC)imain.h:$(GLSRC)gsnamecl.h $(PSSRC)imain.h:$(GLSRC)gxcspace.h +$(PSSRC)imain.h:$(GLSRC)gscsel.h $(PSSRC)imain.h:$(GLSRC)gsdcolor.h $(PSSRC)imain.h:$(GLSRC)gxfrac.h $(PSSRC)imain.h:$(GLSRC)gscms.h -$(PSSRC)imain.h:$(GLSRC)gscspace.h $(PSSRC)imain.h:$(GLSRC)gsdevice.h -$(PSSRC)imain.h:$(GLSRC)gxarith.h -$(PSSRC)imain.h:$(GLSRC)gxhttile.h +$(PSSRC)imain.h:$(GLSRC)gscspace.h +$(PSSRC)imain.h:$(GLSRC)gsgstate.h $(PSSRC)imain.h:$(GLSRC)gsiparam.h -$(PSSRC)imain.h:$(GLSRC)gxbitmap.h $(PSSRC)imain.h:$(GLSRC)gsmatrix.h -$(PSSRC)imain.h:$(GLSRC)gsrefct.h +$(PSSRC)imain.h:$(GLSRC)gxhttile.h $(PSSRC)imain.h:$(GLSRC)gsparam.h -$(PSSRC)imain.h:$(GLSRC)gsccolor.h +$(PSSRC)imain.h:$(GLSRC)gsrefct.h +$(PSSRC)imain.h:$(GLSRC)memento.h $(PSSRC)imain.h:$(GLSRC)gsstruct.h $(PSSRC)imain.h:$(GLSRC)gxsync.h +$(PSSRC)imain.h:$(GLSRC)gxbitmap.h $(PSSRC)imain.h:$(GLSRC)scommon.h -$(PSSRC)imain.h:$(GLSRC)memento.h -$(PSSRC)imain.h:$(GLSRC)gscsel.h $(PSSRC)imain.h:$(GLSRC)gsbitmap.h +$(PSSRC)imain.h:$(GLSRC)gsccolor.h +$(PSSRC)imain.h:$(GLSRC)gxarith.h +$(PSSRC)imain.h:$(GLSRC)gpsync.h $(PSSRC)imain.h:$(GLSRC)gsstype.h $(PSSRC)imain.h:$(GLSRC)gsmemory.h -$(PSSRC)imain.h:$(GLSRC)gpsync.h $(PSSRC)imain.h:$(GLSRC)gslibctx.h -$(PSSRC)imain.h:$(GLSRC)gs_dll_call.h $(PSSRC)imain.h:$(GLSRC)gsalloc.h -$(PSSRC)imain.h:$(GLSRC)stdio_.h $(PSSRC)imain.h:$(GLSRC)gxcindex.h -$(PSSRC)imain.h:$(GLSRC)gsgstate.h +$(PSSRC)imain.h:$(GLSRC)stdio_.h $(PSSRC)imain.h:$(GLSRC)stdint_.h $(PSSRC)imain.h:$(GLSRC)gssprintf.h -$(PSSRC)imain.h:$(GLSRC)std.h $(PSSRC)imain.h:$(GLSRC)gstypes.h +$(PSSRC)imain.h:$(GLSRC)std.h $(PSSRC)imain.h:$(GLSRC)stdpre.h $(PSSRC)imain.h:$(GLGEN)arch.h +$(PSSRC)imain.h:$(GLSRC)gs_dll_call.h $(PSSRC)imainarg.h:$(PSSRC)imain.h $(PSSRC)imainarg.h:$(GLSRC)gsexit.h $(PSSRC)imainarg.h:$(PSSRC)iref.h @@ -5185,40 +5185,40 @@ $(PSSRC)imainarg.h:$(GLSRC)gxalloc.h $(PSSRC)imainarg.h:$(GLSRC)gxobj.h $(PSSRC)imainarg.h:$(GLSRC)gsnamecl.h $(PSSRC)imainarg.h:$(GLSRC)gxcspace.h +$(PSSRC)imainarg.h:$(GLSRC)gscsel.h $(PSSRC)imainarg.h:$(GLSRC)gsdcolor.h $(PSSRC)imainarg.h:$(GLSRC)gxfrac.h $(PSSRC)imainarg.h:$(GLSRC)gscms.h -$(PSSRC)imainarg.h:$(GLSRC)gscspace.h $(PSSRC)imainarg.h:$(GLSRC)gsdevice.h -$(PSSRC)imainarg.h:$(GLSRC)gxarith.h -$(PSSRC)imainarg.h:$(GLSRC)gxhttile.h +$(PSSRC)imainarg.h:$(GLSRC)gscspace.h +$(PSSRC)imainarg.h:$(GLSRC)gsgstate.h $(PSSRC)imainarg.h:$(GLSRC)gsiparam.h -$(PSSRC)imainarg.h:$(GLSRC)gxbitmap.h $(PSSRC)imainarg.h:$(GLSRC)gsmatrix.h -$(PSSRC)imainarg.h:$(GLSRC)gsrefct.h +$(PSSRC)imainarg.h:$(GLSRC)gxhttile.h $(PSSRC)imainarg.h:$(GLSRC)gsparam.h -$(PSSRC)imainarg.h:$(GLSRC)gsccolor.h +$(PSSRC)imainarg.h:$(GLSRC)gsrefct.h +$(PSSRC)imainarg.h:$(GLSRC)memento.h $(PSSRC)imainarg.h:$(GLSRC)gsstruct.h $(PSSRC)imainarg.h:$(GLSRC)gxsync.h +$(PSSRC)imainarg.h:$(GLSRC)gxbitmap.h $(PSSRC)imainarg.h:$(GLSRC)scommon.h -$(PSSRC)imainarg.h:$(GLSRC)memento.h -$(PSSRC)imainarg.h:$(GLSRC)gscsel.h $(PSSRC)imainarg.h:$(GLSRC)gsbitmap.h +$(PSSRC)imainarg.h:$(GLSRC)gsccolor.h +$(PSSRC)imainarg.h:$(GLSRC)gxarith.h +$(PSSRC)imainarg.h:$(GLSRC)gpsync.h $(PSSRC)imainarg.h:$(GLSRC)gsstype.h $(PSSRC)imainarg.h:$(GLSRC)gsmemory.h -$(PSSRC)imainarg.h:$(GLSRC)gpsync.h $(PSSRC)imainarg.h:$(GLSRC)gslibctx.h -$(PSSRC)imainarg.h:$(GLSRC)gs_dll_call.h $(PSSRC)imainarg.h:$(GLSRC)gsalloc.h -$(PSSRC)imainarg.h:$(GLSRC)stdio_.h $(PSSRC)imainarg.h:$(GLSRC)gxcindex.h -$(PSSRC)imainarg.h:$(GLSRC)gsgstate.h +$(PSSRC)imainarg.h:$(GLSRC)stdio_.h $(PSSRC)imainarg.h:$(GLSRC)stdint_.h $(PSSRC)imainarg.h:$(GLSRC)gssprintf.h -$(PSSRC)imainarg.h:$(GLSRC)std.h $(PSSRC)imainarg.h:$(GLSRC)gstypes.h +$(PSSRC)imainarg.h:$(GLSRC)std.h $(PSSRC)imainarg.h:$(GLSRC)stdpre.h $(PSSRC)imainarg.h:$(GLGEN)arch.h +$(PSSRC)imainarg.h:$(GLSRC)gs_dll_call.h $(PSSRC)iminst.h:$(PSSRC)imain.h $(PSSRC)iminst.h:$(GLSRC)gsexit.h $(PSSRC)iminst.h:$(PSSRC)iref.h @@ -5226,40 +5226,40 @@ $(PSSRC)iminst.h:$(GLSRC)gxalloc.h $(PSSRC)iminst.h:$(GLSRC)gxobj.h $(PSSRC)iminst.h:$(GLSRC)gsnamecl.h $(PSSRC)iminst.h:$(GLSRC)gxcspace.h +$(PSSRC)iminst.h:$(GLSRC)gscsel.h $(PSSRC)iminst.h:$(GLSRC)gsdcolor.h $(PSSRC)iminst.h:$(GLSRC)gxfrac.h $(PSSRC)iminst.h:$(GLSRC)gscms.h -$(PSSRC)iminst.h:$(GLSRC)gscspace.h $(PSSRC)iminst.h:$(GLSRC)gsdevice.h -$(PSSRC)iminst.h:$(GLSRC)gxarith.h -$(PSSRC)iminst.h:$(GLSRC)gxhttile.h +$(PSSRC)iminst.h:$(GLSRC)gscspace.h +$(PSSRC)iminst.h:$(GLSRC)gsgstate.h $(PSSRC)iminst.h:$(GLSRC)gsiparam.h -$(PSSRC)iminst.h:$(GLSRC)gxbitmap.h $(PSSRC)iminst.h:$(GLSRC)gsmatrix.h -$(PSSRC)iminst.h:$(GLSRC)gsrefct.h +$(PSSRC)iminst.h:$(GLSRC)gxhttile.h $(PSSRC)iminst.h:$(GLSRC)gsparam.h -$(PSSRC)iminst.h:$(GLSRC)gsccolor.h +$(PSSRC)iminst.h:$(GLSRC)gsrefct.h +$(PSSRC)iminst.h:$(GLSRC)memento.h $(PSSRC)iminst.h:$(GLSRC)gsstruct.h $(PSSRC)iminst.h:$(GLSRC)gxsync.h +$(PSSRC)iminst.h:$(GLSRC)gxbitmap.h $(PSSRC)iminst.h:$(GLSRC)scommon.h -$(PSSRC)iminst.h:$(GLSRC)memento.h -$(PSSRC)iminst.h:$(GLSRC)gscsel.h $(PSSRC)iminst.h:$(GLSRC)gsbitmap.h +$(PSSRC)iminst.h:$(GLSRC)gsccolor.h +$(PSSRC)iminst.h:$(GLSRC)gxarith.h +$(PSSRC)iminst.h:$(GLSRC)gpsync.h $(PSSRC)iminst.h:$(GLSRC)gsstype.h $(PSSRC)iminst.h:$(GLSRC)gsmemory.h -$(PSSRC)iminst.h:$(GLSRC)gpsync.h $(PSSRC)iminst.h:$(GLSRC)gslibctx.h -$(PSSRC)iminst.h:$(GLSRC)gs_dll_call.h $(PSSRC)iminst.h:$(GLSRC)gsalloc.h -$(PSSRC)iminst.h:$(GLSRC)stdio_.h $(PSSRC)iminst.h:$(GLSRC)gxcindex.h -$(PSSRC)iminst.h:$(GLSRC)gsgstate.h +$(PSSRC)iminst.h:$(GLSRC)stdio_.h $(PSSRC)iminst.h:$(GLSRC)stdint_.h $(PSSRC)iminst.h:$(GLSRC)gssprintf.h -$(PSSRC)iminst.h:$(GLSRC)std.h $(PSSRC)iminst.h:$(GLSRC)gstypes.h +$(PSSRC)iminst.h:$(GLSRC)std.h $(PSSRC)iminst.h:$(GLSRC)stdpre.h $(PSSRC)iminst.h:$(GLGEN)arch.h +$(PSSRC)iminst.h:$(GLSRC)gs_dll_call.h $(PSSRC)iparray.h:$(PSSRC)isdata.h $(PSSRC)iparray.h:$(PSSRC)imemory.h $(PSSRC)iparray.h:$(PSSRC)ivmspace.h @@ -5269,40 +5269,40 @@ $(PSSRC)iparray.h:$(GLSRC)gxalloc.h $(PSSRC)iparray.h:$(GLSRC)gxobj.h $(PSSRC)iparray.h:$(GLSRC)gsnamecl.h $(PSSRC)iparray.h:$(GLSRC)gxcspace.h +$(PSSRC)iparray.h:$(GLSRC)gscsel.h $(PSSRC)iparray.h:$(GLSRC)gsdcolor.h $(PSSRC)iparray.h:$(GLSRC)gxfrac.h $(PSSRC)iparray.h:$(GLSRC)gscms.h -$(PSSRC)iparray.h:$(GLSRC)gscspace.h $(PSSRC)iparray.h:$(GLSRC)gsdevice.h -$(PSSRC)iparray.h:$(GLSRC)gxarith.h -$(PSSRC)iparray.h:$(GLSRC)gxhttile.h +$(PSSRC)iparray.h:$(GLSRC)gscspace.h +$(PSSRC)iparray.h:$(GLSRC)gsgstate.h $(PSSRC)iparray.h:$(GLSRC)gsiparam.h -$(PSSRC)iparray.h:$(GLSRC)gxbitmap.h $(PSSRC)iparray.h:$(GLSRC)gsmatrix.h -$(PSSRC)iparray.h:$(GLSRC)gsrefct.h +$(PSSRC)iparray.h:$(GLSRC)gxhttile.h $(PSSRC)iparray.h:$(GLSRC)gsparam.h -$(PSSRC)iparray.h:$(GLSRC)gsccolor.h +$(PSSRC)iparray.h:$(GLSRC)gsrefct.h +$(PSSRC)iparray.h:$(GLSRC)memento.h $(PSSRC)iparray.h:$(GLSRC)gsstruct.h $(PSSRC)iparray.h:$(GLSRC)gxsync.h +$(PSSRC)iparray.h:$(GLSRC)gxbitmap.h $(PSSRC)iparray.h:$(GLSRC)scommon.h -$(PSSRC)iparray.h:$(GLSRC)memento.h -$(PSSRC)iparray.h:$(GLSRC)gscsel.h $(PSSRC)iparray.h:$(GLSRC)gsbitmap.h +$(PSSRC)iparray.h:$(GLSRC)gsccolor.h +$(PSSRC)iparray.h:$(GLSRC)gxarith.h +$(PSSRC)iparray.h:$(GLSRC)gpsync.h $(PSSRC)iparray.h:$(GLSRC)gsstype.h $(PSSRC)iparray.h:$(GLSRC)gsmemory.h -$(PSSRC)iparray.h:$(GLSRC)gpsync.h $(PSSRC)iparray.h:$(GLSRC)gslibctx.h -$(PSSRC)iparray.h:$(GLSRC)gs_dll_call.h $(PSSRC)iparray.h:$(GLSRC)gsalloc.h -$(PSSRC)iparray.h:$(GLSRC)stdio_.h $(PSSRC)iparray.h:$(GLSRC)gxcindex.h -$(PSSRC)iparray.h:$(GLSRC)gsgstate.h +$(PSSRC)iparray.h:$(GLSRC)stdio_.h $(PSSRC)iparray.h:$(GLSRC)stdint_.h $(PSSRC)iparray.h:$(GLSRC)gssprintf.h -$(PSSRC)iparray.h:$(GLSRC)std.h $(PSSRC)iparray.h:$(GLSRC)gstypes.h +$(PSSRC)iparray.h:$(GLSRC)std.h $(PSSRC)iparray.h:$(GLSRC)stdpre.h $(PSSRC)iparray.h:$(GLGEN)arch.h +$(PSSRC)iparray.h:$(GLSRC)gs_dll_call.h $(PSSRC)iscanbin.h:$(PSSRC)iscan.h $(PSSRC)iscanbin.h:$(PSSRC)iref.h $(PSSRC)iscanbin.h:$(GLSRC)sa85x.h @@ -5314,40 +5314,40 @@ $(PSSRC)iscanbin.h:$(GLSRC)gxalloc.h $(PSSRC)iscanbin.h:$(GLSRC)gxobj.h $(PSSRC)iscanbin.h:$(GLSRC)gsnamecl.h $(PSSRC)iscanbin.h:$(GLSRC)gxcspace.h +$(PSSRC)iscanbin.h:$(GLSRC)gscsel.h $(PSSRC)iscanbin.h:$(GLSRC)gsdcolor.h $(PSSRC)iscanbin.h:$(GLSRC)gxfrac.h $(PSSRC)iscanbin.h:$(GLSRC)gscms.h -$(PSSRC)iscanbin.h:$(GLSRC)gscspace.h $(PSSRC)iscanbin.h:$(GLSRC)gsdevice.h -$(PSSRC)iscanbin.h:$(GLSRC)gxarith.h -$(PSSRC)iscanbin.h:$(GLSRC)gxhttile.h +$(PSSRC)iscanbin.h:$(GLSRC)gscspace.h +$(PSSRC)iscanbin.h:$(GLSRC)gsgstate.h $(PSSRC)iscanbin.h:$(GLSRC)gsiparam.h -$(PSSRC)iscanbin.h:$(GLSRC)gxbitmap.h $(PSSRC)iscanbin.h:$(GLSRC)gsmatrix.h -$(PSSRC)iscanbin.h:$(GLSRC)gsrefct.h +$(PSSRC)iscanbin.h:$(GLSRC)gxhttile.h $(PSSRC)iscanbin.h:$(GLSRC)gsparam.h -$(PSSRC)iscanbin.h:$(GLSRC)gsccolor.h +$(PSSRC)iscanbin.h:$(GLSRC)gsrefct.h +$(PSSRC)iscanbin.h:$(GLSRC)memento.h $(PSSRC)iscanbin.h:$(GLSRC)gsstruct.h $(PSSRC)iscanbin.h:$(GLSRC)gxsync.h +$(PSSRC)iscanbin.h:$(GLSRC)gxbitmap.h $(PSSRC)iscanbin.h:$(GLSRC)scommon.h -$(PSSRC)iscanbin.h:$(GLSRC)memento.h -$(PSSRC)iscanbin.h:$(GLSRC)gscsel.h $(PSSRC)iscanbin.h:$(GLSRC)gsbitmap.h +$(PSSRC)iscanbin.h:$(GLSRC)gsccolor.h +$(PSSRC)iscanbin.h:$(GLSRC)gxarith.h +$(PSSRC)iscanbin.h:$(GLSRC)gpsync.h $(PSSRC)iscanbin.h:$(GLSRC)gsstype.h $(PSSRC)iscanbin.h:$(GLSRC)gsmemory.h -$(PSSRC)iscanbin.h:$(GLSRC)gpsync.h $(PSSRC)iscanbin.h:$(GLSRC)gslibctx.h -$(PSSRC)iscanbin.h:$(GLSRC)gs_dll_call.h $(PSSRC)iscanbin.h:$(GLSRC)gsalloc.h -$(PSSRC)iscanbin.h:$(GLSRC)stdio_.h $(PSSRC)iscanbin.h:$(GLSRC)gxcindex.h -$(PSSRC)iscanbin.h:$(GLSRC)gsgstate.h +$(PSSRC)iscanbin.h:$(GLSRC)stdio_.h $(PSSRC)iscanbin.h:$(GLSRC)stdint_.h $(PSSRC)iscanbin.h:$(GLSRC)gssprintf.h -$(PSSRC)iscanbin.h:$(GLSRC)std.h $(PSSRC)iscanbin.h:$(GLSRC)gstypes.h +$(PSSRC)iscanbin.h:$(GLSRC)std.h $(PSSRC)iscanbin.h:$(GLSRC)stdpre.h $(PSSRC)iscanbin.h:$(GLGEN)arch.h +$(PSSRC)iscanbin.h:$(GLSRC)gs_dll_call.h $(PSSRC)iscannum.h:$(PSSRC)imemory.h $(PSSRC)iscannum.h:$(PSSRC)ivmspace.h $(PSSRC)iscannum.h:$(PSSRC)iref.h @@ -5356,40 +5356,40 @@ $(PSSRC)iscannum.h:$(GLSRC)gxalloc.h $(PSSRC)iscannum.h:$(GLSRC)gxobj.h $(PSSRC)iscannum.h:$(GLSRC)gsnamecl.h $(PSSRC)iscannum.h:$(GLSRC)gxcspace.h +$(PSSRC)iscannum.h:$(GLSRC)gscsel.h $(PSSRC)iscannum.h:$(GLSRC)gsdcolor.h $(PSSRC)iscannum.h:$(GLSRC)gxfrac.h $(PSSRC)iscannum.h:$(GLSRC)gscms.h -$(PSSRC)iscannum.h:$(GLSRC)gscspace.h $(PSSRC)iscannum.h:$(GLSRC)gsdevice.h -$(PSSRC)iscannum.h:$(GLSRC)gxarith.h -$(PSSRC)iscannum.h:$(GLSRC)gxhttile.h +$(PSSRC)iscannum.h:$(GLSRC)gscspace.h +$(PSSRC)iscannum.h:$(GLSRC)gsgstate.h $(PSSRC)iscannum.h:$(GLSRC)gsiparam.h -$(PSSRC)iscannum.h:$(GLSRC)gxbitmap.h $(PSSRC)iscannum.h:$(GLSRC)gsmatrix.h -$(PSSRC)iscannum.h:$(GLSRC)gsrefct.h +$(PSSRC)iscannum.h:$(GLSRC)gxhttile.h $(PSSRC)iscannum.h:$(GLSRC)gsparam.h -$(PSSRC)iscannum.h:$(GLSRC)gsccolor.h +$(PSSRC)iscannum.h:$(GLSRC)gsrefct.h +$(PSSRC)iscannum.h:$(GLSRC)memento.h $(PSSRC)iscannum.h:$(GLSRC)gsstruct.h $(PSSRC)iscannum.h:$(GLSRC)gxsync.h +$(PSSRC)iscannum.h:$(GLSRC)gxbitmap.h $(PSSRC)iscannum.h:$(GLSRC)scommon.h -$(PSSRC)iscannum.h:$(GLSRC)memento.h -$(PSSRC)iscannum.h:$(GLSRC)gscsel.h $(PSSRC)iscannum.h:$(GLSRC)gsbitmap.h +$(PSSRC)iscannum.h:$(GLSRC)gsccolor.h +$(PSSRC)iscannum.h:$(GLSRC)gxarith.h +$(PSSRC)iscannum.h:$(GLSRC)gpsync.h $(PSSRC)iscannum.h:$(GLSRC)gsstype.h $(PSSRC)iscannum.h:$(GLSRC)gsmemory.h -$(PSSRC)iscannum.h:$(GLSRC)gpsync.h $(PSSRC)iscannum.h:$(GLSRC)gslibctx.h -$(PSSRC)iscannum.h:$(GLSRC)gs_dll_call.h $(PSSRC)iscannum.h:$(GLSRC)gsalloc.h -$(PSSRC)iscannum.h:$(GLSRC)stdio_.h $(PSSRC)iscannum.h:$(GLSRC)gxcindex.h -$(PSSRC)iscannum.h:$(GLSRC)gsgstate.h +$(PSSRC)iscannum.h:$(GLSRC)stdio_.h $(PSSRC)iscannum.h:$(GLSRC)stdint_.h $(PSSRC)iscannum.h:$(GLSRC)gssprintf.h -$(PSSRC)iscannum.h:$(GLSRC)std.h $(PSSRC)iscannum.h:$(GLSRC)gstypes.h +$(PSSRC)iscannum.h:$(GLSRC)std.h $(PSSRC)iscannum.h:$(GLSRC)stdpre.h $(PSSRC)iscannum.h:$(GLGEN)arch.h +$(PSSRC)iscannum.h:$(GLSRC)gs_dll_call.h $(PSSRC)istream.h:$(PSSRC)imemory.h $(PSSRC)istream.h:$(PSSRC)ivmspace.h $(PSSRC)istream.h:$(PSSRC)iref.h @@ -5398,40 +5398,40 @@ $(PSSRC)istream.h:$(GLSRC)gxalloc.h $(PSSRC)istream.h:$(GLSRC)gxobj.h $(PSSRC)istream.h:$(GLSRC)gsnamecl.h $(PSSRC)istream.h:$(GLSRC)gxcspace.h +$(PSSRC)istream.h:$(GLSRC)gscsel.h $(PSSRC)istream.h:$(GLSRC)gsdcolor.h $(PSSRC)istream.h:$(GLSRC)gxfrac.h $(PSSRC)istream.h:$(GLSRC)gscms.h -$(PSSRC)istream.h:$(GLSRC)gscspace.h $(PSSRC)istream.h:$(GLSRC)gsdevice.h -$(PSSRC)istream.h:$(GLSRC)gxarith.h -$(PSSRC)istream.h:$(GLSRC)gxhttile.h +$(PSSRC)istream.h:$(GLSRC)gscspace.h +$(PSSRC)istream.h:$(GLSRC)gsgstate.h $(PSSRC)istream.h:$(GLSRC)gsiparam.h -$(PSSRC)istream.h:$(GLSRC)gxbitmap.h $(PSSRC)istream.h:$(GLSRC)gsmatrix.h -$(PSSRC)istream.h:$(GLSRC)gsrefct.h +$(PSSRC)istream.h:$(GLSRC)gxhttile.h $(PSSRC)istream.h:$(GLSRC)gsparam.h -$(PSSRC)istream.h:$(GLSRC)gsccolor.h +$(PSSRC)istream.h:$(GLSRC)gsrefct.h +$(PSSRC)istream.h:$(GLSRC)memento.h $(PSSRC)istream.h:$(GLSRC)gsstruct.h $(PSSRC)istream.h:$(GLSRC)gxsync.h +$(PSSRC)istream.h:$(GLSRC)gxbitmap.h $(PSSRC)istream.h:$(GLSRC)scommon.h -$(PSSRC)istream.h:$(GLSRC)memento.h -$(PSSRC)istream.h:$(GLSRC)gscsel.h $(PSSRC)istream.h:$(GLSRC)gsbitmap.h +$(PSSRC)istream.h:$(GLSRC)gsccolor.h +$(PSSRC)istream.h:$(GLSRC)gxarith.h +$(PSSRC)istream.h:$(GLSRC)gpsync.h $(PSSRC)istream.h:$(GLSRC)gsstype.h $(PSSRC)istream.h:$(GLSRC)gsmemory.h -$(PSSRC)istream.h:$(GLSRC)gpsync.h $(PSSRC)istream.h:$(GLSRC)gslibctx.h -$(PSSRC)istream.h:$(GLSRC)gs_dll_call.h $(PSSRC)istream.h:$(GLSRC)gsalloc.h -$(PSSRC)istream.h:$(GLSRC)stdio_.h $(PSSRC)istream.h:$(GLSRC)gxcindex.h -$(PSSRC)istream.h:$(GLSRC)gsgstate.h +$(PSSRC)istream.h:$(GLSRC)stdio_.h $(PSSRC)istream.h:$(GLSRC)stdint_.h $(PSSRC)istream.h:$(GLSRC)gssprintf.h -$(PSSRC)istream.h:$(GLSRC)std.h $(PSSRC)istream.h:$(GLSRC)gstypes.h +$(PSSRC)istream.h:$(GLSRC)std.h $(PSSRC)istream.h:$(GLSRC)stdpre.h $(PSSRC)istream.h:$(GLGEN)arch.h +$(PSSRC)istream.h:$(GLSRC)gs_dll_call.h $(PSSRC)itoken.h:$(PSSRC)iscan.h $(PSSRC)itoken.h:$(PSSRC)iref.h $(PSSRC)itoken.h:$(GLSRC)sa85x.h @@ -5443,40 +5443,40 @@ $(PSSRC)itoken.h:$(GLSRC)gxalloc.h $(PSSRC)itoken.h:$(GLSRC)gxobj.h $(PSSRC)itoken.h:$(GLSRC)gsnamecl.h $(PSSRC)itoken.h:$(GLSRC)gxcspace.h +$(PSSRC)itoken.h:$(GLSRC)gscsel.h $(PSSRC)itoken.h:$(GLSRC)gsdcolor.h $(PSSRC)itoken.h:$(GLSRC)gxfrac.h $(PSSRC)itoken.h:$(GLSRC)gscms.h -$(PSSRC)itoken.h:$(GLSRC)gscspace.h $(PSSRC)itoken.h:$(GLSRC)gsdevice.h -$(PSSRC)itoken.h:$(GLSRC)gxarith.h -$(PSSRC)itoken.h:$(GLSRC)gxhttile.h +$(PSSRC)itoken.h:$(GLSRC)gscspace.h +$(PSSRC)itoken.h:$(GLSRC)gsgstate.h $(PSSRC)itoken.h:$(GLSRC)gsiparam.h -$(PSSRC)itoken.h:$(GLSRC)gxbitmap.h $(PSSRC)itoken.h:$(GLSRC)gsmatrix.h -$(PSSRC)itoken.h:$(GLSRC)gsrefct.h +$(PSSRC)itoken.h:$(GLSRC)gxhttile.h $(PSSRC)itoken.h:$(GLSRC)gsparam.h -$(PSSRC)itoken.h:$(GLSRC)gsccolor.h +$(PSSRC)itoken.h:$(GLSRC)gsrefct.h +$(PSSRC)itoken.h:$(GLSRC)memento.h $(PSSRC)itoken.h:$(GLSRC)gsstruct.h $(PSSRC)itoken.h:$(GLSRC)gxsync.h +$(PSSRC)itoken.h:$(GLSRC)gxbitmap.h $(PSSRC)itoken.h:$(GLSRC)scommon.h -$(PSSRC)itoken.h:$(GLSRC)memento.h -$(PSSRC)itoken.h:$(GLSRC)gscsel.h $(PSSRC)itoken.h:$(GLSRC)gsbitmap.h +$(PSSRC)itoken.h:$(GLSRC)gsccolor.h +$(PSSRC)itoken.h:$(GLSRC)gxarith.h +$(PSSRC)itoken.h:$(GLSRC)gpsync.h $(PSSRC)itoken.h:$(GLSRC)gsstype.h $(PSSRC)itoken.h:$(GLSRC)gsmemory.h -$(PSSRC)itoken.h:$(GLSRC)gpsync.h $(PSSRC)itoken.h:$(GLSRC)gslibctx.h -$(PSSRC)itoken.h:$(GLSRC)gs_dll_call.h $(PSSRC)itoken.h:$(GLSRC)gsalloc.h -$(PSSRC)itoken.h:$(GLSRC)stdio_.h $(PSSRC)itoken.h:$(GLSRC)gxcindex.h -$(PSSRC)itoken.h:$(GLSRC)gsgstate.h +$(PSSRC)itoken.h:$(GLSRC)stdio_.h $(PSSRC)itoken.h:$(GLSRC)stdint_.h $(PSSRC)itoken.h:$(GLSRC)gssprintf.h -$(PSSRC)itoken.h:$(GLSRC)std.h $(PSSRC)itoken.h:$(GLSRC)gstypes.h +$(PSSRC)itoken.h:$(GLSRC)std.h $(PSSRC)itoken.h:$(GLSRC)stdpre.h $(PSSRC)itoken.h:$(GLGEN)arch.h +$(PSSRC)itoken.h:$(GLSRC)gs_dll_call.h $(PSSRC)main.h:$(PSSRC)iminst.h $(PSSRC)main.h:$(PSSRC)imain.h $(PSSRC)main.h:$(GLSRC)gsexit.h @@ -5486,124 +5486,124 @@ $(PSSRC)main.h:$(GLSRC)gxobj.h $(PSSRC)main.h:$(GLSRC)gsnamecl.h $(PSSRC)main.h:$(PSSRC)iapi.h $(PSSRC)main.h:$(GLSRC)gxcspace.h +$(PSSRC)main.h:$(GLSRC)gscsel.h $(PSSRC)main.h:$(GLSRC)gsdcolor.h $(PSSRC)main.h:$(GLSRC)gxfrac.h $(PSSRC)main.h:$(GLSRC)gscms.h -$(PSSRC)main.h:$(GLSRC)gscspace.h $(PSSRC)main.h:$(GLSRC)gsdevice.h -$(PSSRC)main.h:$(GLSRC)gxarith.h -$(PSSRC)main.h:$(GLSRC)gxhttile.h +$(PSSRC)main.h:$(GLSRC)gscspace.h +$(PSSRC)main.h:$(GLSRC)gsgstate.h $(PSSRC)main.h:$(GLSRC)gsiparam.h -$(PSSRC)main.h:$(GLSRC)gxbitmap.h $(PSSRC)main.h:$(GLSRC)gsmatrix.h -$(PSSRC)main.h:$(GLSRC)gsrefct.h +$(PSSRC)main.h:$(GLSRC)gxhttile.h $(PSSRC)main.h:$(GLSRC)gsparam.h -$(PSSRC)main.h:$(GLSRC)gsccolor.h +$(PSSRC)main.h:$(GLSRC)gsrefct.h +$(PSSRC)main.h:$(GLSRC)memento.h $(PSSRC)main.h:$(GLSRC)gsstruct.h $(PSSRC)main.h:$(GLSRC)gxsync.h +$(PSSRC)main.h:$(GLSRC)gxbitmap.h $(PSSRC)main.h:$(GLSRC)scommon.h -$(PSSRC)main.h:$(GLSRC)memento.h -$(PSSRC)main.h:$(GLSRC)gscsel.h $(PSSRC)main.h:$(GLSRC)gsbitmap.h +$(PSSRC)main.h:$(GLSRC)gsccolor.h +$(PSSRC)main.h:$(GLSRC)gxarith.h +$(PSSRC)main.h:$(GLSRC)gpsync.h $(PSSRC)main.h:$(GLSRC)gsstype.h $(PSSRC)main.h:$(GLSRC)gsmemory.h -$(PSSRC)main.h:$(GLSRC)gpsync.h $(PSSRC)main.h:$(GLSRC)gslibctx.h -$(PSSRC)main.h:$(GLSRC)gs_dll_call.h $(PSSRC)main.h:$(GLSRC)gsalloc.h -$(PSSRC)main.h:$(GLSRC)stdio_.h $(PSSRC)main.h:$(GLSRC)gxcindex.h -$(PSSRC)main.h:$(GLSRC)gsgstate.h +$(PSSRC)main.h:$(GLSRC)stdio_.h $(PSSRC)main.h:$(GLSRC)stdint_.h $(PSSRC)main.h:$(GLSRC)gssprintf.h -$(PSSRC)main.h:$(GLSRC)std.h $(PSSRC)main.h:$(GLSRC)gstypes.h +$(PSSRC)main.h:$(GLSRC)std.h $(PSSRC)main.h:$(GLSRC)stdpre.h $(PSSRC)main.h:$(GLGEN)arch.h +$(PSSRC)main.h:$(GLSRC)gs_dll_call.h $(GLSRC)smtf.h:$(GLSRC)scommon.h $(GLSRC)smtf.h:$(GLSRC)gsstype.h $(GLSRC)smtf.h:$(GLSRC)gsmemory.h $(GLSRC)smtf.h:$(GLSRC)gslibctx.h -$(GLSRC)smtf.h:$(GLSRC)gs_dll_call.h $(GLSRC)smtf.h:$(GLSRC)stdio_.h $(GLSRC)smtf.h:$(GLSRC)stdint_.h $(GLSRC)smtf.h:$(GLSRC)gssprintf.h -$(GLSRC)smtf.h:$(GLSRC)std.h $(GLSRC)smtf.h:$(GLSRC)gstypes.h +$(GLSRC)smtf.h:$(GLSRC)std.h $(GLSRC)smtf.h:$(GLSRC)stdpre.h $(GLSRC)smtf.h:$(GLGEN)arch.h +$(GLSRC)smtf.h:$(GLSRC)gs_dll_call.h $(PSSRC)bfont.h:$(PSSRC)ifont.h $(PSSRC)bfont.h:$(GLSRC)gxfont.h $(PSSRC)bfont.h:$(PSSRC)iostack.h $(PSSRC)bfont.h:$(GLSRC)gspath.h $(PSSRC)bfont.h:$(PSSRC)istack.h -$(PSSRC)bfont.h:$(GLSRC)gxmatrix.h $(PSSRC)bfont.h:$(GLSRC)gsgdata.h $(PSSRC)bfont.h:$(PSSRC)iosdata.h -$(PSSRC)bfont.h:$(GLSRC)gsgcache.h +$(PSSRC)bfont.h:$(GLSRC)gxmatrix.h $(PSSRC)bfont.h:$(GLSRC)gxfapi.h -$(PSSRC)bfont.h:$(GLSRC)gsnotify.h -$(PSSRC)bfont.h:$(GLSRC)gsfcmap.h $(PSSRC)bfont.h:$(PSSRC)isdata.h $(PSSRC)bfont.h:$(PSSRC)imemory.h +$(PSSRC)bfont.h:$(GLSRC)gsfcmap.h $(PSSRC)bfont.h:$(PSSRC)ivmspace.h $(PSSRC)bfont.h:$(PSSRC)iref.h $(PSSRC)bfont.h:$(GLSRC)gsgc.h $(PSSRC)bfont.h:$(GLSRC)gxalloc.h -$(PSSRC)bfont.h:$(GLSRC)gstext.h $(PSSRC)bfont.h:$(GLSRC)gxobj.h +$(PSSRC)bfont.h:$(GLSRC)gstext.h $(PSSRC)bfont.h:$(GLSRC)gsnamecl.h $(PSSRC)bfont.h:$(GLSRC)gxcspace.h -$(PSSRC)bfont.h:$(GLSRC)gsuid.h -$(PSSRC)bfont.h:$(GLSRC)gsdcolor.h +$(PSSRC)bfont.h:$(GLSRC)gscsel.h $(PSSRC)bfont.h:$(GLSRC)gsfont.h -$(PSSRC)bfont.h:$(GLSRC)gxftype.h +$(PSSRC)bfont.h:$(GLSRC)gsdcolor.h +$(PSSRC)bfont.h:$(GLSRC)gxpath.h $(PSSRC)bfont.h:$(GLSRC)gxfrac.h +$(PSSRC)bfont.h:$(GLSRC)gxftype.h $(PSSRC)bfont.h:$(GLSRC)gscms.h -$(PSSRC)bfont.h:$(GLSRC)gscspace.h -$(PSSRC)bfont.h:$(GLSRC)gxpath.h -$(PSSRC)bfont.h:$(GLSRC)gsdevice.h -$(PSSRC)bfont.h:$(GLSRC)gxarith.h -$(PSSRC)bfont.h:$(GLSRC)gspenum.h -$(PSSRC)bfont.h:$(GLSRC)gxhttile.h $(PSSRC)bfont.h:$(GLSRC)gsrect.h $(PSSRC)bfont.h:$(GLSRC)gslparam.h -$(PSSRC)bfont.h:$(GLSRC)gsiparam.h -$(PSSRC)bfont.h:$(GLSRC)gxbitmap.h -$(PSSRC)bfont.h:$(GLSRC)gsmatrix.h +$(PSSRC)bfont.h:$(GLSRC)gsdevice.h $(PSSRC)bfont.h:$(GLSRC)gscpm.h +$(PSSRC)bfont.h:$(GLSRC)gsgcache.h +$(PSSRC)bfont.h:$(GLSRC)gscspace.h +$(PSSRC)bfont.h:$(GLSRC)gsgstate.h +$(PSSRC)bfont.h:$(GLSRC)gsnotify.h +$(PSSRC)bfont.h:$(GLSRC)gsiparam.h $(PSSRC)bfont.h:$(GLSRC)gxfixed.h -$(PSSRC)bfont.h:$(GLSRC)gsrefct.h +$(PSSRC)bfont.h:$(GLSRC)gsmatrix.h +$(PSSRC)bfont.h:$(GLSRC)gspenum.h +$(PSSRC)bfont.h:$(GLSRC)gxhttile.h $(PSSRC)bfont.h:$(GLSRC)gsparam.h -$(PSSRC)bfont.h:$(GLSRC)gsccolor.h +$(PSSRC)bfont.h:$(GLSRC)gsrefct.h +$(PSSRC)bfont.h:$(GLSRC)memento.h +$(PSSRC)bfont.h:$(GLSRC)gsuid.h $(PSSRC)bfont.h:$(GLSRC)gsstruct.h $(PSSRC)bfont.h:$(GLSRC)gxsync.h +$(PSSRC)bfont.h:$(GLSRC)gxbitmap.h $(PSSRC)bfont.h:$(GLSRC)scommon.h -$(PSSRC)bfont.h:$(GLSRC)memento.h -$(PSSRC)bfont.h:$(GLSRC)gscsel.h $(PSSRC)bfont.h:$(GLSRC)gsbitmap.h +$(PSSRC)bfont.h:$(GLSRC)gsccolor.h +$(PSSRC)bfont.h:$(GLSRC)gxarith.h +$(PSSRC)bfont.h:$(GLSRC)gpsync.h $(PSSRC)bfont.h:$(GLSRC)gsstype.h $(PSSRC)bfont.h:$(GLSRC)gsmemory.h -$(PSSRC)bfont.h:$(GLSRC)gpsync.h $(PSSRC)bfont.h:$(GLSRC)gslibctx.h -$(PSSRC)bfont.h:$(GLSRC)gs_dll_call.h $(PSSRC)bfont.h:$(GLSRC)gsalloc.h -$(PSSRC)bfont.h:$(GLSRC)stdio_.h $(PSSRC)bfont.h:$(GLSRC)gxcindex.h -$(PSSRC)bfont.h:$(GLSRC)gsgstate.h +$(PSSRC)bfont.h:$(GLSRC)stdio_.h +$(PSSRC)bfont.h:$(GLSRC)gsccode.h $(PSSRC)bfont.h:$(GLSRC)stdint_.h $(PSSRC)bfont.h:$(GLSRC)gssprintf.h -$(PSSRC)bfont.h:$(GLSRC)gsccode.h -$(PSSRC)bfont.h:$(GLSRC)std.h $(PSSRC)bfont.h:$(GLSRC)gstypes.h +$(PSSRC)bfont.h:$(GLSRC)std.h $(PSSRC)bfont.h:$(GLSRC)stdpre.h $(PSSRC)bfont.h:$(GLGEN)arch.h +$(PSSRC)bfont.h:$(GLSRC)gs_dll_call.h $(PSSRC)icontext.h:$(PSSRC)icstate.h $(PSSRC)icontext.h:$(PSSRC)idsdata.h $(PSSRC)icontext.h:$(PSSRC)iesdata.h $(PSSRC)icontext.h:$(PSSRC)interp.h -$(PSSRC)icontext.h:$(PSSRC)opdef.h $(PSSRC)icontext.h:$(PSSRC)files.h +$(PSSRC)icontext.h:$(PSSRC)opdef.h $(PSSRC)icontext.h:$(PSSRC)iddstack.h $(PSSRC)icontext.h:$(PSSRC)store.h $(PSSRC)icontext.h:$(PSSRC)iosdata.h @@ -5620,47 +5620,47 @@ $(PSSRC)icontext.h:$(GLSRC)gsnamecl.h $(PSSRC)icontext.h:$(GLSRC)stream.h $(PSSRC)icontext.h:$(GLSRC)gxcspace.h $(PSSRC)icontext.h:$(GLSRC)gxiodev.h +$(PSSRC)icontext.h:$(GLSRC)gscsel.h $(PSSRC)icontext.h:$(GLSRC)gsdcolor.h $(PSSRC)icontext.h:$(GLSRC)gxfrac.h $(PSSRC)icontext.h:$(GLSRC)gscms.h -$(PSSRC)icontext.h:$(GLSRC)gscspace.h $(PSSRC)icontext.h:$(GLSRC)gsdevice.h -$(PSSRC)icontext.h:$(GLSRC)gxarith.h -$(PSSRC)icontext.h:$(GLSRC)gxhttile.h +$(PSSRC)icontext.h:$(GLSRC)gscspace.h +$(PSSRC)icontext.h:$(GLSRC)gsgstate.h $(PSSRC)icontext.h:$(GLSRC)gsiparam.h -$(PSSRC)icontext.h:$(GLSRC)gxbitmap.h $(PSSRC)icontext.h:$(GLSRC)gsmatrix.h -$(PSSRC)icontext.h:$(GLSRC)gsrefct.h +$(PSSRC)icontext.h:$(GLSRC)gxhttile.h $(PSSRC)icontext.h:$(GLSRC)gsparam.h +$(PSSRC)icontext.h:$(GLSRC)gsrefct.h $(PSSRC)icontext.h:$(GLSRC)gp.h -$(PSSRC)icontext.h:$(GLSRC)gsccolor.h +$(PSSRC)icontext.h:$(GLSRC)memento.h +$(PSSRC)icontext.h:$(GLSRC)memory_.h $(PSSRC)icontext.h:$(GLSRC)gsstruct.h $(PSSRC)icontext.h:$(GLSRC)gxsync.h +$(PSSRC)icontext.h:$(GLSRC)gxbitmap.h $(PSSRC)icontext.h:$(GLSRC)srdline.h $(PSSRC)icontext.h:$(GLSRC)scommon.h -$(PSSRC)icontext.h:$(GLSRC)memento.h -$(PSSRC)icontext.h:$(GLSRC)gscsel.h -$(PSSRC)icontext.h:$(GLSRC)gsbitmap.h $(PSSRC)icontext.h:$(GLSRC)gsfname.h -$(PSSRC)icontext.h:$(GLSRC)gsstype.h +$(PSSRC)icontext.h:$(GLSRC)gsbitmap.h +$(PSSRC)icontext.h:$(GLSRC)gsccolor.h +$(PSSRC)icontext.h:$(GLSRC)gxarith.h $(PSSRC)icontext.h:$(GLSRC)stat_.h -$(PSSRC)icontext.h:$(GLSRC)gsmemory.h $(PSSRC)icontext.h:$(GLSRC)gpsync.h -$(PSSRC)icontext.h:$(GLSRC)memory_.h +$(PSSRC)icontext.h:$(GLSRC)gsstype.h +$(PSSRC)icontext.h:$(GLSRC)gsmemory.h $(PSSRC)icontext.h:$(GLSRC)gpgetenv.h -$(PSSRC)icontext.h:$(GLSRC)gslibctx.h $(PSSRC)icontext.h:$(GLSRC)gscdefs.h -$(PSSRC)icontext.h:$(GLSRC)gs_dll_call.h +$(PSSRC)icontext.h:$(GLSRC)gslibctx.h $(PSSRC)icontext.h:$(GLSRC)gsalloc.h -$(PSSRC)icontext.h:$(GLSRC)stdio_.h $(PSSRC)icontext.h:$(GLSRC)gxcindex.h -$(PSSRC)icontext.h:$(GLSRC)gsgstate.h +$(PSSRC)icontext.h:$(GLSRC)stdio_.h $(PSSRC)icontext.h:$(GLSRC)stdint_.h $(PSSRC)icontext.h:$(GLSRC)gssprintf.h -$(PSSRC)icontext.h:$(GLSRC)std.h $(PSSRC)icontext.h:$(GLSRC)gstypes.h +$(PSSRC)icontext.h:$(GLSRC)std.h $(PSSRC)icontext.h:$(GLSRC)stdpre.h $(PSSRC)icontext.h:$(GLGEN)arch.h +$(PSSRC)icontext.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifilter.h:$(PSSRC)istream.h $(PSSRC)ifilter.h:$(PSSRC)imemory.h $(PSSRC)ifilter.h:$(PSSRC)ivmspace.h @@ -5670,95 +5670,95 @@ $(PSSRC)ifilter.h:$(GLSRC)gxalloc.h $(PSSRC)ifilter.h:$(GLSRC)gxobj.h $(PSSRC)ifilter.h:$(GLSRC)gsnamecl.h $(PSSRC)ifilter.h:$(GLSRC)gxcspace.h +$(PSSRC)ifilter.h:$(GLSRC)gscsel.h $(PSSRC)ifilter.h:$(GLSRC)gsdcolor.h $(PSSRC)ifilter.h:$(GLSRC)gxfrac.h $(PSSRC)ifilter.h:$(GLSRC)gscms.h -$(PSSRC)ifilter.h:$(GLSRC)gscspace.h $(PSSRC)ifilter.h:$(GLSRC)gsdevice.h -$(PSSRC)ifilter.h:$(GLSRC)gxarith.h -$(PSSRC)ifilter.h:$(GLSRC)gxhttile.h +$(PSSRC)ifilter.h:$(GLSRC)gscspace.h +$(PSSRC)ifilter.h:$(GLSRC)gsgstate.h $(PSSRC)ifilter.h:$(GLSRC)gsiparam.h -$(PSSRC)ifilter.h:$(GLSRC)gxbitmap.h $(PSSRC)ifilter.h:$(GLSRC)gsmatrix.h -$(PSSRC)ifilter.h:$(GLSRC)gsrefct.h +$(PSSRC)ifilter.h:$(GLSRC)gxhttile.h $(PSSRC)ifilter.h:$(GLSRC)gsparam.h -$(PSSRC)ifilter.h:$(GLSRC)gsccolor.h +$(PSSRC)ifilter.h:$(GLSRC)gsrefct.h +$(PSSRC)ifilter.h:$(GLSRC)memento.h $(PSSRC)ifilter.h:$(GLSRC)gsstruct.h $(PSSRC)ifilter.h:$(GLSRC)gxsync.h +$(PSSRC)ifilter.h:$(GLSRC)gxbitmap.h $(PSSRC)ifilter.h:$(GLSRC)scommon.h -$(PSSRC)ifilter.h:$(GLSRC)memento.h -$(PSSRC)ifilter.h:$(GLSRC)gscsel.h $(PSSRC)ifilter.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifilter.h:$(GLSRC)gsccolor.h +$(PSSRC)ifilter.h:$(GLSRC)gxarith.h +$(PSSRC)ifilter.h:$(GLSRC)gpsync.h $(PSSRC)ifilter.h:$(GLSRC)gsstype.h $(PSSRC)ifilter.h:$(GLSRC)gsmemory.h -$(PSSRC)ifilter.h:$(GLSRC)gpsync.h $(PSSRC)ifilter.h:$(GLSRC)gslibctx.h -$(PSSRC)ifilter.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifilter.h:$(GLSRC)gsalloc.h -$(PSSRC)ifilter.h:$(GLSRC)stdio_.h $(PSSRC)ifilter.h:$(GLSRC)gxcindex.h -$(PSSRC)ifilter.h:$(GLSRC)gsgstate.h +$(PSSRC)ifilter.h:$(GLSRC)stdio_.h $(PSSRC)ifilter.h:$(GLSRC)stdint_.h $(PSSRC)ifilter.h:$(GLSRC)gssprintf.h -$(PSSRC)ifilter.h:$(GLSRC)std.h $(PSSRC)ifilter.h:$(GLSRC)gstypes.h +$(PSSRC)ifilter.h:$(GLSRC)std.h $(PSSRC)ifilter.h:$(GLSRC)stdpre.h $(PSSRC)ifilter.h:$(GLGEN)arch.h +$(PSSRC)ifilter.h:$(GLSRC)gs_dll_call.h $(PSSRC)igstate.h:$(GLSRC)gsstate.h $(PSSRC)igstate.h:$(GLSRC)gsovrc.h $(PSSRC)igstate.h:$(GLSRC)gscolor.h -$(PSSRC)igstate.h:$(GLSRC)gxcomp.h $(PSSRC)igstate.h:$(GLSRC)gsline.h +$(PSSRC)igstate.h:$(GLSRC)gxcomp.h $(PSSRC)igstate.h:$(PSSRC)istruct.h -$(PSSRC)igstate.h:$(GLSRC)gxbitfmt.h $(PSSRC)igstate.h:$(PSSRC)imemory.h -$(PSSRC)igstate.h:$(PSSRC)ivmspace.h $(PSSRC)igstate.h:$(GLSRC)gsht.h +$(PSSRC)igstate.h:$(PSSRC)ivmspace.h $(PSSRC)igstate.h:$(PSSRC)iref.h $(PSSRC)igstate.h:$(GLSRC)gsgc.h $(PSSRC)igstate.h:$(GLSRC)gxalloc.h $(PSSRC)igstate.h:$(GLSRC)gxobj.h -$(PSSRC)igstate.h:$(GLSRC)gsnamecl.h $(PSSRC)igstate.h:$(GLSRC)gxstate.h +$(PSSRC)igstate.h:$(GLSRC)gsnamecl.h $(PSSRC)igstate.h:$(GLSRC)gxcspace.h +$(PSSRC)igstate.h:$(GLSRC)gscsel.h $(PSSRC)igstate.h:$(GLSRC)gsdcolor.h $(PSSRC)igstate.h:$(GLSRC)gxfrac.h +$(PSSRC)igstate.h:$(GLSRC)gxtmap.h $(PSSRC)igstate.h:$(GLSRC)gscms.h -$(PSSRC)igstate.h:$(GLSRC)gscspace.h -$(PSSRC)igstate.h:$(GLSRC)gsdevice.h -$(PSSRC)igstate.h:$(GLSRC)gxarith.h -$(PSSRC)igstate.h:$(GLSRC)gxhttile.h $(PSSRC)igstate.h:$(GLSRC)gslparam.h +$(PSSRC)igstate.h:$(GLSRC)gsdevice.h +$(PSSRC)igstate.h:$(GLSRC)gxbitfmt.h +$(PSSRC)igstate.h:$(GLSRC)gscpm.h +$(PSSRC)igstate.h:$(GLSRC)gscspace.h +$(PSSRC)igstate.h:$(GLSRC)gsgstate.h $(PSSRC)igstate.h:$(GLSRC)gsiparam.h -$(PSSRC)igstate.h:$(GLSRC)gxbitmap.h +$(PSSRC)igstate.h:$(GLSRC)gscompt.h $(PSSRC)igstate.h:$(GLSRC)gsmatrix.h -$(PSSRC)igstate.h:$(GLSRC)gscpm.h -$(PSSRC)igstate.h:$(GLSRC)gsrefct.h +$(PSSRC)igstate.h:$(GLSRC)gxhttile.h $(PSSRC)igstate.h:$(GLSRC)gsparam.h -$(PSSRC)igstate.h:$(GLSRC)gsccolor.h +$(PSSRC)igstate.h:$(GLSRC)gsrefct.h +$(PSSRC)igstate.h:$(GLSRC)memento.h $(PSSRC)igstate.h:$(GLSRC)gsstruct.h $(PSSRC)igstate.h:$(GLSRC)gxsync.h +$(PSSRC)igstate.h:$(GLSRC)gxbitmap.h $(PSSRC)igstate.h:$(GLSRC)scommon.h -$(PSSRC)igstate.h:$(GLSRC)memento.h -$(PSSRC)igstate.h:$(GLSRC)gscsel.h $(PSSRC)igstate.h:$(GLSRC)gsbitmap.h +$(PSSRC)igstate.h:$(GLSRC)gsccolor.h +$(PSSRC)igstate.h:$(GLSRC)gxarith.h +$(PSSRC)igstate.h:$(GLSRC)gpsync.h $(PSSRC)igstate.h:$(GLSRC)gsstype.h -$(PSSRC)igstate.h:$(GLSRC)gxtmap.h $(PSSRC)igstate.h:$(GLSRC)gsmemory.h -$(PSSRC)igstate.h:$(GLSRC)gpsync.h $(PSSRC)igstate.h:$(GLSRC)gslibctx.h -$(PSSRC)igstate.h:$(GLSRC)gs_dll_call.h $(PSSRC)igstate.h:$(GLSRC)gsalloc.h -$(PSSRC)igstate.h:$(GLSRC)stdio_.h -$(PSSRC)igstate.h:$(GLSRC)gscompt.h $(PSSRC)igstate.h:$(GLSRC)gxcindex.h -$(PSSRC)igstate.h:$(GLSRC)gsgstate.h +$(PSSRC)igstate.h:$(GLSRC)stdio_.h $(PSSRC)igstate.h:$(GLSRC)stdint_.h $(PSSRC)igstate.h:$(GLSRC)gssprintf.h -$(PSSRC)igstate.h:$(GLSRC)std.h $(PSSRC)igstate.h:$(GLSRC)gstypes.h +$(PSSRC)igstate.h:$(GLSRC)std.h $(PSSRC)igstate.h:$(GLSRC)stdpre.h $(PSSRC)igstate.h:$(GLGEN)arch.h +$(PSSRC)igstate.h:$(GLSRC)gs_dll_call.h $(PSSRC)iscan.h:$(PSSRC)iref.h $(PSSRC)iscan.h:$(GLSRC)sa85x.h $(PSSRC)iscan.h:$(GLSRC)sa85d.h @@ -5769,236 +5769,236 @@ $(PSSRC)iscan.h:$(GLSRC)gxalloc.h $(PSSRC)iscan.h:$(GLSRC)gxobj.h $(PSSRC)iscan.h:$(GLSRC)gsnamecl.h $(PSSRC)iscan.h:$(GLSRC)gxcspace.h +$(PSSRC)iscan.h:$(GLSRC)gscsel.h $(PSSRC)iscan.h:$(GLSRC)gsdcolor.h $(PSSRC)iscan.h:$(GLSRC)gxfrac.h $(PSSRC)iscan.h:$(GLSRC)gscms.h -$(PSSRC)iscan.h:$(GLSRC)gscspace.h $(PSSRC)iscan.h:$(GLSRC)gsdevice.h -$(PSSRC)iscan.h:$(GLSRC)gxarith.h -$(PSSRC)iscan.h:$(GLSRC)gxhttile.h +$(PSSRC)iscan.h:$(GLSRC)gscspace.h +$(PSSRC)iscan.h:$(GLSRC)gsgstate.h $(PSSRC)iscan.h:$(GLSRC)gsiparam.h -$(PSSRC)iscan.h:$(GLSRC)gxbitmap.h $(PSSRC)iscan.h:$(GLSRC)gsmatrix.h -$(PSSRC)iscan.h:$(GLSRC)gsrefct.h +$(PSSRC)iscan.h:$(GLSRC)gxhttile.h $(PSSRC)iscan.h:$(GLSRC)gsparam.h -$(PSSRC)iscan.h:$(GLSRC)gsccolor.h +$(PSSRC)iscan.h:$(GLSRC)gsrefct.h +$(PSSRC)iscan.h:$(GLSRC)memento.h $(PSSRC)iscan.h:$(GLSRC)gsstruct.h $(PSSRC)iscan.h:$(GLSRC)gxsync.h +$(PSSRC)iscan.h:$(GLSRC)gxbitmap.h $(PSSRC)iscan.h:$(GLSRC)scommon.h -$(PSSRC)iscan.h:$(GLSRC)memento.h -$(PSSRC)iscan.h:$(GLSRC)gscsel.h $(PSSRC)iscan.h:$(GLSRC)gsbitmap.h +$(PSSRC)iscan.h:$(GLSRC)gsccolor.h +$(PSSRC)iscan.h:$(GLSRC)gxarith.h +$(PSSRC)iscan.h:$(GLSRC)gpsync.h $(PSSRC)iscan.h:$(GLSRC)gsstype.h $(PSSRC)iscan.h:$(GLSRC)gsmemory.h -$(PSSRC)iscan.h:$(GLSRC)gpsync.h $(PSSRC)iscan.h:$(GLSRC)gslibctx.h -$(PSSRC)iscan.h:$(GLSRC)gs_dll_call.h $(PSSRC)iscan.h:$(GLSRC)gsalloc.h -$(PSSRC)iscan.h:$(GLSRC)stdio_.h $(PSSRC)iscan.h:$(GLSRC)gxcindex.h -$(PSSRC)iscan.h:$(GLSRC)gsgstate.h +$(PSSRC)iscan.h:$(GLSRC)stdio_.h $(PSSRC)iscan.h:$(GLSRC)stdint_.h $(PSSRC)iscan.h:$(GLSRC)gssprintf.h -$(PSSRC)iscan.h:$(GLSRC)std.h $(PSSRC)iscan.h:$(GLSRC)gstypes.h +$(PSSRC)iscan.h:$(GLSRC)std.h $(PSSRC)iscan.h:$(GLSRC)stdpre.h $(PSSRC)iscan.h:$(GLGEN)arch.h +$(PSSRC)iscan.h:$(GLSRC)gs_dll_call.h $(PSSRC)zfile.h:$(PSSRC)iref.h $(PSSRC)zfile.h:$(GLSRC)gxalloc.h $(PSSRC)zfile.h:$(GLSRC)gxobj.h $(PSSRC)zfile.h:$(GLSRC)gsnamecl.h $(PSSRC)zfile.h:$(GLSRC)gxcspace.h +$(PSSRC)zfile.h:$(GLSRC)gscsel.h $(PSSRC)zfile.h:$(GLSRC)gsdcolor.h $(PSSRC)zfile.h:$(GLSRC)gxfrac.h $(PSSRC)zfile.h:$(GLSRC)gscms.h -$(PSSRC)zfile.h:$(GLSRC)gscspace.h $(PSSRC)zfile.h:$(GLSRC)gsdevice.h -$(PSSRC)zfile.h:$(GLSRC)gxarith.h -$(PSSRC)zfile.h:$(GLSRC)gxhttile.h +$(PSSRC)zfile.h:$(GLSRC)gscspace.h +$(PSSRC)zfile.h:$(GLSRC)gsgstate.h $(PSSRC)zfile.h:$(GLSRC)gsiparam.h -$(PSSRC)zfile.h:$(GLSRC)gxbitmap.h $(PSSRC)zfile.h:$(GLSRC)gsmatrix.h -$(PSSRC)zfile.h:$(GLSRC)gsrefct.h +$(PSSRC)zfile.h:$(GLSRC)gxhttile.h $(PSSRC)zfile.h:$(GLSRC)gsparam.h -$(PSSRC)zfile.h:$(GLSRC)gsccolor.h +$(PSSRC)zfile.h:$(GLSRC)gsrefct.h +$(PSSRC)zfile.h:$(GLSRC)memento.h $(PSSRC)zfile.h:$(GLSRC)gsstruct.h $(PSSRC)zfile.h:$(GLSRC)gxsync.h +$(PSSRC)zfile.h:$(GLSRC)gxbitmap.h $(PSSRC)zfile.h:$(GLSRC)scommon.h -$(PSSRC)zfile.h:$(GLSRC)memento.h -$(PSSRC)zfile.h:$(GLSRC)gscsel.h -$(PSSRC)zfile.h:$(GLSRC)gsbitmap.h $(PSSRC)zfile.h:$(GLSRC)gsfname.h +$(PSSRC)zfile.h:$(GLSRC)gsbitmap.h +$(PSSRC)zfile.h:$(GLSRC)gsccolor.h +$(PSSRC)zfile.h:$(GLSRC)gxarith.h +$(PSSRC)zfile.h:$(GLSRC)gpsync.h $(PSSRC)zfile.h:$(GLSRC)gsstype.h $(PSSRC)zfile.h:$(GLSRC)gsmemory.h -$(PSSRC)zfile.h:$(GLSRC)gpsync.h $(PSSRC)zfile.h:$(GLSRC)gslibctx.h -$(PSSRC)zfile.h:$(GLSRC)gs_dll_call.h $(PSSRC)zfile.h:$(GLSRC)gsalloc.h -$(PSSRC)zfile.h:$(GLSRC)stdio_.h $(PSSRC)zfile.h:$(GLSRC)gxcindex.h -$(PSSRC)zfile.h:$(GLSRC)gsgstate.h +$(PSSRC)zfile.h:$(GLSRC)stdio_.h $(PSSRC)zfile.h:$(GLSRC)stdint_.h $(PSSRC)zfile.h:$(GLSRC)gssprintf.h -$(PSSRC)zfile.h:$(GLSRC)std.h $(PSSRC)zfile.h:$(GLSRC)gstypes.h +$(PSSRC)zfile.h:$(GLSRC)std.h $(PSSRC)zfile.h:$(GLSRC)stdpre.h $(PSSRC)zfile.h:$(GLGEN)arch.h +$(PSSRC)zfile.h:$(GLSRC)gs_dll_call.h $(PSSRC)ibnum.h:$(PSSRC)iref.h $(PSSRC)ibnum.h:$(GLSRC)gxalloc.h $(PSSRC)ibnum.h:$(GLSRC)gxobj.h $(PSSRC)ibnum.h:$(GLSRC)gsnamecl.h $(PSSRC)ibnum.h:$(GLSRC)gxcspace.h +$(PSSRC)ibnum.h:$(GLSRC)gscsel.h $(PSSRC)ibnum.h:$(GLSRC)gsdcolor.h $(PSSRC)ibnum.h:$(GLSRC)gxfrac.h $(PSSRC)ibnum.h:$(GLSRC)gscms.h -$(PSSRC)ibnum.h:$(GLSRC)gscspace.h $(PSSRC)ibnum.h:$(GLSRC)gsdevice.h -$(PSSRC)ibnum.h:$(GLSRC)gxarith.h -$(PSSRC)ibnum.h:$(GLSRC)gxhttile.h +$(PSSRC)ibnum.h:$(GLSRC)gscspace.h +$(PSSRC)ibnum.h:$(GLSRC)gsgstate.h $(PSSRC)ibnum.h:$(GLSRC)gsiparam.h -$(PSSRC)ibnum.h:$(GLSRC)gxbitmap.h $(PSSRC)ibnum.h:$(GLSRC)gsmatrix.h -$(PSSRC)ibnum.h:$(GLSRC)gsrefct.h +$(PSSRC)ibnum.h:$(GLSRC)gxhttile.h $(PSSRC)ibnum.h:$(GLSRC)gsparam.h -$(PSSRC)ibnum.h:$(GLSRC)gsccolor.h +$(PSSRC)ibnum.h:$(GLSRC)gsrefct.h +$(PSSRC)ibnum.h:$(GLSRC)memento.h $(PSSRC)ibnum.h:$(GLSRC)gsstruct.h $(PSSRC)ibnum.h:$(GLSRC)gxsync.h +$(PSSRC)ibnum.h:$(GLSRC)gxbitmap.h $(PSSRC)ibnum.h:$(GLSRC)scommon.h -$(PSSRC)ibnum.h:$(GLSRC)memento.h -$(PSSRC)ibnum.h:$(GLSRC)gscsel.h $(PSSRC)ibnum.h:$(GLSRC)gsbitmap.h +$(PSSRC)ibnum.h:$(GLSRC)gsccolor.h +$(PSSRC)ibnum.h:$(GLSRC)gxarith.h +$(PSSRC)ibnum.h:$(GLSRC)gpsync.h $(PSSRC)ibnum.h:$(GLSRC)gsstype.h $(PSSRC)ibnum.h:$(GLSRC)gsmemory.h -$(PSSRC)ibnum.h:$(GLSRC)gpsync.h $(PSSRC)ibnum.h:$(GLSRC)gslibctx.h -$(PSSRC)ibnum.h:$(GLSRC)gs_dll_call.h $(PSSRC)ibnum.h:$(GLSRC)gsalloc.h -$(PSSRC)ibnum.h:$(GLSRC)stdio_.h $(PSSRC)ibnum.h:$(GLSRC)gxcindex.h -$(PSSRC)ibnum.h:$(GLSRC)gsgstate.h +$(PSSRC)ibnum.h:$(GLSRC)stdio_.h $(PSSRC)ibnum.h:$(GLSRC)stdint_.h $(PSSRC)ibnum.h:$(GLSRC)gssprintf.h -$(PSSRC)ibnum.h:$(GLSRC)std.h $(PSSRC)ibnum.h:$(GLSRC)gstypes.h +$(PSSRC)ibnum.h:$(GLSRC)std.h $(PSSRC)ibnum.h:$(GLSRC)stdpre.h $(PSSRC)ibnum.h:$(GLGEN)arch.h +$(PSSRC)ibnum.h:$(GLSRC)gs_dll_call.h $(PSSRC)zcolor.h:$(PSSRC)iref.h $(PSSRC)zcolor.h:$(GLSRC)gxalloc.h $(PSSRC)zcolor.h:$(GLSRC)gxobj.h $(PSSRC)zcolor.h:$(GLSRC)gsnamecl.h $(PSSRC)zcolor.h:$(GLSRC)gxcspace.h +$(PSSRC)zcolor.h:$(GLSRC)gscsel.h $(PSSRC)zcolor.h:$(GLSRC)gsdcolor.h $(PSSRC)zcolor.h:$(GLSRC)gxfrac.h $(PSSRC)zcolor.h:$(GLSRC)gscms.h -$(PSSRC)zcolor.h:$(GLSRC)gscspace.h $(PSSRC)zcolor.h:$(GLSRC)gsdevice.h -$(PSSRC)zcolor.h:$(GLSRC)gxarith.h -$(PSSRC)zcolor.h:$(GLSRC)gxhttile.h +$(PSSRC)zcolor.h:$(GLSRC)gscspace.h +$(PSSRC)zcolor.h:$(GLSRC)gsgstate.h $(PSSRC)zcolor.h:$(GLSRC)gsiparam.h -$(PSSRC)zcolor.h:$(GLSRC)gxbitmap.h $(PSSRC)zcolor.h:$(GLSRC)gsmatrix.h -$(PSSRC)zcolor.h:$(GLSRC)gsrefct.h +$(PSSRC)zcolor.h:$(GLSRC)gxhttile.h $(PSSRC)zcolor.h:$(GLSRC)gsparam.h -$(PSSRC)zcolor.h:$(GLSRC)gsccolor.h +$(PSSRC)zcolor.h:$(GLSRC)gsrefct.h +$(PSSRC)zcolor.h:$(GLSRC)memento.h $(PSSRC)zcolor.h:$(GLSRC)gsstruct.h $(PSSRC)zcolor.h:$(GLSRC)gxsync.h +$(PSSRC)zcolor.h:$(GLSRC)gxbitmap.h $(PSSRC)zcolor.h:$(GLSRC)scommon.h -$(PSSRC)zcolor.h:$(GLSRC)memento.h -$(PSSRC)zcolor.h:$(GLSRC)gscsel.h $(PSSRC)zcolor.h:$(GLSRC)gsbitmap.h +$(PSSRC)zcolor.h:$(GLSRC)gsccolor.h +$(PSSRC)zcolor.h:$(GLSRC)gxarith.h +$(PSSRC)zcolor.h:$(GLSRC)gpsync.h $(PSSRC)zcolor.h:$(GLSRC)gsstype.h $(PSSRC)zcolor.h:$(GLSRC)gsmemory.h -$(PSSRC)zcolor.h:$(GLSRC)gpsync.h $(PSSRC)zcolor.h:$(GLSRC)gslibctx.h -$(PSSRC)zcolor.h:$(GLSRC)gs_dll_call.h $(PSSRC)zcolor.h:$(GLSRC)gsalloc.h -$(PSSRC)zcolor.h:$(GLSRC)stdio_.h $(PSSRC)zcolor.h:$(GLSRC)gxcindex.h -$(PSSRC)zcolor.h:$(GLSRC)gsgstate.h +$(PSSRC)zcolor.h:$(GLSRC)stdio_.h $(PSSRC)zcolor.h:$(GLSRC)stdint_.h $(PSSRC)zcolor.h:$(GLSRC)gssprintf.h -$(PSSRC)zcolor.h:$(GLSRC)std.h $(PSSRC)zcolor.h:$(GLSRC)gstypes.h +$(PSSRC)zcolor.h:$(GLSRC)std.h $(PSSRC)zcolor.h:$(GLSRC)stdpre.h $(PSSRC)zcolor.h:$(GLGEN)arch.h +$(PSSRC)zcolor.h:$(GLSRC)gs_dll_call.h $(PSSRC)zcie.h:$(PSSRC)iref.h $(PSSRC)zcie.h:$(GLSRC)gxalloc.h $(PSSRC)zcie.h:$(GLSRC)gxobj.h $(PSSRC)zcie.h:$(GLSRC)gsnamecl.h $(PSSRC)zcie.h:$(GLSRC)gxcspace.h +$(PSSRC)zcie.h:$(GLSRC)gscsel.h $(PSSRC)zcie.h:$(GLSRC)gsdcolor.h $(PSSRC)zcie.h:$(GLSRC)gxfrac.h $(PSSRC)zcie.h:$(GLSRC)gscms.h -$(PSSRC)zcie.h:$(GLSRC)gscspace.h $(PSSRC)zcie.h:$(GLSRC)gsdevice.h -$(PSSRC)zcie.h:$(GLSRC)gxarith.h -$(PSSRC)zcie.h:$(GLSRC)gxhttile.h +$(PSSRC)zcie.h:$(GLSRC)gscspace.h +$(PSSRC)zcie.h:$(GLSRC)gsgstate.h $(PSSRC)zcie.h:$(GLSRC)gsiparam.h -$(PSSRC)zcie.h:$(GLSRC)gxbitmap.h $(PSSRC)zcie.h:$(GLSRC)gsmatrix.h -$(PSSRC)zcie.h:$(GLSRC)gsrefct.h +$(PSSRC)zcie.h:$(GLSRC)gxhttile.h $(PSSRC)zcie.h:$(GLSRC)gsparam.h -$(PSSRC)zcie.h:$(GLSRC)gsccolor.h +$(PSSRC)zcie.h:$(GLSRC)gsrefct.h +$(PSSRC)zcie.h:$(GLSRC)memento.h $(PSSRC)zcie.h:$(GLSRC)gsstruct.h $(PSSRC)zcie.h:$(GLSRC)gxsync.h +$(PSSRC)zcie.h:$(GLSRC)gxbitmap.h $(PSSRC)zcie.h:$(GLSRC)scommon.h -$(PSSRC)zcie.h:$(GLSRC)memento.h -$(PSSRC)zcie.h:$(GLSRC)gscsel.h $(PSSRC)zcie.h:$(GLSRC)gsbitmap.h +$(PSSRC)zcie.h:$(GLSRC)gsccolor.h +$(PSSRC)zcie.h:$(GLSRC)gxarith.h +$(PSSRC)zcie.h:$(GLSRC)gpsync.h $(PSSRC)zcie.h:$(GLSRC)gsstype.h $(PSSRC)zcie.h:$(GLSRC)gsmemory.h -$(PSSRC)zcie.h:$(GLSRC)gpsync.h $(PSSRC)zcie.h:$(GLSRC)gslibctx.h -$(PSSRC)zcie.h:$(GLSRC)gs_dll_call.h $(PSSRC)zcie.h:$(GLSRC)gsalloc.h -$(PSSRC)zcie.h:$(GLSRC)stdio_.h $(PSSRC)zcie.h:$(GLSRC)gxcindex.h -$(PSSRC)zcie.h:$(GLSRC)gsgstate.h +$(PSSRC)zcie.h:$(GLSRC)stdio_.h $(PSSRC)zcie.h:$(GLSRC)stdint_.h $(PSSRC)zcie.h:$(GLSRC)gssprintf.h -$(PSSRC)zcie.h:$(GLSRC)std.h $(PSSRC)zcie.h:$(GLSRC)gstypes.h +$(PSSRC)zcie.h:$(GLSRC)std.h $(PSSRC)zcie.h:$(GLSRC)stdpre.h $(PSSRC)zcie.h:$(GLGEN)arch.h +$(PSSRC)zcie.h:$(GLSRC)gs_dll_call.h $(PSSRC)zicc.h:$(PSSRC)iref.h $(PSSRC)zicc.h:$(GLSRC)gxalloc.h $(PSSRC)zicc.h:$(GLSRC)gxobj.h $(PSSRC)zicc.h:$(GLSRC)gsnamecl.h $(PSSRC)zicc.h:$(GLSRC)gxcspace.h +$(PSSRC)zicc.h:$(GLSRC)gscsel.h $(PSSRC)zicc.h:$(GLSRC)gsdcolor.h $(PSSRC)zicc.h:$(GLSRC)gxfrac.h $(PSSRC)zicc.h:$(GLSRC)gscms.h -$(PSSRC)zicc.h:$(GLSRC)gscspace.h $(PSSRC)zicc.h:$(GLSRC)gsdevice.h -$(PSSRC)zicc.h:$(GLSRC)gxarith.h -$(PSSRC)zicc.h:$(GLSRC)gxhttile.h +$(PSSRC)zicc.h:$(GLSRC)gscspace.h +$(PSSRC)zicc.h:$(GLSRC)gsgstate.h $(PSSRC)zicc.h:$(GLSRC)gsiparam.h -$(PSSRC)zicc.h:$(GLSRC)gxbitmap.h $(PSSRC)zicc.h:$(GLSRC)gsmatrix.h -$(PSSRC)zicc.h:$(GLSRC)gsrefct.h +$(PSSRC)zicc.h:$(GLSRC)gxhttile.h $(PSSRC)zicc.h:$(GLSRC)gsparam.h -$(PSSRC)zicc.h:$(GLSRC)gsccolor.h +$(PSSRC)zicc.h:$(GLSRC)gsrefct.h +$(PSSRC)zicc.h:$(GLSRC)memento.h $(PSSRC)zicc.h:$(GLSRC)gsstruct.h $(PSSRC)zicc.h:$(GLSRC)gxsync.h +$(PSSRC)zicc.h:$(GLSRC)gxbitmap.h $(PSSRC)zicc.h:$(GLSRC)scommon.h -$(PSSRC)zicc.h:$(GLSRC)memento.h -$(PSSRC)zicc.h:$(GLSRC)gscsel.h $(PSSRC)zicc.h:$(GLSRC)gsbitmap.h +$(PSSRC)zicc.h:$(GLSRC)gsccolor.h +$(PSSRC)zicc.h:$(GLSRC)gxarith.h +$(PSSRC)zicc.h:$(GLSRC)gpsync.h $(PSSRC)zicc.h:$(GLSRC)gsstype.h $(PSSRC)zicc.h:$(GLSRC)gsmemory.h -$(PSSRC)zicc.h:$(GLSRC)gpsync.h $(PSSRC)zicc.h:$(GLSRC)gslibctx.h -$(PSSRC)zicc.h:$(GLSRC)gs_dll_call.h $(PSSRC)zicc.h:$(GLSRC)gsalloc.h -$(PSSRC)zicc.h:$(GLSRC)stdio_.h $(PSSRC)zicc.h:$(GLSRC)gxcindex.h -$(PSSRC)zicc.h:$(GLSRC)gsgstate.h +$(PSSRC)zicc.h:$(GLSRC)stdio_.h $(PSSRC)zicc.h:$(GLSRC)stdint_.h $(PSSRC)zicc.h:$(GLSRC)gssprintf.h -$(PSSRC)zicc.h:$(GLSRC)std.h $(PSSRC)zicc.h:$(GLSRC)gstypes.h +$(PSSRC)zicc.h:$(GLSRC)std.h $(PSSRC)zicc.h:$(GLSRC)stdpre.h $(PSSRC)zicc.h:$(GLGEN)arch.h +$(PSSRC)zicc.h:$(GLSRC)gs_dll_call.h $(PSSRC)zfrsd.h:$(PSSRC)iostack.h $(PSSRC)zfrsd.h:$(PSSRC)istack.h $(PSSRC)zfrsd.h:$(PSSRC)iosdata.h @@ -6011,161 +6011,161 @@ $(PSSRC)zfrsd.h:$(GLSRC)gxalloc.h $(PSSRC)zfrsd.h:$(GLSRC)gxobj.h $(PSSRC)zfrsd.h:$(GLSRC)gsnamecl.h $(PSSRC)zfrsd.h:$(GLSRC)gxcspace.h +$(PSSRC)zfrsd.h:$(GLSRC)gscsel.h $(PSSRC)zfrsd.h:$(GLSRC)gsdcolor.h $(PSSRC)zfrsd.h:$(GLSRC)gxfrac.h $(PSSRC)zfrsd.h:$(GLSRC)gscms.h -$(PSSRC)zfrsd.h:$(GLSRC)gscspace.h $(PSSRC)zfrsd.h:$(GLSRC)gsdevice.h -$(PSSRC)zfrsd.h:$(GLSRC)gxarith.h -$(PSSRC)zfrsd.h:$(GLSRC)gxhttile.h +$(PSSRC)zfrsd.h:$(GLSRC)gscspace.h +$(PSSRC)zfrsd.h:$(GLSRC)gsgstate.h $(PSSRC)zfrsd.h:$(GLSRC)gsiparam.h -$(PSSRC)zfrsd.h:$(GLSRC)gxbitmap.h $(PSSRC)zfrsd.h:$(GLSRC)gsmatrix.h -$(PSSRC)zfrsd.h:$(GLSRC)gsrefct.h +$(PSSRC)zfrsd.h:$(GLSRC)gxhttile.h $(PSSRC)zfrsd.h:$(GLSRC)gsparam.h -$(PSSRC)zfrsd.h:$(GLSRC)gsccolor.h +$(PSSRC)zfrsd.h:$(GLSRC)gsrefct.h +$(PSSRC)zfrsd.h:$(GLSRC)memento.h $(PSSRC)zfrsd.h:$(GLSRC)gsstruct.h $(PSSRC)zfrsd.h:$(GLSRC)gxsync.h +$(PSSRC)zfrsd.h:$(GLSRC)gxbitmap.h $(PSSRC)zfrsd.h:$(GLSRC)scommon.h -$(PSSRC)zfrsd.h:$(GLSRC)memento.h -$(PSSRC)zfrsd.h:$(GLSRC)gscsel.h $(PSSRC)zfrsd.h:$(GLSRC)gsbitmap.h +$(PSSRC)zfrsd.h:$(GLSRC)gsccolor.h +$(PSSRC)zfrsd.h:$(GLSRC)gxarith.h +$(PSSRC)zfrsd.h:$(GLSRC)gpsync.h $(PSSRC)zfrsd.h:$(GLSRC)gsstype.h $(PSSRC)zfrsd.h:$(GLSRC)gsmemory.h -$(PSSRC)zfrsd.h:$(GLSRC)gpsync.h $(PSSRC)zfrsd.h:$(GLSRC)gslibctx.h -$(PSSRC)zfrsd.h:$(GLSRC)gs_dll_call.h $(PSSRC)zfrsd.h:$(GLSRC)gsalloc.h -$(PSSRC)zfrsd.h:$(GLSRC)stdio_.h $(PSSRC)zfrsd.h:$(GLSRC)gxcindex.h -$(PSSRC)zfrsd.h:$(GLSRC)gsgstate.h +$(PSSRC)zfrsd.h:$(GLSRC)stdio_.h $(PSSRC)zfrsd.h:$(GLSRC)stdint_.h $(PSSRC)zfrsd.h:$(GLSRC)gssprintf.h -$(PSSRC)zfrsd.h:$(GLSRC)std.h $(PSSRC)zfrsd.h:$(GLSRC)gstypes.h +$(PSSRC)zfrsd.h:$(GLSRC)std.h $(PSSRC)zfrsd.h:$(GLSRC)stdpre.h $(PSSRC)zfrsd.h:$(GLGEN)arch.h +$(PSSRC)zfrsd.h:$(GLSRC)gs_dll_call.h $(PSSRC)dscparse.h:$(GLSRC)stdpre.h $(PSSRC)ifunc.h:$(PSSRC)iref.h $(PSSRC)ifunc.h:$(GLSRC)gxalloc.h $(PSSRC)ifunc.h:$(GLSRC)gxobj.h $(PSSRC)ifunc.h:$(GLSRC)gsnamecl.h -$(PSSRC)ifunc.h:$(GLSRC)gxcspace.h $(PSSRC)ifunc.h:$(GLSRC)gsfunc.h +$(PSSRC)ifunc.h:$(GLSRC)gxcspace.h +$(PSSRC)ifunc.h:$(GLSRC)gscsel.h $(PSSRC)ifunc.h:$(GLSRC)gsdcolor.h $(PSSRC)ifunc.h:$(GLSRC)gxfrac.h $(PSSRC)ifunc.h:$(GLSRC)gscms.h -$(PSSRC)ifunc.h:$(GLSRC)gscspace.h $(PSSRC)ifunc.h:$(GLSRC)gsdevice.h -$(PSSRC)ifunc.h:$(GLSRC)gxarith.h -$(PSSRC)ifunc.h:$(GLSRC)gxhttile.h -$(PSSRC)ifunc.h:$(GLSRC)gsiparam.h +$(PSSRC)ifunc.h:$(GLSRC)gscspace.h +$(PSSRC)ifunc.h:$(GLSRC)gsgstate.h $(PSSRC)ifunc.h:$(GLSRC)gsdsrc.h -$(PSSRC)ifunc.h:$(GLSRC)gxbitmap.h +$(PSSRC)ifunc.h:$(GLSRC)gsiparam.h $(PSSRC)ifunc.h:$(GLSRC)gsmatrix.h -$(PSSRC)ifunc.h:$(GLSRC)gsrefct.h +$(PSSRC)ifunc.h:$(GLSRC)gxhttile.h $(PSSRC)ifunc.h:$(GLSRC)gsparam.h -$(PSSRC)ifunc.h:$(GLSRC)gsccolor.h +$(PSSRC)ifunc.h:$(GLSRC)gsrefct.h +$(PSSRC)ifunc.h:$(GLSRC)memento.h $(PSSRC)ifunc.h:$(GLSRC)gsstruct.h $(PSSRC)ifunc.h:$(GLSRC)gxsync.h +$(PSSRC)ifunc.h:$(GLSRC)gxbitmap.h $(PSSRC)ifunc.h:$(GLSRC)scommon.h -$(PSSRC)ifunc.h:$(GLSRC)memento.h -$(PSSRC)ifunc.h:$(GLSRC)gscsel.h $(PSSRC)ifunc.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifunc.h:$(GLSRC)gsccolor.h +$(PSSRC)ifunc.h:$(GLSRC)gxarith.h +$(PSSRC)ifunc.h:$(GLSRC)gpsync.h $(PSSRC)ifunc.h:$(GLSRC)gsstype.h $(PSSRC)ifunc.h:$(GLSRC)gsmemory.h -$(PSSRC)ifunc.h:$(GLSRC)gpsync.h $(PSSRC)ifunc.h:$(GLSRC)gslibctx.h -$(PSSRC)ifunc.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifunc.h:$(GLSRC)gsalloc.h -$(PSSRC)ifunc.h:$(GLSRC)stdio_.h $(PSSRC)ifunc.h:$(GLSRC)gxcindex.h -$(PSSRC)ifunc.h:$(GLSRC)gsgstate.h +$(PSSRC)ifunc.h:$(GLSRC)stdio_.h $(PSSRC)ifunc.h:$(GLSRC)stdint_.h $(PSSRC)ifunc.h:$(GLSRC)gssprintf.h -$(PSSRC)ifunc.h:$(GLSRC)std.h $(PSSRC)ifunc.h:$(GLSRC)gstypes.h +$(PSSRC)ifunc.h:$(GLSRC)std.h $(PSSRC)ifunc.h:$(GLSRC)stdpre.h $(PSSRC)ifunc.h:$(GLGEN)arch.h +$(PSSRC)ifunc.h:$(GLSRC)gs_dll_call.h $(PSSRC)ivmem2.h:$(PSSRC)iref.h $(PSSRC)ivmem2.h:$(GLSRC)gxalloc.h $(PSSRC)ivmem2.h:$(GLSRC)gxobj.h $(PSSRC)ivmem2.h:$(GLSRC)gsnamecl.h $(PSSRC)ivmem2.h:$(GLSRC)gxcspace.h +$(PSSRC)ivmem2.h:$(GLSRC)gscsel.h $(PSSRC)ivmem2.h:$(GLSRC)gsdcolor.h $(PSSRC)ivmem2.h:$(GLSRC)gxfrac.h $(PSSRC)ivmem2.h:$(GLSRC)gscms.h -$(PSSRC)ivmem2.h:$(GLSRC)gscspace.h $(PSSRC)ivmem2.h:$(GLSRC)gsdevice.h -$(PSSRC)ivmem2.h:$(GLSRC)gxarith.h -$(PSSRC)ivmem2.h:$(GLSRC)gxhttile.h +$(PSSRC)ivmem2.h:$(GLSRC)gscspace.h +$(PSSRC)ivmem2.h:$(GLSRC)gsgstate.h $(PSSRC)ivmem2.h:$(GLSRC)gsiparam.h -$(PSSRC)ivmem2.h:$(GLSRC)gxbitmap.h $(PSSRC)ivmem2.h:$(GLSRC)gsmatrix.h -$(PSSRC)ivmem2.h:$(GLSRC)gsrefct.h +$(PSSRC)ivmem2.h:$(GLSRC)gxhttile.h $(PSSRC)ivmem2.h:$(GLSRC)gsparam.h -$(PSSRC)ivmem2.h:$(GLSRC)gsccolor.h +$(PSSRC)ivmem2.h:$(GLSRC)gsrefct.h +$(PSSRC)ivmem2.h:$(GLSRC)memento.h $(PSSRC)ivmem2.h:$(GLSRC)gsstruct.h $(PSSRC)ivmem2.h:$(GLSRC)gxsync.h +$(PSSRC)ivmem2.h:$(GLSRC)gxbitmap.h $(PSSRC)ivmem2.h:$(GLSRC)scommon.h -$(PSSRC)ivmem2.h:$(GLSRC)memento.h -$(PSSRC)ivmem2.h:$(GLSRC)gscsel.h $(PSSRC)ivmem2.h:$(GLSRC)gsbitmap.h +$(PSSRC)ivmem2.h:$(GLSRC)gsccolor.h +$(PSSRC)ivmem2.h:$(GLSRC)gxarith.h +$(PSSRC)ivmem2.h:$(GLSRC)gpsync.h $(PSSRC)ivmem2.h:$(GLSRC)gsstype.h $(PSSRC)ivmem2.h:$(GLSRC)gsmemory.h -$(PSSRC)ivmem2.h:$(GLSRC)gpsync.h $(PSSRC)ivmem2.h:$(GLSRC)gslibctx.h -$(PSSRC)ivmem2.h:$(GLSRC)gs_dll_call.h $(PSSRC)ivmem2.h:$(GLSRC)gsalloc.h -$(PSSRC)ivmem2.h:$(GLSRC)stdio_.h $(PSSRC)ivmem2.h:$(GLSRC)gxcindex.h -$(PSSRC)ivmem2.h:$(GLSRC)gsgstate.h +$(PSSRC)ivmem2.h:$(GLSRC)stdio_.h $(PSSRC)ivmem2.h:$(GLSRC)stdint_.h $(PSSRC)ivmem2.h:$(GLSRC)gssprintf.h -$(PSSRC)ivmem2.h:$(GLSRC)std.h $(PSSRC)ivmem2.h:$(GLSRC)gstypes.h +$(PSSRC)ivmem2.h:$(GLSRC)std.h $(PSSRC)ivmem2.h:$(GLSRC)stdpre.h $(PSSRC)ivmem2.h:$(GLGEN)arch.h -$(PSSRC)icid.h:$(GLSRC)gxcid.h +$(PSSRC)ivmem2.h:$(GLSRC)gs_dll_call.h $(PSSRC)icid.h:$(PSSRC)iref.h $(PSSRC)icid.h:$(GLSRC)gxalloc.h $(PSSRC)icid.h:$(GLSRC)gxobj.h $(PSSRC)icid.h:$(GLSRC)gsnamecl.h $(PSSRC)icid.h:$(GLSRC)gxcspace.h +$(PSSRC)icid.h:$(GLSRC)gscsel.h $(PSSRC)icid.h:$(GLSRC)gsdcolor.h $(PSSRC)icid.h:$(GLSRC)gxfrac.h $(PSSRC)icid.h:$(GLSRC)gscms.h -$(PSSRC)icid.h:$(GLSRC)gscspace.h $(PSSRC)icid.h:$(GLSRC)gsdevice.h -$(PSSRC)icid.h:$(GLSRC)gxarith.h -$(PSSRC)icid.h:$(GLSRC)gxhttile.h +$(PSSRC)icid.h:$(GLSRC)gscspace.h +$(PSSRC)icid.h:$(GLSRC)gsgstate.h +$(PSSRC)icid.h:$(GLSRC)gxcid.h $(PSSRC)icid.h:$(GLSRC)gsiparam.h -$(PSSRC)icid.h:$(GLSRC)gxbitmap.h $(PSSRC)icid.h:$(GLSRC)gsmatrix.h -$(PSSRC)icid.h:$(GLSRC)gsrefct.h +$(PSSRC)icid.h:$(GLSRC)gxhttile.h $(PSSRC)icid.h:$(GLSRC)gsparam.h -$(PSSRC)icid.h:$(GLSRC)gsccolor.h +$(PSSRC)icid.h:$(GLSRC)gsrefct.h +$(PSSRC)icid.h:$(GLSRC)memento.h $(PSSRC)icid.h:$(GLSRC)gsstruct.h $(PSSRC)icid.h:$(GLSRC)gxsync.h +$(PSSRC)icid.h:$(GLSRC)gxbitmap.h $(PSSRC)icid.h:$(GLSRC)scommon.h -$(PSSRC)icid.h:$(GLSRC)memento.h -$(PSSRC)icid.h:$(GLSRC)gscsel.h $(PSSRC)icid.h:$(GLSRC)gsbitmap.h +$(PSSRC)icid.h:$(GLSRC)gsccolor.h +$(PSSRC)icid.h:$(GLSRC)gxarith.h +$(PSSRC)icid.h:$(GLSRC)gpsync.h $(PSSRC)icid.h:$(GLSRC)gsstype.h $(PSSRC)icid.h:$(GLSRC)gsmemory.h -$(PSSRC)icid.h:$(GLSRC)gpsync.h $(PSSRC)icid.h:$(GLSRC)gslibctx.h -$(PSSRC)icid.h:$(GLSRC)gs_dll_call.h $(PSSRC)icid.h:$(GLSRC)gsalloc.h -$(PSSRC)icid.h:$(GLSRC)stdio_.h $(PSSRC)icid.h:$(GLSRC)gxcindex.h -$(PSSRC)icid.h:$(GLSRC)gsgstate.h +$(PSSRC)icid.h:$(GLSRC)stdio_.h $(PSSRC)icid.h:$(GLSRC)stdint_.h $(PSSRC)icid.h:$(GLSRC)gssprintf.h -$(PSSRC)icid.h:$(GLSRC)std.h $(PSSRC)icid.h:$(GLSRC)gstypes.h +$(PSSRC)icid.h:$(GLSRC)std.h $(PSSRC)icid.h:$(GLSRC)stdpre.h $(PSSRC)icid.h:$(GLGEN)arch.h +$(PSSRC)icid.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifcid.h:$(GLSRC)gxfcid.h $(PSSRC)ifcid.h:$(PSSRC)icid.h $(PSSRC)ifcid.h:$(GLSRC)gstype1.h @@ -6174,259 +6174,294 @@ $(PSSRC)ifcid.h:$(GLSRC)gxfont.h $(PSSRC)ifcid.h:$(PSSRC)iostack.h $(PSSRC)ifcid.h:$(GLSRC)gspath.h $(PSSRC)ifcid.h:$(PSSRC)istack.h -$(PSSRC)ifcid.h:$(GLSRC)gxcid.h -$(PSSRC)ifcid.h:$(GLSRC)gxmatrix.h $(PSSRC)ifcid.h:$(GLSRC)gsgdata.h $(PSSRC)ifcid.h:$(PSSRC)iosdata.h -$(PSSRC)ifcid.h:$(GLSRC)gsgcache.h +$(PSSRC)ifcid.h:$(GLSRC)gxmatrix.h $(PSSRC)ifcid.h:$(GLSRC)gxfapi.h -$(PSSRC)ifcid.h:$(GLSRC)gsnotify.h -$(PSSRC)ifcid.h:$(GLSRC)gsfcmap.h $(PSSRC)ifcid.h:$(PSSRC)isdata.h $(PSSRC)ifcid.h:$(PSSRC)imemory.h +$(PSSRC)ifcid.h:$(GLSRC)gsfcmap.h $(PSSRC)ifcid.h:$(PSSRC)ivmspace.h $(PSSRC)ifcid.h:$(PSSRC)iref.h $(PSSRC)ifcid.h:$(GLSRC)gsgc.h $(PSSRC)ifcid.h:$(GLSRC)gxalloc.h -$(PSSRC)ifcid.h:$(GLSRC)gstext.h $(PSSRC)ifcid.h:$(GLSRC)gxobj.h +$(PSSRC)ifcid.h:$(GLSRC)gstext.h $(PSSRC)ifcid.h:$(GLSRC)gsnamecl.h -$(PSSRC)ifcid.h:$(GLSRC)gxfcache.h $(PSSRC)ifcid.h:$(GLSRC)gxcspace.h -$(PSSRC)ifcid.h:$(GLSRC)gsuid.h -$(PSSRC)ifcid.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifcid.h:$(GLSRC)gscsel.h +$(PSSRC)ifcid.h:$(GLSRC)gxfcache.h $(PSSRC)ifcid.h:$(GLSRC)gsfont.h -$(PSSRC)ifcid.h:$(GLSRC)gxftype.h +$(PSSRC)ifcid.h:$(GLSRC)gsdcolor.h +$(PSSRC)ifcid.h:$(GLSRC)gxbcache.h +$(PSSRC)ifcid.h:$(GLSRC)gxpath.h $(PSSRC)ifcid.h:$(GLSRC)gxfrac.h +$(PSSRC)ifcid.h:$(GLSRC)gxftype.h $(PSSRC)ifcid.h:$(GLSRC)gscms.h -$(PSSRC)ifcid.h:$(GLSRC)gscspace.h -$(PSSRC)ifcid.h:$(GLSRC)gxpath.h -$(PSSRC)ifcid.h:$(GLSRC)gxbcache.h -$(PSSRC)ifcid.h:$(GLSRC)gsdevice.h -$(PSSRC)ifcid.h:$(GLSRC)gxarith.h -$(PSSRC)ifcid.h:$(GLSRC)gspenum.h -$(PSSRC)ifcid.h:$(GLSRC)gxhttile.h $(PSSRC)ifcid.h:$(GLSRC)gsrect.h $(PSSRC)ifcid.h:$(GLSRC)gslparam.h +$(PSSRC)ifcid.h:$(GLSRC)gsdevice.h +$(PSSRC)ifcid.h:$(GLSRC)gscpm.h +$(PSSRC)ifcid.h:$(GLSRC)gsgcache.h +$(PSSRC)ifcid.h:$(GLSRC)gscspace.h +$(PSSRC)ifcid.h:$(GLSRC)gsgstate.h +$(PSSRC)ifcid.h:$(GLSRC)gsnotify.h $(PSSRC)ifcid.h:$(GLSRC)gsxfont.h +$(PSSRC)ifcid.h:$(GLSRC)gxcid.h $(PSSRC)ifcid.h:$(GLSRC)gsiparam.h -$(PSSRC)ifcid.h:$(GLSRC)gxbitmap.h -$(PSSRC)ifcid.h:$(GLSRC)gsmatrix.h -$(PSSRC)ifcid.h:$(GLSRC)gscpm.h $(PSSRC)ifcid.h:$(GLSRC)gxfixed.h -$(PSSRC)ifcid.h:$(GLSRC)gsrefct.h +$(PSSRC)ifcid.h:$(GLSRC)gsmatrix.h +$(PSSRC)ifcid.h:$(GLSRC)gspenum.h +$(PSSRC)ifcid.h:$(GLSRC)gxhttile.h $(PSSRC)ifcid.h:$(GLSRC)gsparam.h -$(PSSRC)ifcid.h:$(GLSRC)gsccolor.h +$(PSSRC)ifcid.h:$(GLSRC)gsrefct.h +$(PSSRC)ifcid.h:$(GLSRC)memento.h +$(PSSRC)ifcid.h:$(GLSRC)gsuid.h $(PSSRC)ifcid.h:$(GLSRC)gsstruct.h $(PSSRC)ifcid.h:$(GLSRC)gxsync.h +$(PSSRC)ifcid.h:$(GLSRC)gxbitmap.h $(PSSRC)ifcid.h:$(GLSRC)scommon.h -$(PSSRC)ifcid.h:$(GLSRC)memento.h -$(PSSRC)ifcid.h:$(GLSRC)gscsel.h $(PSSRC)ifcid.h:$(GLSRC)gsbitmap.h +$(PSSRC)ifcid.h:$(GLSRC)gsccolor.h +$(PSSRC)ifcid.h:$(GLSRC)gxarith.h +$(PSSRC)ifcid.h:$(GLSRC)gpsync.h $(PSSRC)ifcid.h:$(GLSRC)gsstype.h $(PSSRC)ifcid.h:$(GLSRC)gsmemory.h -$(PSSRC)ifcid.h:$(GLSRC)gpsync.h $(PSSRC)ifcid.h:$(GLSRC)gslibctx.h -$(PSSRC)ifcid.h:$(GLSRC)gs_dll_call.h $(PSSRC)ifcid.h:$(GLSRC)gsalloc.h -$(PSSRC)ifcid.h:$(GLSRC)stdio_.h $(PSSRC)ifcid.h:$(GLSRC)gxcindex.h -$(PSSRC)ifcid.h:$(GLSRC)gsgstate.h +$(PSSRC)ifcid.h:$(GLSRC)stdio_.h +$(PSSRC)ifcid.h:$(GLSRC)gsccode.h $(PSSRC)ifcid.h:$(GLSRC)stdint_.h $(PSSRC)ifcid.h:$(GLSRC)gssprintf.h -$(PSSRC)ifcid.h:$(GLSRC)gsccode.h -$(PSSRC)ifcid.h:$(GLSRC)std.h $(PSSRC)ifcid.h:$(GLSRC)gstypes.h +$(PSSRC)ifcid.h:$(GLSRC)std.h $(PSSRC)ifcid.h:$(GLSRC)stdpre.h $(PSSRC)ifcid.h:$(GLGEN)arch.h +$(PSSRC)ifcid.h:$(GLSRC)gs_dll_call.h $(PSSRC)icie.h:$(PSSRC)igstate.h $(PSSRC)icie.h:$(GLSRC)gsstate.h $(PSSRC)icie.h:$(GLSRC)gsovrc.h $(PSSRC)icie.h:$(GLSRC)gscolor.h -$(PSSRC)icie.h:$(GLSRC)gxcomp.h $(PSSRC)icie.h:$(GLSRC)gsline.h +$(PSSRC)icie.h:$(GLSRC)gxcomp.h $(PSSRC)icie.h:$(PSSRC)istruct.h -$(PSSRC)icie.h:$(GLSRC)gxbitfmt.h $(PSSRC)icie.h:$(PSSRC)imemory.h -$(PSSRC)icie.h:$(PSSRC)ivmspace.h $(PSSRC)icie.h:$(GLSRC)gsht.h +$(PSSRC)icie.h:$(PSSRC)ivmspace.h $(PSSRC)icie.h:$(PSSRC)iref.h $(PSSRC)icie.h:$(GLSRC)gsgc.h -$(PSSRC)icie.h:$(GLSRC)gxalloc.h $(PSSRC)icie.h:$(GLSRC)gscie.h +$(PSSRC)icie.h:$(GLSRC)gxalloc.h $(PSSRC)icie.h:$(GLSRC)gxobj.h -$(PSSRC)icie.h:$(GLSRC)gsnamecl.h $(PSSRC)icie.h:$(GLSRC)gxstate.h +$(PSSRC)icie.h:$(GLSRC)gsnamecl.h $(PSSRC)icie.h:$(GLSRC)gxcspace.h $(PSSRC)icie.h:$(GLSRC)gxctable.h +$(PSSRC)icie.h:$(GLSRC)gscsel.h $(PSSRC)icie.h:$(GLSRC)gsdcolor.h $(PSSRC)icie.h:$(GLSRC)gxfrac.h +$(PSSRC)icie.h:$(GLSRC)gxtmap.h $(PSSRC)icie.h:$(GLSRC)gscms.h -$(PSSRC)icie.h:$(GLSRC)gscspace.h -$(PSSRC)icie.h:$(GLSRC)gsdevice.h -$(PSSRC)icie.h:$(GLSRC)gxarith.h -$(PSSRC)icie.h:$(GLSRC)gxhttile.h $(PSSRC)icie.h:$(GLSRC)gslparam.h -$(PSSRC)icie.h:$(GLSRC)gsiparam.h -$(PSSRC)icie.h:$(GLSRC)gxbitmap.h -$(PSSRC)icie.h:$(GLSRC)gsmatrix.h +$(PSSRC)icie.h:$(GLSRC)gsdevice.h +$(PSSRC)icie.h:$(GLSRC)gxbitfmt.h $(PSSRC)icie.h:$(GLSRC)gscpm.h +$(PSSRC)icie.h:$(GLSRC)gscspace.h +$(PSSRC)icie.h:$(GLSRC)gsgstate.h +$(PSSRC)icie.h:$(GLSRC)gsiparam.h $(PSSRC)icie.h:$(GLSRC)gxfixed.h -$(PSSRC)icie.h:$(GLSRC)gsrefct.h +$(PSSRC)icie.h:$(GLSRC)gscompt.h +$(PSSRC)icie.h:$(GLSRC)gsmatrix.h +$(PSSRC)icie.h:$(GLSRC)gxhttile.h $(PSSRC)icie.h:$(GLSRC)gsparam.h -$(PSSRC)icie.h:$(GLSRC)gsccolor.h +$(PSSRC)icie.h:$(GLSRC)gsrefct.h +$(PSSRC)icie.h:$(GLSRC)memento.h $(PSSRC)icie.h:$(GLSRC)gsstruct.h $(PSSRC)icie.h:$(GLSRC)gxsync.h +$(PSSRC)icie.h:$(GLSRC)gxbitmap.h $(PSSRC)icie.h:$(GLSRC)scommon.h -$(PSSRC)icie.h:$(GLSRC)memento.h -$(PSSRC)icie.h:$(GLSRC)gscsel.h $(PSSRC)icie.h:$(GLSRC)gsbitmap.h +$(PSSRC)icie.h:$(GLSRC)gsccolor.h +$(PSSRC)icie.h:$(GLSRC)gxarith.h +$(PSSRC)icie.h:$(GLSRC)gpsync.h $(PSSRC)icie.h:$(GLSRC)gsstype.h -$(PSSRC)icie.h:$(GLSRC)gxtmap.h $(PSSRC)icie.h:$(GLSRC)gsmemory.h -$(PSSRC)icie.h:$(GLSRC)gpsync.h $(PSSRC)icie.h:$(GLSRC)gslibctx.h -$(PSSRC)icie.h:$(GLSRC)gs_dll_call.h $(PSSRC)icie.h:$(GLSRC)gsalloc.h -$(PSSRC)icie.h:$(GLSRC)stdio_.h -$(PSSRC)icie.h:$(GLSRC)gscompt.h $(PSSRC)icie.h:$(GLSRC)gxcindex.h -$(PSSRC)icie.h:$(GLSRC)gsgstate.h +$(PSSRC)icie.h:$(GLSRC)stdio_.h $(PSSRC)icie.h:$(GLSRC)stdint_.h $(PSSRC)icie.h:$(GLSRC)gssprintf.h -$(PSSRC)icie.h:$(GLSRC)std.h $(PSSRC)icie.h:$(GLSRC)gstypes.h +$(PSSRC)icie.h:$(GLSRC)std.h $(PSSRC)icie.h:$(GLSRC)stdpre.h $(PSSRC)icie.h:$(GLGEN)arch.h +$(PSSRC)icie.h:$(GLSRC)gs_dll_call.h $(PSSRC)ipcolor.h:$(PSSRC)iref.h $(PSSRC)ipcolor.h:$(GLSRC)gxalloc.h $(PSSRC)ipcolor.h:$(GLSRC)gxobj.h $(PSSRC)ipcolor.h:$(GLSRC)gsnamecl.h $(PSSRC)ipcolor.h:$(GLSRC)gxcspace.h +$(PSSRC)ipcolor.h:$(GLSRC)gscsel.h $(PSSRC)ipcolor.h:$(GLSRC)gsdcolor.h $(PSSRC)ipcolor.h:$(GLSRC)gxfrac.h $(PSSRC)ipcolor.h:$(GLSRC)gscms.h -$(PSSRC)ipcolor.h:$(GLSRC)gscspace.h $(PSSRC)ipcolor.h:$(GLSRC)gsdevice.h -$(PSSRC)ipcolor.h:$(GLSRC)gxarith.h -$(PSSRC)ipcolor.h:$(GLSRC)gxhttile.h +$(PSSRC)ipcolor.h:$(GLSRC)gscspace.h +$(PSSRC)ipcolor.h:$(GLSRC)gsgstate.h $(PSSRC)ipcolor.h:$(GLSRC)gsiparam.h -$(PSSRC)ipcolor.h:$(GLSRC)gxbitmap.h $(PSSRC)ipcolor.h:$(GLSRC)gsmatrix.h -$(PSSRC)ipcolor.h:$(GLSRC)gsrefct.h +$(PSSRC)ipcolor.h:$(GLSRC)gxhttile.h $(PSSRC)ipcolor.h:$(GLSRC)gsparam.h -$(PSSRC)ipcolor.h:$(GLSRC)gsccolor.h +$(PSSRC)ipcolor.h:$(GLSRC)gsrefct.h +$(PSSRC)ipcolor.h:$(GLSRC)memento.h $(PSSRC)ipcolor.h:$(GLSRC)gsstruct.h $(PSSRC)ipcolor.h:$(GLSRC)gxsync.h +$(PSSRC)ipcolor.h:$(GLSRC)gxbitmap.h $(PSSRC)ipcolor.h:$(GLSRC)scommon.h -$(PSSRC)ipcolor.h:$(GLSRC)memento.h -$(PSSRC)ipcolor.h:$(GLSRC)gscsel.h $(PSSRC)ipcolor.h:$(GLSRC)gsbitmap.h +$(PSSRC)ipcolor.h:$(GLSRC)gsccolor.h +$(PSSRC)ipcolor.h:$(GLSRC)gxarith.h +$(PSSRC)ipcolor.h:$(GLSRC)gpsync.h $(PSSRC)ipcolor.h:$(GLSRC)gsstype.h $(PSSRC)ipcolor.h:$(GLSRC)gsmemory.h -$(PSSRC)ipcolor.h:$(GLSRC)gpsync.h $(PSSRC)ipcolor.h:$(GLSRC)gslibctx.h -$(PSSRC)ipcolor.h:$(GLSRC)gs_dll_call.h $(PSSRC)ipcolor.h:$(GLSRC)gsalloc.h -$(PSSRC)ipcolor.h:$(GLSRC)stdio_.h $(PSSRC)ipcolor.h:$(GLSRC)gxcindex.h -$(PSSRC)ipcolor.h:$(GLSRC)gsgstate.h +$(PSSRC)ipcolor.h:$(GLSRC)stdio_.h $(PSSRC)ipcolor.h:$(GLSRC)stdint_.h $(PSSRC)ipcolor.h:$(GLSRC)gssprintf.h -$(PSSRC)ipcolor.h:$(GLSRC)std.h $(PSSRC)ipcolor.h:$(GLSRC)gstypes.h +$(PSSRC)ipcolor.h:$(GLSRC)std.h $(PSSRC)ipcolor.h:$(GLSRC)stdpre.h $(PSSRC)ipcolor.h:$(GLGEN)arch.h +$(PSSRC)ipcolor.h:$(GLSRC)gs_dll_call.h $(GLSRC)gsform1.h:$(GLSRC)gxpath.h -$(GLSRC)gsform1.h:$(GLSRC)gspenum.h $(GLSRC)gsform1.h:$(GLSRC)gsrect.h $(GLSRC)gsform1.h:$(GLSRC)gslparam.h -$(GLSRC)gsform1.h:$(GLSRC)gsmatrix.h $(GLSRC)gsform1.h:$(GLSRC)gscpm.h +$(GLSRC)gsform1.h:$(GLSRC)gsgstate.h $(GLSRC)gsform1.h:$(GLSRC)gxfixed.h +$(GLSRC)gsform1.h:$(GLSRC)gsmatrix.h +$(GLSRC)gsform1.h:$(GLSRC)gspenum.h $(GLSRC)gsform1.h:$(GLSRC)scommon.h $(GLSRC)gsform1.h:$(GLSRC)gsstype.h $(GLSRC)gsform1.h:$(GLSRC)gsmemory.h $(GLSRC)gsform1.h:$(GLSRC)gslibctx.h -$(GLSRC)gsform1.h:$(GLSRC)gs_dll_call.h $(GLSRC)gsform1.h:$(GLSRC)stdio_.h -$(GLSRC)gsform1.h:$(GLSRC)gsgstate.h $(GLSRC)gsform1.h:$(GLSRC)stdint_.h $(GLSRC)gsform1.h:$(GLSRC)gssprintf.h -$(GLSRC)gsform1.h:$(GLSRC)std.h $(GLSRC)gsform1.h:$(GLSRC)gstypes.h +$(GLSRC)gsform1.h:$(GLSRC)std.h $(GLSRC)gsform1.h:$(GLSRC)stdpre.h $(GLSRC)gsform1.h:$(GLGEN)arch.h +$(GLSRC)gsform1.h:$(GLSRC)gs_dll_call.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxclist.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxgstate.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gstrans.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gdevp14.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxline.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsht1.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxcomp.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)math_.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxcolor2.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxpcolor.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxdevmem.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gdevdevn.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsequivc.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxclipsr.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxdevbuf.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxdcolor.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxband.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gxblend.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gscolor2.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxmatrix.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxdevice.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxcpath.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsht.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsequivc.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gxdevcli.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxpcache.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gscindex.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxcmap.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsptype1.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gscie.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gxtext.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gstext.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxstate.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsnamecl.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gstparam.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxfcache.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxcspace.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsropt.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gspcolor.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxfmap.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsmalloc.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsfunc.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxcspace.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxctable.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gxrplane.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsuid.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxcmap.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gscsel.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxfcache.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsfont.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsimage.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsdcolor.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxdda.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gxcvalue.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsfont.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxfmap.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxftype.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxbcache.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsropt.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxdda.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxpath.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxiclass.h $(DEVSRC)gdevdsp2.h:$(DEVSRC)gdevdsp.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gxfrac.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxtmap.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxftype.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gscms.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gscspace.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxpath.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxbcache.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsdevice.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxarith.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gspenum.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxhttile.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsrect.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gslparam.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsdevice.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxbitfmt.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gscpm.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gscspace.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsgstate.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxstdio.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsxfont.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsiparam.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsdsrc.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxbitmap.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsmatrix.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gscpm.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsio.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsiparam.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gxfixed.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsrefct.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxclio.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gscompt.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsmatrix.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gspenum.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxhttile.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsparam.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsrefct.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gp.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsccolor.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)memento.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)memory_.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsuid.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsstruct.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gxsync.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxbitmap.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)vmsmath.h $(DEVSRC)gdevdsp2.h:$(GLSRC)srdline.h $(DEVSRC)gdevdsp2.h:$(GLSRC)scommon.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)memento.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gscsel.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsfname.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gsbitmap.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsstype.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsccolor.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gxarith.h $(DEVSRC)gdevdsp2.h:$(GLSRC)stat_.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gxtmap.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsmemory.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gpsync.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)memory_.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsstype.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsmemory.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gpgetenv.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gslibctx.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gscdefs.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gs_dll_call.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)stdio_.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gscompt.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gslibctx.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gxcindex.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsgstate.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)stdio_.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gsccode.h $(DEVSRC)gdevdsp2.h:$(GLSRC)stdint_.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gssprintf.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)gsccode.h -$(DEVSRC)gdevdsp2.h:$(GLSRC)std.h $(DEVSRC)gdevdsp2.h:$(GLSRC)gstypes.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)std.h $(DEVSRC)gdevdsp2.h:$(GLSRC)stdpre.h $(DEVSRC)gdevdsp2.h:$(GLGEN)arch.h +$(DEVSRC)gdevdsp2.h:$(GLSRC)gs_dll_call.h diff --git a/psi/interp.c b/psi/interp.c index 3ac5c70c..730ddf16 100644 --- a/psi/interp.c +++ b/psi/interp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1043,9 +1043,9 @@ interp(i_ctx_t **pi_ctx_p /* context for execution, updated if resched */, osp = iosp; esp = iesp; - dmlprintf5(imemory, "d%u,e%u<%u>0x%lx(%d): ", + dmlprintf5(imemory, "d%u,e%u<%u>"PRI_INTPTR"(%d): ", ref_stack_count(&d_stack), ref_stack_count(&e_stack), - ref_stack_count(&o_stack), (ulong)IREF, icount); + ref_stack_count(&o_stack), (intptr_t)IREF, icount); debug_print_ref(imemory, IREF); if (iosp >= osbot) { dmputs(imemory, " // "); diff --git a/psi/interp.h b/psi/interp.h index 7f986df0..ba552eb4 100644 --- a/psi/interp.h +++ b/psi/interp.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iosdata.h b/psi/iosdata.h index 734dd3ed..e171a0b1 100644 --- a/psi/iosdata.h +++ b/psi/iosdata.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iostack.h b/psi/iostack.h index 7ed37b51..ebf4ff5a 100644 --- a/psi/iostack.h +++ b/psi/iostack.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ipacked.h b/psi/ipacked.h index a7b0aee5..e0ff8878 100644 --- a/psi/ipacked.h +++ b/psi/ipacked.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iparam.c b/psi/iparam.c index 3106f412..0a7651b7 100644 --- a/psi/iparam.c +++ b/psi/iparam.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -222,8 +222,17 @@ ref_param_write_typed(gs_param_list * plist, gs_param_name pkey, make_int(&value, pvalue->value.i); break; case gs_param_type_long: + /* FIXME: Rangecheck? */ make_int(&value, pvalue->value.l); break; + case gs_param_type_size_t: + /* FIXME: Rangecheck? */ + make_int(&value, pvalue->value.z); + break; + case gs_param_type_i64: + /* FIXME: Rangecheck? */ + make_int(&value, pvalue->value.i64); + break; case gs_param_type_float: make_real(&value, pvalue->value.f); break; @@ -782,8 +791,8 @@ ref_param_read_typed(gs_param_list * plist, gs_param_name pkey, } return 0; case t_integer: - pvalue->type = gs_param_type_long; - pvalue->value.l = loc.pvalue->value.intval; + pvalue->type = gs_param_type_i64; + pvalue->value.i64 = loc.pvalue->value.intval; return 0; case t_name: pvalue->type = gs_param_type_name; diff --git a/psi/iparam.h b/psi/iparam.h index 526ddd83..5050ab44 100644 --- a/psi/iparam.h +++ b/psi/iparam.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iparray.h b/psi/iparray.h index 53dd3840..35c43db7 100644 --- a/psi/iparray.h +++ b/psi/iparray.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ipcolor.h b/psi/ipcolor.h index 6de10569..7ed8590b 100644 --- a/psi/ipcolor.h +++ b/psi/ipcolor.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iplugin.c b/psi/iplugin.c index 074e1fde..fa2b8cc5 100644 --- a/psi/iplugin.c +++ b/psi/iplugin.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iplugin.h b/psi/iplugin.h index ab6f8711..d6e7a6aa 100644 --- a/psi/iplugin.h +++ b/psi/iplugin.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ireclaim.c b/psi/ireclaim.c index f28b1b39..8a3aedc8 100644 --- a/psi/ireclaim.c +++ b/psi/ireclaim.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -83,7 +83,7 @@ ireclaim(gs_dual_memory_t * dmem, int space) ialloc_set_limit(mem); if (space < 0) { gs_memory_status_t stats; - ulong allocated; + size_t allocated; /* If the ammount still allocated after the GC is complete */ /* exceeds the max_vm setting, then return a VMerror */ @@ -141,7 +141,9 @@ gs_vmreclaim(gs_dual_memory_t *dmem, bool global) ) { gs_ref_memory_t *mem = dmem->spaces_indexed[i]; - if (mem == 0 || (i > 0 && mem == dmem->spaces_indexed[i - 1])) + /* Always safe to substract 1 from i here, as i is always at + * least i_vm_system (1) or i_vm_local (2). */ + if (mem == 0 || (mem == dmem->spaces_indexed[i - 1])) continue; if (mem->stable_memory != (gs_memory_t *)mem) ialloc_gc_prepare((gs_ref_memory_t *)mem->stable_memory); @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/isave.c b/psi/isave.c index b1d0c7fc..8f67cc71 100644 --- a/psi/isave.c +++ b/psi/isave.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -153,8 +153,8 @@ static const long min_inner_clump_space = sizeof(clump_head_t) + 500; static void print_save(const char *str, uint spacen, const alloc_save_t *sav) { - if_debug5('u', "[u]%s space %u 0x%lx: cdata = 0x%lx, id = %lu\n",\ - str, spacen, (ulong)sav, (ulong)sav->client_data, (ulong)sav->id); + if_debug5('u', "[u]%s space %u "PRI_INTPTR": cdata = "PRI_INTPTR", id = %lu\n",\ + str, spacen, (intptr_t)sav, (intptr_t)sav->client_data, (ulong)sav->id); } /* A link to igcref.c . */ @@ -240,7 +240,7 @@ gs_private_st_complex_only(st_alloc_change, alloc_change_t, "alloc_change", static void alloc_save_print(const gs_memory_t *mem, alloc_change_t * cp, bool print_current) { - dmprintf2(mem, " 0x%lx: 0x%lx: ", (ulong) cp, (ulong) cp->where); + dmprintf2(mem, " "PRI_INTPTR"x: "PRI_INTPTR": ", (intptr_t) cp, (intptr_t) cp->where); if (r_is_packed(&cp->contents)) { if (print_current) dmprintf2(mem, "saved=%x cur=%x\n", *(ref_packed *) & cp->contents, @@ -428,8 +428,8 @@ alloc_save_space(gs_ref_memory_t * mem, gs_dual_memory_t * dmem, ulong sid) break; /* maybe should fail */ alloc_init_clump(inner, cp->cbot, cp->ctop, cp->sreloc != 0, cp); alloc_link_clump(inner, mem); - if_debug2m('u', (gs_memory_t *)mem, "[u]inner clump: cbot=0x%lx ctop=0x%lx\n", - (ulong) inner->cbot, (ulong) inner->ctop); + if_debug2m('u', (gs_memory_t *)mem, "[u]inner clump: cbot="PRI_INTPTR" ctop="PRI_INTPTR"\n", + (intptr_t) inner->cbot, (intptr_t) inner->ctop); if (cp == save_mem.cc) new_cc = inner; } @@ -439,8 +439,8 @@ alloc_save_space(gs_ref_memory_t * mem, gs_dual_memory_t * dmem, ulong sid) save = gs_alloc_struct((gs_memory_t *) mem, alloc_save_t, &st_alloc_save, "alloc_save_space(save)"); - if_debug2m('u', (gs_memory_t *)mem, "[u]save space %u at 0x%lx\n", - mem->space, (ulong) save); + if_debug2m('u', (gs_memory_t *)mem, "[u]save space %u at "PRI_INTPTR"\n", + mem->space, (intptr_t) save); if (save == 0) { /* Free the inner clump structures. This is the easiest way. */ restore_free(mem); @@ -454,8 +454,8 @@ alloc_save_space(gs_ref_memory_t * mem, gs_dual_memory_t * dmem, ulong sid) save->is_current = (dmem->current == mem); save->id = sid; mem->saved = save; - if_debug2m('u', (gs_memory_t *)mem, "[u%u]file_save 0x%lx\n", - mem->space, (ulong) mem->streams); + if_debug2m('u', (gs_memory_t *)mem, "[u%u]file_save "PRI_INTPTR"\n", + mem->space, (intptr_t) mem->streams); mem->streams = 0; mem->total_scanned = 0; mem->total_scanned_after_compacting = 0; @@ -487,8 +487,8 @@ alloc_save_change_in(gs_ref_memory_t *mem, const ref * pcont, else if (r_is_struct(pcont)) cp->offset = (byte *) where - (byte *) pcont->value.pstruct; else { - lprintf3("Bad type %u for save! pcont = 0x%lx, where = 0x%lx\n", - r_type(pcont), (ulong) pcont, (ulong) where); + lprintf3("Bad type %u for save! pcont = "PRI_INTPTR", where = "PRI_INTPTR"\n", + r_type(pcont), (intptr_t) pcont, (intptr_t) where); gs_abort((const gs_memory_t *)mem); } if (r_is_packed(where)) @@ -625,8 +625,8 @@ alloc_is_since_save(const void *vptr, const alloc_save_t * save) const char *const ptr = (const char *)vptr; register gs_ref_memory_t *mem = save->space_local; - if_debug2m('U', (gs_memory_t *)mem, "[U]is_since_save 0x%lx, 0x%lx:\n", - (ulong) ptr, (ulong) save); + if_debug2m('U', (gs_memory_t *)mem, "[U]is_since_save "PRI_INTPTR", "PRI_INTPTR":\n", + (intptr_t) ptr, (intptr_t) save); if (mem->saved == 0) { /* This is a special case, the final 'restore' from */ /* alloc_restore_all. */ return true; @@ -634,12 +634,12 @@ alloc_is_since_save(const void *vptr, const alloc_save_t * save) /* Check against clumps allocated since the save. */ /* (There may have been intermediate saves as well.) */ for (;; mem = &mem->saved->state) { - if_debug1m('U', (gs_memory_t *)mem, "[U]checking mem=0x%lx\n", (ulong) mem); + if_debug1m('U', (gs_memory_t *)mem, "[U]checking mem="PRI_INTPTR"\n", (intptr_t) mem); if (ptr_is_within_mem_clumps(ptr, mem)) { if_debug0m('U', (gs_memory_t *)mem, "[U+]found\n"); return true; } - if_debug1m('U', (gs_memory_t *)mem, "[U-]not in any chunks belonging to 0x%lx\n", (ulong) mem); + if_debug1m('U', (gs_memory_t *)mem, "[U-]not in any chunks belonging to "PRI_INTPTR"\n", (intptr_t) mem); if (mem->saved == save) { /* We've checked all the more recent saves, */ /* must be OK. */ break; @@ -657,7 +657,7 @@ alloc_is_since_save(const void *vptr, const alloc_save_t * save) (mem = save->space_global) != save->space_local && save->space_global->num_contexts == 1 ) { - if_debug1m('U', (gs_memory_t *)mem, "[U]checking global mem=0x%lx\n", (ulong) mem); + if_debug1m('U', (gs_memory_t *)mem, "[U]checking global mem="PRI_INTPTR"\n", (intptr_t) mem); if (ptr_is_within_mem_clumps(ptr, mem)) { if_debug0m('U', (gs_memory_t *)mem, "[U+] found\n"); return true; @@ -948,9 +948,9 @@ restore_finalize(gs_ref_memory_t * mem) struct_proc_finalize((*finalize)) = pre->o_type->finalize; if (finalize != 0) { - if_debug2m('u', (gs_memory_t *)mem, "[u]restore finalizing %s 0x%lx\n", + if_debug2m('u', (gs_memory_t *)mem, "[u]restore finalizing %s "PRI_INTPTR"\n", struct_type_name_string(pre->o_type), - (ulong) (pre + 1)); + (intptr_t) (pre + 1)); (*finalize) ((gs_memory_t *) mem, pre + 1); } END_OBJECTS_SCAN @@ -966,9 +966,9 @@ restore_resources(alloc_save_t * sprev, gs_ref_memory_t * mem) #ifdef DEBUG if (mem) { /* Note restoring of the file list. */ - if_debug4m('u', (gs_memory_t *)mem, "[u%u]file_restore 0x%lx => 0x%lx for 0x%lx\n", - mem->space, (ulong)mem->streams, - (ulong)sprev->state.streams, (ulong) sprev); + if_debug4m('u', (gs_memory_t *)mem, "[u%u]file_restore "PRI_INTPTR" => "PRI_INTPTR" for "PRI_INTPTR"\n", + mem->space, (intptr_t)mem->streams, + (intptr_t)sprev->state.streams, (intptr_t)sprev); } #endif @@ -1142,7 +1142,7 @@ forget_changes(gs_ref_memory_t * mem) for (; chp; chp = next) { ref_packed *prp = chp->where; - if_debug1m('U', (gs_memory_t *)mem, "[U]forgetting change 0x%lx\n", (ulong) chp); + if_debug1m('U', (gs_memory_t *)mem, "[U]forgetting change "PRI_INTPTR"\n", (intptr_t) chp); if (chp->offset == AC_OFFSET_ALLOCATED) DO_NOTHING; else @@ -1161,9 +1161,9 @@ file_forget_save(gs_ref_memory_t * mem) stream *streams = mem->streams; stream *saved_streams = save->state.streams; - if_debug4m('u', (gs_memory_t *)mem, "[u%d]file_forget_save 0x%lx + 0x%lx for 0x%lx\n", - mem->space, (ulong) streams, (ulong) saved_streams, - (ulong) save); + if_debug4m('u', (gs_memory_t *)mem, "[u%d]file_forget_save "PRI_INTPTR" + "PRI_INTPTR" for "PRI_INTPTR"\n", + mem->space, (intptr_t) streams, (intptr_t) saved_streams, + (intptr_t) save); if (streams == 0) mem->streams = saved_streams; else if (saved_streams != 0) { @@ -1278,8 +1278,8 @@ save_set_new(gs_ref_memory_t * mem, bool to_new, bool set_limit, ulong *pscanned SCAN_CLUMP_OBJECTS(cp) DO_ALL - if_debug3m('U', (gs_memory_t *)mem, "[U]set_new scan(0x%lx(%u), %d)\n", - (ulong) pre, size, to_new); + if_debug3m('U', (gs_memory_t *)mem, "[U]set_new scan("PRI_INTPTR"(%u), %d)\n", + (intptr_t) pre, size, to_new); if (pre->o_type == &st_refs) { /* These are refs, scan them. */ ref_packed *prp = (ref_packed *) (pre + 1); @@ -1388,8 +1388,8 @@ save_set_new_changes(gs_ref_memory_t * mem, bool to_new, bool set_limit) } else { ref_packed *prp = chp->where; - if_debug3m('U', (gs_memory_t *)mem, "[U]set_new 0x%lx: (0x%lx, %d)\n", - (ulong)chp, (ulong)prp, new); + if_debug3m('U', (gs_memory_t *)mem, "[U]set_new "PRI_INTPTR": ("PRI_INTPTR", %d)\n", + (intptr_t)chp, (intptr_t)prp, new); if (!r_is_packed(prp)) { ref *const rp = (ref *) prp; diff --git a/psi/isave.h b/psi/isave.h index f96c367a..beb40ba8 100644 --- a/psi/isave.h +++ b/psi/isave.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iscan.c b/psi/iscan.c index e5956e1b..dc14072e 100644 --- a/psi/iscan.c +++ b/psi/iscan.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -535,6 +535,16 @@ gs_scan_token(i_ctx_t *i_ctx_p, ref * pref, scanner_state * pstate) return_error(gs_error_Fatal); } } + else { + /* We *may* use these in the event of returning to this function after + * a interruption, but not every code path below sets them. Set them + * to sane values here for safety. We can write the contents of sstate + * (back) to pstate before returning. + */ + sstate.s_da.base = sstate.s_da.next = &(sstate.s_da.buf[0]); + sstate.s_da.limit = sstate.s_da.next; + sstate.s_da.is_dynamic = false; + } /* Fetch any state variables that are relevant even if */ /* sstate.s_scan_type == scanning_none. */ sstate.s_pstack = pstate->s_pstack; @@ -581,6 +591,10 @@ gs_scan_token(i_ctx_t *i_ctx_p, ref * pref, scanner_state * pstate) s_A85D_init_inline(&sstate.s_ss.a85d); sstate.s_ss.st.templat = &s_A85D_template; sstate.s_ss.a85d.require_eod = true; + /* If this is an inline ASCII string, interpret it normally, throw an error + * if it fails rather than ignoring it as PDF (Acrobat) does. + */ + sstate.s_ss.a85d.pdf_rules = false; goto str; } sputback_inline(s, sptr, endptr); diff --git a/psi/iscan.h b/psi/iscan.h index b78d17ed..f05266a7 100644 --- a/psi/iscan.h +++ b/psi/iscan.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iscanbin.c b/psi/iscanbin.c index 8fd6a0a5..5d1802c7 100644 --- a/psi/iscanbin.c +++ b/psi/iscanbin.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iscanbin.h b/psi/iscanbin.h index 2020651d..08bc9f7e 100644 --- a/psi/iscanbin.h +++ b/psi/iscanbin.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iscannum.c b/psi/iscannum.c index de5f5211..71081b8f 100644 --- a/psi/iscannum.c +++ b/psi/iscannum.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -353,14 +353,12 @@ fe: while (exp10 > NUM_POWERS_10) dval *= powers_10[NUM_POWERS_10], exp10 -= NUM_POWERS_10; - if (exp10 > 0) - dval *= powers_10[exp10]; + dval *= powers_10[exp10]; } else if (exp10 < 0) { while (exp10 < -NUM_POWERS_10) dval /= powers_10[NUM_POWERS_10], exp10 += NUM_POWERS_10; - if (exp10 < 0) - dval /= powers_10[-exp10]; + dval /= powers_10[-exp10]; } /* * Check for an out-of-range result. Currently we don't check for diff --git a/psi/iscannum.h b/psi/iscannum.h index 00ec3813..b4a88299 100644 --- a/psi/iscannum.h +++ b/psi/iscannum.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/isdata.h b/psi/isdata.h index eb1ae73a..f4687da9 100644 --- a/psi/isdata.h +++ b/psi/isdata.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/isstate.h b/psi/isstate.h index 8116ca4b..222cc8a8 100644 --- a/psi/isstate.h +++ b/psi/isstate.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/istack.c b/psi/istack.c index f113c3c7..9ec6be0d 100644 --- a/psi/istack.c +++ b/psi/istack.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/istack.h b/psi/istack.h index 7c33844e..813ed777 100644 --- a/psi/istack.h +++ b/psi/istack.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/istkparm.h b/psi/istkparm.h index 20322f2c..e254bda0 100644 --- a/psi/istkparm.h +++ b/psi/istkparm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/istream.h b/psi/istream.h index 8a2a9077..0604728e 100644 --- a/psi/istream.h +++ b/psi/istream.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/istruct.h b/psi/istruct.h index c7f9b572..3fe8f545 100644 --- a/psi/istruct.h +++ b/psi/istruct.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/itoken.h b/psi/itoken.h index cb84891f..40f1c40e 100644 --- a/psi/itoken.h +++ b/psi/itoken.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iutil.c b/psi/iutil.c index 55d0e521..b7de0536 100644 --- a/psi/iutil.c +++ b/psi/iutil.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -531,7 +531,7 @@ other: break; } /* Internal operator, no name. */ - gs_sprintf(buf, "@0x%lx", (ulong) op->value.opproc); + gs_sprintf(buf, "@"PRI_INTPTR, (intptr_t) op->value.opproc); break; } case t_real: diff --git a/psi/iutil.h b/psi/iutil.h index 722b3251..2253c8f5 100644 --- a/psi/iutil.h +++ b/psi/iutil.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iutil2.c b/psi/iutil2.c index 650899ea..276a73aa 100644 --- a/psi/iutil2.c +++ b/psi/iutil2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/iutil2.h b/psi/iutil2.h index d59582dc..7326106f 100644 --- a/psi/iutil2.h +++ b/psi/iutil2.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ivmem2.h b/psi/ivmem2.h index be1126e5..4b1f43e5 100644 --- a/psi/ivmem2.h +++ b/psi/ivmem2.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -23,6 +23,6 @@ /* Exported by zvmem2.c for zusparam.c */ int set_vm_reclaim(i_ctx_t *, long); -int set_vm_threshold(i_ctx_t *, long); +int set_vm_threshold(i_ctx_t *, int64_t); #endif /* ivmem2_INCLUDED */ diff --git a/psi/ivmspace.h b/psi/ivmspace.h index 9e364c0d..7faf247e 100644 --- a/psi/ivmspace.h +++ b/psi/ivmspace.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/mkfilelt.cpp b/psi/mkfilelt.cpp index 0d6aae55..31b632bf 100644 --- a/psi/mkfilelt.cpp +++ b/psi/mkfilelt.cpp @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/msvc.mak b/psi/msvc.mak index c5c3b464..a66f85f6 100644 --- a/psi/msvc.mak +++ b/psi/msvc.mak @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2019 Artifex Software, Inc. +# Copyright (C) 2001-2020 Artifex Software, Inc. # All Rights Reserved. # # This software is provided AS-IS with no warranty, either express or @@ -48,7 +48,7 @@ DEBUGSYM=1 DEBUG=0 !endif !ifndef TDEBUG -TDEBUG=0 +TDEBUG=1 !endif !ifndef DEBUGSYM DEBUGSYM=1 @@ -620,13 +620,9 @@ WITH_CUPS=0 # Define the directory where the FreeType2 library sources are stored. # See freetype.mak for more information. - -!ifdef UFST_BRIDGE -!if "$(UFST_BRIDGE)"=="1" -FT_BRIDGE=0 -!endif -!endif - +# Note that FT_BRIDGE=1 is now the only support configuration for anything +# other than testing purposes (even when UFST_BRIDGE=1 - we require Freetype +# for embedded/downloaded fonts. !ifndef FT_BRIDGE FT_BRIDGE=1 !endif @@ -683,6 +679,19 @@ JBIG2_LIB=luratech !endif !endif +!if exist("leptonica") +LEPTONICADIR=leptonica +!endif +!if exist("tesseract") +TESSERACTDIR=tesseract +TESSCXXFLAGS=-DHAVE_AVX -DHAVE_AVX2 -DHAVE_SSE4_1 -DHAVE_FMA -D__AVX__ -D__AVX2__ -D__FMA__ -D__SSE4_1__ /EHsc /std:c++17 +!endif +!if defined(TESSERACTDIR) && defined(LEPTONICADIR) +OCR_VERSION=1 +!else +OCR_VERSION=0 +!endif + !ifndef JBIG2_LIB JBIG2_LIB=jbig2dec !endif @@ -973,6 +982,25 @@ MS_TOOLSET_VERSION=14.24.28315 MSVC_VERSION=16 MS_TOOLSET_VERSION=14.24.28316 !endif +!if "$(_NMAKE_VER)" == "14.25.28614.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.25.28614 +!endif +!if "$(_NMAKE_VER)" == "14.26.28805.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.26.28805 +!endif +!if "$(_NMAKE_VER)" == "14.26.28806.0" +# VS2019 (Toolset v142 - update) +MSVC_VERSION=16 +MS_TOOLSET_VERSION=14.26.28806 +!endif +!if "$(_NMAKE_VER)" == "14.27.29111.0" +# VS2019 (Toolset v142) +MSVC_VERSION=16 +!endif !endif !ifndef MSVC_VERSION @@ -1634,6 +1662,10 @@ DEVICE_DEVS16=$(DEVICE_DEVS16) $(DD)cups.dev !if "$(WITH_URF)" == "1" DEVICE_DEVS16=$(DEVICE_DEVS16) $(DD)urfgray.dev $(DD)urfrgb.dev $(DD)urfcmyk.dev !endif +!if "$(OCR_VERSION)" == "0" +!else +DEVICE_DEVS16=$(DEVICE_DEVS16) $(DD)ocr.dev $(DD)hocr.dev $(DD)pdfocr8.dev $(DD)pdfocr24.dev $(DD)pdfocr32.dev +!endif # Overflow for DEVS3,4,5,6,9 DEVICE_DEVS17=$(DD)ljet3.dev $(DD)ljet3d.dev $(DD)ljet4.dev $(DD)ljet4d.dev DEVICE_DEVS18=$(DD)pj.dev $(DD)pjxl.dev $(DD)pjxl300.dev $(DD)jetp3852.dev $(DD)r4081.dev @@ -1702,6 +1734,7 @@ BEGINFILES2=$(BEGINFILES2) $(BSCFILE) !include $(GLSRCDIR)\msvctail.mak !include $(PSSRCDIR)\winint.mak + # ----------------------------- Main program ------------------------------ # GSCONSOLE_XE=$(BINDIR)\$(GSCONSOLE).exe diff --git a/psi/msvc32.mak b/psi/msvc32.mak index 8b628a47..7a324e47 100644 --- a/psi/msvc32.mak +++ b/psi/msvc32.mak @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2019 Artifex Software, Inc. +# Copyright (C) 2001-2020 Artifex Software, Inc. # All Rights Reserved. # # This software is provided AS-IS with no warranty, either express or diff --git a/psi/msvc64.mak b/psi/msvc64.mak index 40047c38..0e93f6ff 100644 --- a/psi/msvc64.mak +++ b/psi/msvc64.mak @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2019 Artifex Software, Inc. +# Copyright (C) 2001-2020 Artifex Software, Inc. # All Rights Reserved. # # This software is provided AS-IS with no warranty, either express or diff --git a/psi/nsisinst.nsi b/psi/nsisinst.nsi index 5c272552..717bc8cb 100644 --- a/psi/nsisinst.nsi +++ b/psi/nsisinst.nsi @@ -1,4 +1,4 @@ -; Copyright (C) 2001-2019 Artifex Software, Inc. +; Copyright (C) 2001-2020 Artifex Software, Inc. ; All Rights Reserved. ; ; This software is provided AS-IS with no warranty, either express or diff --git a/psi/oparc.h b/psi/oparc.h index a4bd3eba..e169fbce 100644 --- a/psi/oparc.h +++ b/psi/oparc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/opcheck.h b/psi/opcheck.h index 7498180e..c2a69e22 100644 --- a/psi/opcheck.h +++ b/psi/opcheck.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/opdef.h b/psi/opdef.h index 070d1f06..e9d42a2a 100644 --- a/psi/opdef.h +++ b/psi/opdef.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/opextern.h b/psi/opextern.h index 109cdb82..b76dabc9 100644 --- a/psi/opextern.h +++ b/psi/opextern.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/os2.mak b/psi/os2.mak index 12e08246..2f3e619d 100644 --- a/psi/os2.mak +++ b/psi/os2.mak @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2019 Artifex Software, Inc. +# Copyright (C) 2001-2020 Artifex Software, Inc. # All Rights Reserved. # # This software is provided AS-IS with no warranty, either express or diff --git a/psi/ostack.h b/psi/ostack.h index 35665d21..22acfbc3 100644 --- a/psi/ostack.h +++ b/psi/ostack.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/psapi.c b/psi/psapi.c index b3300815..c74934a8 100644 --- a/psi/psapi.c +++ b/psi/psapi.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -37,6 +37,7 @@ #include "store.h" #include "iname.h" #include "interp.h" +#include "gxgstate.h" #ifndef GS_THREADSAFE /* Number of threads to allow per process. Unless GS_THREADSAFE is defined @@ -98,16 +99,15 @@ psapi_new_instance(gs_lib_ctx_t **pinstance, return gs_error_Fatal; } mem->gs_lib_ctx->top_of_system = (void*) minst; - mem->gs_lib_ctx->core->caller_handle = caller_handle; + mem->gs_lib_ctx->core->default_caller_handle = caller_handle; mem->gs_lib_ctx->core->custom_color_callback = NULL; #ifdef METRO - mem->gs_lib_ctx->core->stdin_fn = metro_stdin; - mem->gs_lib_ctx->core->stdout_fn = metro_stdout; - mem->gs_lib_ctx->core->stderr_fn = metro_stderr; -#else - mem->gs_lib_ctx->core->stdin_fn = NULL; - mem->gs_lib_ctx->core->stdout_fn = NULL; - mem->gs_lib_ctx->core->stderr_fn = NULL; + if (mem->gs_lib_ctx->core->stdin_fn == NULL) + mem->gs_lib_ctx->core->stdin_fn = metro_stdin; + if (mem->gs_lib_ctx->core->stdout_fn == NULL) + mem->gs_lib_ctx->core->stdout_fn = metro_stdout; + if (mem->gs_lib_ctx->core->stderr_fn == NULL) + mem->gs_lib_ctx->core->stderr_fn = metro_stderr; #endif mem->gs_lib_ctx->core->poll_fn = NULL; @@ -139,13 +139,21 @@ psapi_delete_instance(gs_lib_ctx_t *ctx) mem = (gs_memory_t *)(ctx->memory); minst = get_minst_from_memory(ctx->memory); - ctx->core->caller_handle = NULL; + ctx->core->default_caller_handle = NULL; ctx->core->stdin_fn = NULL; ctx->core->stdout_fn = NULL; ctx->core->stderr_fn = NULL; ctx->core->poll_fn = NULL; minst->display = NULL; + if (minst->param_list) { + gs_c_param_list_release(minst->param_list); + gs_free_object(minst->heap, minst->param_list, "psapi_delete_instance"); + } + + gs_c_param_list_release(&minst->enum_params); + gs_free_object(minst->heap, minst->enum_keybuf, "psapi_delete_instance"); + gs_free_object(mem, minst, "init_main_instance"); /* Release the memory (frees up everything) */ @@ -291,58 +299,32 @@ psapi_init_with_args2(gs_lib_ctx_t *ctx) } int +psapi_set_device_param(gs_lib_ctx_t *ctx, + gs_param_list *plist) +{ + gs_main_instance *minst = get_minst_from_memory(ctx->memory); + + return gs_putdeviceparams(minst->i_ctx_p->pgs->device, plist); +} + +int +psapi_get_device_params(gs_lib_ctx_t *ctx, + gs_param_list *plist) +{ + gs_main_instance *minst = get_minst_from_memory(ctx->memory); + + if (minst->i_ctx_p->pgs->device == NULL) + return 0; + return gs_getdeviceparams(minst->i_ctx_p->pgs->device, plist); +} + +int psapi_set_param(gs_lib_ctx_t *ctx, - psapi_sptype type, - const char *param, - const void *val) + gs_param_list *plist) { gs_main_instance *minst = get_minst_from_memory(ctx->memory); - ref value; - int code = 0; - i_ctx_t *i_ctx_p = minst->i_ctx_p; - uint space = icurrent_space; - - ialloc_set_space(idmemory, avm_system); - switch (type) { - case psapi_spt_null: - make_null(&value); - break; - case psapi_spt_bool: - if (val) - make_true(&value); - else - make_false(&value); - break; - case psapi_spt_int: - make_int(&value, *(int *)val); - break; - case psapi_spt_float: - make_real(&value, *(float *)val); - break; - case psapi_spt_string: - if (val == NULL) - make_empty_string(&value, a_readonly); - else { - size_t len = strlen(val); - byte *body = ialloc_string(len, "-s"); - - if (body == NULL) - return gs_error_Fatal; - memcpy(body, val, len); - make_const_string(&value, a_readonly | avm_system, len, body); - } - break; - case psapi_spt_name: - code = name_ref(ctx->memory, val, strlen(val), &value, 1); - break; - default: - break; - } - ialloc_set_space(idmemory, space); - /* Enter the name in systemdict. */ - i_initial_enter_name_copy(minst->i_ctx_p, param, &value); - return code; + return gs_main_set_language_param(minst, plist); } int @@ -365,12 +347,23 @@ psapi_run_string_begin(gs_lib_ctx_t *ctx, int user_errors, int *pexit_code) { + gs_main_instance *minst; + int code; + if (ctx == NULL) return gs_error_Fatal; + minst = get_minst_from_memory(ctx->memory); + + if (minst->mid_run_string == 1) + return -1; + minst->mid_run_string = 1; + + code = gs_main_run_string_begin(minst, user_errors, pexit_code, + &(minst->error_object)); + if (code < 0) + minst->mid_run_string = 0; - return gs_main_run_string_begin(get_minst_from_memory(ctx->memory), - user_errors, pexit_code, - &(get_minst_from_memory(ctx->memory)->error_object)); + return code; } int @@ -380,12 +373,20 @@ psapi_run_string_continue(gs_lib_ctx_t *ctx, int user_errors, int *pexit_code) { + gs_main_instance *minst; + int code; + if (ctx == NULL) return gs_error_Fatal; + minst = get_minst_from_memory(ctx->memory); - return gs_main_run_string_continue(get_minst_from_memory(ctx->memory), - str, length, user_errors, pexit_code, - &(get_minst_from_memory(ctx->memory)->error_object)); + code = gs_main_run_string_continue(minst, str, length, user_errors, + pexit_code, + &(minst->error_object)); + if (code < 0) + minst->mid_run_string = 0; + + return code; } uint @@ -402,12 +403,18 @@ psapi_run_string_end(gs_lib_ctx_t *ctx, int user_errors, int *pexit_code) { + int code; + gs_main_instance *minst; + if (ctx == NULL) return gs_error_Fatal; + minst = get_minst_from_memory(ctx->memory); + + code = gs_main_run_string_end(minst, user_errors, pexit_code, + &(minst->error_object)); - return gs_main_run_string_end(get_minst_from_memory(ctx->memory), - user_errors, pexit_code, - &(get_minst_from_memory(ctx->memory)->error_object)); + minst->mid_run_string = 0; + return code; } int @@ -454,6 +461,9 @@ psapi_run_file(gs_lib_ctx_t *ctx, return gs_error_Fatal; minst = get_minst_from_memory(ctx->memory); + if (minst->mid_run_string == 1) + return -1; + /* Convert the file_name to utf8 */ if (minst->get_codepoint) { len = 1; diff --git a/psi/psapi.h b/psi/psapi.h index 74375d9b..5e38ce41 100644 --- a/psi/psapi.h +++ b/psi/psapi.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -57,20 +57,17 @@ psapi_init_with_args01(gs_lib_ctx_t *instance, int psapi_init_with_args2(gs_lib_ctx_t *instance); -typedef enum { - psapi_spt_invalid = -1, - psapi_spt_null = 0, /* void * is NULL */ - psapi_spt_bool = 1, /* void * is NULL (false) or non-NULL (true) */ - psapi_spt_int = 2, /* void * is a pointer to an int */ - psapi_spt_float = 3, /* void * is a float * */ - psapi_spt_name = 4, /* void * is a char * */ - psapi_spt_string = 5 /* void * is a char * */ -} psapi_sptype; int psapi_set_param(gs_lib_ctx_t *ctx, - psapi_sptype type, - const char *param, - const void *val); + gs_param_list *plist); + +int +psapi_set_device_param(gs_lib_ctx_t *ctx, + gs_param_list *plist); + +int +psapi_get_device_params(gs_lib_ctx_t *ctx, + gs_param_list *plist); int psapi_add_path(gs_lib_ctx_t *ctx, diff --git a/psi/psromfs.mak b/psi/psromfs.mak index 0721c144..d000a9af 100644 --- a/psi/psromfs.mak +++ b/psi/psromfs.mak @@ -1,4 +1,4 @@ -# Copyright (C) 2001-2019 Artifex Software, Inc. +# Copyright (C) 2001-2020 Artifex Software, Inc. # All Rights Reserved. # # This software is provided AS-IS with no warranty, either express or diff --git a/psi/store.h b/psi/store.h index 3bed0e9f..fd7dc793 100644 --- a/psi/store.h +++ b/psi/store.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -75,23 +75,12 @@ */ #define ref_assign_inline(pto,pfrom)\ (*(pto) = *(pfrom)) -#ifdef __TURBOC__ - /* - * Move the data in two 32-bit chunks, because - * otherwise the compiler calls SCOPY@. - * The cast to void is to discourage the compiler from - * wanting to deliver the value of the expression. - */ -# define ref_assign(pto,pfrom)\ - discard(ref_assign_inline(pto, pfrom)) -#else - /* - * Trust the compiler and hope for the best. - * The MIPS compiler doesn't like the cast to void. - */ -# define ref_assign(pto,pfrom)\ - (*(pto) = *(pfrom)) -#endif + +/* This used to be different from above, for the benefit of TURBO C + * But we no longer support TURBO C, so.... + */ +#define ref_assign(pto,pfrom)\ + ref_assign_inline(pto,pfrom) #define ialloc_new_mask (idmemory->new_mask) /* @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zarith.c b/psi/zarith.c index fce9686e..61132cf5 100644 --- a/psi/zarith.c +++ b/psi/zarith.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -148,6 +148,14 @@ zdiv(i_ctx_t *i_ctx_p) break; case t_integer: result = (double)op1->value.intval / op->value.realval; +#ifdef HAVE_ISINF + if (isinf(result)) + return_error(gs_error_undefinedresult); +#endif +#ifdef HAVE_ISNAN + if (isnan(result)) + return_error(gs_error_undefinedresult); +#endif make_real(op1, result); } break; diff --git a/psi/zarray.c b/psi/zarray.c index c4500654..42c873f4 100644 --- a/psi/zarray.c +++ b/psi/zarray.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zbfont.c b/psi/zbfont.c index abc03aa0..49b4efe6 100644 --- a/psi/zbfont.c +++ b/psi/zbfont.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zbseq.c b/psi/zbseq.c index 2310810e..a8812377 100644 --- a/psi/zbseq.c +++ b/psi/zbseq.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcfont.c b/psi/zcfont.c index dcaf76c5..709ab489 100644 --- a/psi/zcfont.c +++ b/psi/zcfont.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zchar.c b/psi/zchar.c index d7545a3f..9ef52493 100644 --- a/psi/zchar.c +++ b/psi/zchar.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -819,7 +819,6 @@ op_show_continue_dispatch(i_ctx_t *i_ctx_p, int npop, int code) ref cnref; op_proc_t cont = op_show_continue, exec_cont = 0; gs_glyph glyph = penum->returned.current_glyph; - int code; pop(npop); op = osp; diff --git a/psi/zchar1.c b/psi/zchar1.c index 5d519785..d8304b5c 100644 --- a/psi/zchar1.c +++ b/psi/zchar1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zchar2.c b/psi/zchar2.c index 8a53c601..e46263d5 100644 --- a/psi/zchar2.c +++ b/psi/zchar2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zchar32.c b/psi/zchar32.c index a71766d4..387d989a 100644 --- a/psi/zchar32.c +++ b/psi/zchar32.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zchar42.c b/psi/zchar42.c index 906b3185..cb635827 100644 --- a/psi/zchar42.c +++ b/psi/zchar42.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zchar42.h b/psi/zchar42.h index e0c0e19f..00e0aefa 100644 --- a/psi/zchar42.h +++ b/psi/zchar42.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcharout.c b/psi/zcharout.c index c1537281..31007d8a 100644 --- a/psi/zcharout.c +++ b/psi/zcharout.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcharx.c b/psi/zcharx.c index 8b9dee0f..73b997f4 100644 --- a/psi/zcharx.c +++ b/psi/zcharx.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -837,8 +837,8 @@ cie_cache_finish_store(i_ctx_t *i_ctx_p, bool replicate) pcache = (cie_cache_floats *) (r_ptr(esp - 1, char) + esp->value.intval); pcache->params.is_identity = false; /* cache_set_linear computes this */ - if_debug3m('c', imemory, "[c]cache 0x%lx base=%g, factor=%g:\n", - (ulong) pcache, pcache->params.base, pcache->params.factor); + if_debug3m('c', imemory, "[c]cache "PRI_INTPTR" base=%g, factor=%g:\n", + (intptr_t) pcache, pcache->params.base, pcache->params.factor); if (replicate || (code = float_params(op, gx_cie_cache_size, &pcache->values[0])) < 0 ) { @@ -974,8 +974,8 @@ cie_create_icc(i_ctx_t *i_ctx_p) pcache = (cie_cache_floats *) (r_ptr(esp - 1, char) + esp->value.intval); pcache->params.is_identity = false; /* cache_set_linear computes this */ - if_debug3m('c', imemory, "[c]icc_sample_proc 0x%lx base=%g, factor=%g:\n", - (ulong) pcache, pcache->params.base, pcache->params.factor); + if_debug3m('c', imemory, "[c]icc_sample_proc "PRI_INTPTR" base=%g, factor=%g:\n", + (intptr_t) pcache, pcache->params.base, pcache->params.factor); if ((code = float_params(op, gx_cie_cache_size, &pcache->values[0])) < 0) { /* We might have underflowed the current stack block. */ /* Handle the parameters one-by-one. */ @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcolor.c b/psi/zcolor.c index 373bc06b..0ddc15f4 100644 --- a/psi/zcolor.c +++ b/psi/zcolor.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1842,9 +1842,6 @@ static int comparearrays(i_ctx_t * i_ctx_p, ref *m1, ref *m2) if (r_type(&ref1) != r_type(&ref2)) return 0; - code = r_type(&ref1); - if (code < 0) - return code; switch(r_type(&ref1)) { case t_null: break; @@ -1944,9 +1941,6 @@ static int hasharray(i_ctx_t * i_ctx_p, ref *m1, gs_md5_state_t *md5) if (code < 0) return 0; - code = r_type(&ref1); - if (code < 0) - return code; switch(r_type(&ref1)) { case t_null: break; @@ -3485,8 +3479,7 @@ static int setseparationspace(i_ctx_t * i_ctx_p, ref *sepspace, int *stage, int if (code < 0) return code; istate->colorspace[0].procs.special.separation.tint_transform = proc; - if (code >= 0) - code = gs_cspace_set_sepr_function(pcs, pfn); + code = gs_cspace_set_sepr_function(pcs, pfn); if (code >= 0) code = gs_setcolorspace(igs, pcs); /* release reference from construction */ @@ -4201,8 +4194,7 @@ static int setdevicenspace(i_ctx_t * i_ctx_p, ref *devicenspace, int *stage, int if (code < 0) return code; istate->colorspace[0].procs.special.separation.tint_transform = proc; - if (code >= 0) - code = gs_cspace_set_sepr_function(pcs, pfn); + code = gs_cspace_set_sepr_function(pcs, pfn); if (code >= 0) code = gs_setcolorspace(igs, pcs); /* release reference from construction */ @@ -6771,11 +6763,9 @@ currentbasecolor_cont(i_ctx_t *i_ctx_p) /* Completed that space, increment the 'depth' */ make_int(&ep[-2], ++depth); } - if (code <= 0) { - /* Remove our next continuation and our data */ - esp -= 7; - code = o_pop_estack; - } + /* Remove our next continuation and our data */ + esp -= 7; + code = o_pop_estack; return code; } diff --git a/psi/zcolor.h b/psi/zcolor.h index d33d2232..ab910da2 100644 --- a/psi/zcolor.h +++ b/psi/zcolor.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcolor1.c b/psi/zcolor1.c index 82f177cf..66238165 100644 --- a/psi/zcolor1.c +++ b/psi/zcolor1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcolor2.c b/psi/zcolor2.c index 75b991c7..acd96648 100644 --- a/psi/zcolor2.c +++ b/psi/zcolor2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcolor3.c b/psi/zcolor3.c index eaa41cc4..82ac958f 100644 --- a/psi/zcolor3.c +++ b/psi/zcolor3.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcontrol.c b/psi/zcontrol.c index 8f7f6d01..460a8a19 100644 --- a/psi/zcontrol.c +++ b/psi/zcontrol.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -308,7 +308,7 @@ zfor(i_ctx_t *i_ctx_p) make_int(ep - 2, op[-1].value.intval); break; case t_real: - make_int(ep - 2, (long)op[-1].value.realval); + make_int(ep - 2, (ps_int)op[-1].value.realval); break; default: return_op_typecheck(op - 1); @@ -339,7 +339,7 @@ for_pos_int_continue(i_ctx_t *i_ctx_p) { os_ptr op = osp; register es_ptr ep = esp; - int var = ep[-3].value.intval; + ps_int var = ep[-3].value.intval; if (var > ep[-1].value.intval) { esp -= 5; /* pop everything */ @@ -358,7 +358,7 @@ for_neg_int_continue(i_ctx_t *i_ctx_p) { os_ptr op = osp; register es_ptr ep = esp; - int var = ep[-3].value.intval; + ps_int var = ep[-3].value.intval; if (var < ep[-1].value.intval) { esp -= 5; /* pop everything */ @@ -864,8 +864,8 @@ zcurrentfile(i_ctx_t *i_ctx_p) ref *efp = zget_current_file(i_ctx_p); if (esfile != efp) { - lprintf2("currentfile: esfile=0x%lx, efp=0x%lx\n", - (ulong) esfile, (ulong) efp); + lprintf2("currentfile: esfile="PRI_INTPTR", efp="PRI_INTPTR"\n", + (intptr_t) esfile, (intptr_t) efp); ref_assign(op, efp); } else #endif @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcsindex.c b/psi/zcsindex.c index d7cd6ad7..a8340b49 100644 --- a/psi/zcsindex.c +++ b/psi/zcsindex.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcspixel.c b/psi/zcspixel.c index c9f5b88d..f72c0d83 100644 --- a/psi/zcspixel.c +++ b/psi/zcspixel.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zcssepr.c b/psi/zcssepr.c index 80535acf..bb9075bf 100644 --- a/psi/zcssepr.c +++ b/psi/zcssepr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zdevcal.c b/psi/zdevcal.c index 8d81b49b..f3803d1d 100644 --- a/psi/zdevcal.c +++ b/psi/zdevcal.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zdevice.c b/psi/zdevice.c index cb980aee..6cc7aab1 100644 --- a/psi/zdevice.c +++ b/psi/zdevice.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zdevice2.c b/psi/zdevice2.c index f75ca6bc..53374c2d 100644 --- a/psi/zdevice2.c +++ b/psi/zdevice2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zdfilter.c b/psi/zdfilter.c index c2bf6892..7ef53122 100644 --- a/psi/zdfilter.c +++ b/psi/zdfilter.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zdict.c b/psi/zdict.c index 48fcc003..efea18e7 100644 --- a/psi/zdict.c +++ b/psi/zdict.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zdouble.c b/psi/zdouble.c index cdd69b30..d06d39de 100644 --- a/psi/zdouble.c +++ b/psi/zdouble.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zdps1.c b/psi/zdps1.c index 8ee9cc6e..2d81ad72 100644 --- a/psi/zdps1.c +++ b/psi/zdps1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zdscpars.c b/psi/zdscpars.c index 913e6282..8a8ef130 100644 --- a/psi/zdscpars.c +++ b/psi/zdscpars.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfaes.c b/psi/zfaes.c index 0c4b887d..fe47cd35 100644 --- a/psi/zfaes.c +++ b/psi/zfaes.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfapi.c b/psi/zfapi.c index 63dfa946..19043b84 100644 --- a/psi/zfapi.c +++ b/psi/zfapi.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -80,7 +80,7 @@ struct sfnts_reader_s long index; uint offset; uint length; - bool error; + int error; byte(*rbyte) (sfnts_reader *r); ushort(*rword) (sfnts_reader *r); ulong(*rlong) (sfnts_reader *r); @@ -94,19 +94,15 @@ sfnts_next_elem(sfnts_reader *r) ref s; int code; - if (r->error) + if (r->error < 0) return; do { r->index++; code = array_get(r->memory, r->sfnts, r->index, &s); - if (code == gs_error_rangecheck) { - r->error |= 2; - } - else if (code < 0) { - r->error |= 1; - } - if (r->error) - return; + if (code < 0) { + r->error = code; + return; + } r->p = s.value.const_bytes; r->length = r_size(&s) & ~(uint) 1; /* See Adobe Technical Note # 5012, section 4.2. */ } while (r->length == 0); @@ -118,7 +114,7 @@ sfnts_reader_rbyte_inline(sfnts_reader *r) { if (r->offset >= r->length) sfnts_next_elem(r); - return (r->error ? 0 : r->p[r->offset++]); + return ((r->error < 0) ? 0 : r->p[r->offset++]); } static byte @@ -164,7 +160,7 @@ sfnts_reader_rstring(sfnts_reader *r, byte *v, int length) if (length <= 0) return (0); - while (!r->error) { + while (r->error >= 0) { int l = min(length, r->length - r->offset); memcpy(v, r->p + r->offset, l); @@ -185,7 +181,7 @@ sfnts_reader_seek(sfnts_reader *r, ulong pos) r->index = -1; sfnts_next_elem(r); - while (skipped + r->length < pos && !r->error) { + while (skipped + r->length < pos && r->error >= 0) { skipped += r->length; sfnts_next_elem(r); } @@ -201,10 +197,10 @@ sfnts_reader_init(sfnts_reader *r, ref *pdr) r->rstring = sfnts_reader_rstring; r->seek = sfnts_reader_seek; r->index = -1; - r->error = false; + r->error = 0; if (r_type(pdr) != t_dictionary || dict_find_string(pdr, "sfnts", &r->sfnts) <= 0) - r->error = true; + r->error = gs_error_undefined; sfnts_next_elem(r); } @@ -284,7 +280,7 @@ sfnt_copy_table(sfnts_reader *r, sfnts_writer *w, int length) { byte buf[1024]; - while (length > 0 && !r->error) { + while (length > 0 && r->error >= 0) { int l = min(length, sizeof(buf)); (void)r->rstring(r, buf, l); @@ -293,7 +289,7 @@ sfnt_copy_table(sfnts_reader *r, sfnts_writer *w, int length) } } -static ulong +static int sfnts_copy_except_glyf(sfnts_reader *r, sfnts_writer *w) { /* Note : TTC is not supported and probably is unuseful for Type 42. */ /* This skips glyf, loca and cmap from copying. */ @@ -310,12 +306,21 @@ sfnts_copy_except_glyf(sfnts_reader *r, sfnts_writer *w) ulong size_new = 12; r->rword(r); /* searchRange */ + if (r->error < 0) + return r->error; + r->rword(r); /* entrySelector */ + if (r->error < 0) + return r->error; + r->rword(r); /* rangeShift */ - for (i = 0; i < num_tables; i++) { - if (r->error) - return 0; + if (r->error < 0) + return r->error; + + for (i = 0; i < num_tables && r->error >= 0; i++) { (void)r->rstring(r, tables[i].tag, 4); + if (r->error < 0) + continue; tables[i].checkSum = r->rlong(r); tables[i].offset = r->rlong(r); tables[i].length = r->rlong(r); @@ -326,10 +331,12 @@ sfnts_copy_except_glyf(sfnts_reader *r, sfnts_writer *w) (tables[i].length + alignment - 1) / alignment * alignment; } } + if (r->error < 0) + return r->error; size_new += num_tables_new * 16; - if (w == 0) + if (w == 0) { return size_new; - + } searchRange = v = num_tables_new * 16; for (i = 0; v; i++) { v >>= 1; @@ -352,33 +359,39 @@ sfnts_copy_except_glyf(sfnts_reader *r, sfnts_writer *w) w->wlong(w, tables[i].length); } } - for (i = 0; i < num_tables; i++) { + for (i = 0; i < num_tables && r->error >= 0; i++) { if (sfnts_need_copy_table(tables[i].tag)) { int k = tables[i].length; r->seek(r, tables[i].offset); - if (r->error) - return 0; - if (w->p - w->buf != tables[i].offset_new + num_tables_new * 16) - return 0; /* the algorithm consistency check */ + + if (w->p - w->buf != tables[i].offset_new + num_tables_new * 16) { + r->error = gs_error_invalidfont; /* the algorithm consistency check */ + continue; + } sfnt_copy_table(r, w, tables[i].length); for (; k & (alignment - 1); k++) w->wbyte(w, 0); } } + if (r->error < 0) + return r->error; + return (size_new); } -static ulong -true_type_size(ref *pdr) +static int +true_type_size(ref *pdr, unsigned long int *length) { sfnts_reader r; sfnts_reader_init(&r, pdr); - return (sfnts_copy_except_glyf(&r, 0)); + *length = sfnts_copy_except_glyf(&r, 0); + + return r.error; } -static ushort +static int FAPI_FF_serialize_tt_font(gs_fapi_font *ff, void *buf, int buf_size) { ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); @@ -388,9 +401,7 @@ FAPI_FF_serialize_tt_font(gs_fapi_font *ff, void *buf, int buf_size) w.buf_size = buf_size; w.buf = w.p = buf; sfnts_reader_init(&r, pdr); - if (!sfnts_copy_except_glyf(&r, &w)) - return (1); - return (r.error); + return sfnts_copy_except_glyf(&r, &w); } static inline ushort @@ -404,108 +415,150 @@ float_to_ushort(float v) * here. Better, for example, for BlendDesignMap which is an array, of arrays, of arrays of * numbers. */ -static ushort -FAPI_FF_get_word(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index) +static int +FAPI_FF_get_word(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index, unsigned short *ret) { gs_font_type1 *pfont = (gs_font_type1 *) ff->client_font_data; ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); + int code = 0; switch ((int)var_id) { case gs_fapi_font_feature_Weight: - return 0; /* wrong */ + *ret = 0; /* wrong */ + break; case gs_fapi_font_feature_ItalicAngle: - return 0; /* wrong */ + *ret = 0; /* wrong */ + break; case gs_fapi_font_feature_IsFixedPitch: - return 0; /* wrong */ + *ret = 0; /* wrong */ + break; case gs_fapi_font_feature_UnderLinePosition: - return 0; /* wrong */ + *ret = 0; /* wrong */ + break; case gs_fapi_font_feature_UnderlineThickness: - return 0; /* wrong */ + *ret = 0; /* wrong */ + break; case gs_fapi_font_feature_FontType: - return (pfont->FontType == 2 ? 2 : 1); + *ret = (pfont->FontType == 2 ? 2 : 1); + break; case gs_fapi_font_feature_FontBBox: switch (index) { case 0: - return ((ushort) pfont->FontBBox.p.x); + *ret = ((ushort) pfont->FontBBox.p.x); + break; case 1: - return ((ushort) pfont->FontBBox.p.y); + *ret = ((ushort) pfont->FontBBox.p.y); + break; case 2: - return ((ushort) pfont->FontBBox.q.x); + *ret = ((ushort) pfont->FontBBox.q.x); + break; case 3: - return ((ushort) pfont->FontBBox.q.y); + *ret = ((ushort) pfont->FontBBox.q.y); + break; + default: + code = gs_note_error(gs_error_rangecheck); } - return 0; + break; case gs_fapi_font_feature_BlueValues_count: - return (pfont->data.BlueValues.count); + *ret = pfont->data.BlueValues.count; + break; case gs_fapi_font_feature_BlueValues: - return (float_to_ushort(pfont->data.BlueValues.values[index])); + *ret = (float_to_ushort(pfont->data.BlueValues.values[index])); + break; case gs_fapi_font_feature_OtherBlues_count: - return (pfont->data.OtherBlues.count); + *ret = pfont->data.OtherBlues.count; + break; case gs_fapi_font_feature_OtherBlues: - return (float_to_ushort(pfont->data.OtherBlues.values[index])); + *ret = (float_to_ushort(pfont->data.OtherBlues.values[index])); + break; case gs_fapi_font_feature_FamilyBlues_count: - return (pfont->data.FamilyBlues.count); + *ret = pfont->data.FamilyBlues.count; + break; case gs_fapi_font_feature_FamilyBlues: - return (float_to_ushort(pfont->data.FamilyBlues.values[index])); + *ret = (float_to_ushort(pfont->data.FamilyBlues.values[index])); + break; case gs_fapi_font_feature_FamilyOtherBlues_count: - return (pfont->data.FamilyOtherBlues.count); + *ret = pfont->data.FamilyOtherBlues.count; + break; case gs_fapi_font_feature_FamilyOtherBlues: - return (float_to_ushort - (pfont->data.FamilyOtherBlues.values[index])); + *ret = (float_to_ushort(pfont->data.FamilyOtherBlues.values[index])); + break; case gs_fapi_font_feature_BlueShift: - return (float_to_ushort(pfont->data.BlueShift)); + *ret = float_to_ushort(pfont->data.BlueShift); + break; case gs_fapi_font_feature_BlueFuzz: - return (float_to_ushort(pfont->data.BlueShift)); + *ret = float_to_ushort(pfont->data.BlueShift); + break; case gs_fapi_font_feature_StdHW: - return (pfont->data.StdHW.count == 0 ? 0 : float_to_ushort(pfont->data.StdHW.values[0])); /* UFST bug ? */ + *ret = (pfont->data.StdHW.count == 0 ? 0 : float_to_ushort(pfont->data.StdHW.values[0])); /* UFST bug ? */ + break; case gs_fapi_font_feature_StdVW: - return (pfont->data.StdVW.count == 0 ? 0 : float_to_ushort(pfont->data.StdVW.values[0])); /* UFST bug ? */ + *ret = (pfont->data.StdVW.count == 0 ? 0 : float_to_ushort(pfont->data.StdVW.values[0])); /* UFST bug ? */ + break; case gs_fapi_font_feature_StemSnapH_count: - return (pfont->data.StemSnapH.count); + *ret = pfont->data.StemSnapH.count; + break; case gs_fapi_font_feature_StemSnapH: - return (float_to_ushort(pfont->data.StemSnapH.values[index])); + *ret = float_to_ushort(pfont->data.StemSnapH.values[index]); + break; case gs_fapi_font_feature_StemSnapV_count: - return (pfont->data.StemSnapV.count); + *ret = pfont->data.StemSnapV.count; + break; case gs_fapi_font_feature_StemSnapV: - return (float_to_ushort(pfont->data.StemSnapV.values[index])); + *ret = float_to_ushort(pfont->data.StemSnapV.values[index]); + break; case gs_fapi_font_feature_ForceBold: - return (pfont->data.ForceBold); + *ret = pfont->data.ForceBold; + break; case gs_fapi_font_feature_LanguageGroup: - return (pfont->data.LanguageGroup); + *ret = pfont->data.LanguageGroup; + break; case gs_fapi_font_feature_lenIV: - return (ff->need_decrypt ? 0 : pfont->data.lenIV); + *ret = ff->need_decrypt ? 0 : pfont->data.lenIV; + break; case gs_fapi_font_feature_GlobalSubrs_count: { ref *Private, *GlobalSubrs; if (pfont->FontType == ft_encrypted2) { - if (dict_find_string(pdr, "Private", &Private) <= 0) - return 0; - if (dict_find_string(Private, "GlobalSubrs", &GlobalSubrs) - <= 0) - return 0;; - return (r_size(GlobalSubrs)); + if (dict_find_string(pdr, "Private", &Private) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Private, "GlobalSubrs", &GlobalSubrs) <= 0) { + *ret = 0; + break; + } + *ret = r_size(GlobalSubrs); + break; } - /* Since we don't have an error return capability, use as unlikely a value as possible */ - return (65535); + *ret = 0; + break; } case gs_fapi_font_feature_Subrs_count: { ref *Private, *Subrs; - if (dict_find_string(pdr, "Private", &Private) <= 0) - return 0; - if (dict_find_string(Private, "Subrs", &Subrs) <= 0) - return 0; - return (r_size(Subrs)); + if (dict_find_string(pdr, "Private", &Private) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Private, "Subrs", &Subrs) <= 0) { + *ret = 0; + break; + } + *ret = r_size(Subrs); + break; } case gs_fapi_font_feature_CharStrings_count: { ref *CharStrings; if (dict_find_string(pdr, "CharStrings", &CharStrings) <= 0) - return 0; - return (dict_maxlength(CharStrings)); + *ret = 0; + else + *ret = dict_maxlength(CharStrings); + break; } /* Multiple Master specific */ case gs_fapi_font_feature_DollarBlend: @@ -513,75 +566,109 @@ FAPI_FF_get_word(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index) ref *DBlend; if (dict_find_string(pdr, "$Blend", &DBlend) <= 0) - return 0; - return 1; + *ret = 0; + else + *ret = 1; + break; } case gs_fapi_font_feature_BlendAxisTypes_count: { ref *Info, *Axes; - if (dict_find_string(pdr, "FontInfo", &Info) <= 0) - return 0; - if (dict_find_string(Info, "BlendAxisTypes", &Axes) <= 0) - return 0; - return (r_size(Axes)); + if (dict_find_string(pdr, "FontInfo", &Info) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Info, "BlendAxisTypes", &Axes) <= 0) { + *ret = 0; + break; + } + *ret = r_size(Axes); + break; } case gs_fapi_font_feature_BlendFontInfo_count: { ref *Info, *FontInfo; - if (dict_find_string(pdr, "Blend", &Info) <= 0) - return 0; - if (dict_find_string(Info, "FontInfo", &FontInfo) <= 0) - return 0; - return (dict_length(FontInfo)); + if (dict_find_string(pdr, "Blend", &Info) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Info, "FontInfo", &FontInfo) <= 0) { + *ret = 0; + break; + } + *ret = dict_length(FontInfo); + break; } case gs_fapi_font_feature_BlendPrivate_count: { ref *Info, *Private; - if (dict_find_string(pdr, "Blend", &Info) <= 0) - return 0; - if (dict_find_string(Info, "Private", &Private) <= 0) - return 0; - return (dict_length(Private)); + if (dict_find_string(pdr, "Blend", &Info) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Info, "Private", &Private) <= 0) { + *ret = 0; + break; + } + *ret = dict_length(Private); + break; } case gs_fapi_font_feature_WeightVector_count: { - return pfont->data.WeightVector.count; + *ret = pfont->data.WeightVector.count; + break; } case gs_fapi_font_feature_BlendDesignPositionsArrays_count: { ref *Info, *Array; - if (dict_find_string(pdr, "FontInfo", &Info) <= 0) - return 0; - if (dict_find_string(Info, "BlendDesignPositions", &Array) <= - 0) - return 0; - return (r_size(Array)); + if (dict_find_string(pdr, "FontInfo", &Info) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Info, "BlendDesignPositions", &Array) <= 0) { + *ret = 0; + break; + } + *ret = r_size(Array); + break; } case gs_fapi_font_feature_BlendDesignMapArrays_count: { ref *Info, *Array; - if (dict_find_string(pdr, "FontInfo", &Info) <= 0) - return 0; - if (dict_find_string(Info, "BlendDesignMap", &Array) <= 0) - return 0; - return (r_size(Array)); + if (dict_find_string(pdr, "FontInfo", &Info) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Info, "BlendDesignMap", &Array) <= 0) { + *ret = 0; + break; + } + *ret = r_size(Array); + break; } case gs_fapi_font_feature_BlendDesignMapSubArrays_count: { ref *Info, *Array, SubArray; - if (dict_find_string(pdr, "FontInfo", &Info) <= 0) - return 0; - if (dict_find_string(Info, "BlendDesignMap", &Array) <= 0) - return 0; - if (array_get(ff->memory, Array, index, &SubArray) < 0) - return 0; - return (r_size(&SubArray)); + if (dict_find_string(pdr, "FontInfo", &Info) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Info, "BlendDesignMap", &Array) <= 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, Array, index, &SubArray) < 0) { + *ret = 0; + break; + } + *ret = r_size(&SubArray); + break; } case gs_fapi_font_feature_DollarBlend_length: { @@ -589,11 +676,15 @@ FAPI_FF_get_word(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index) int i, length = 0; char Buffer[32]; - if (dict_find_string(pdr, "$Blend", &DBlend) <= 0) - return 0; + if (dict_find_string(pdr, "$Blend", &DBlend) <= 0) { + *ret = 0; + break; + } for (i = 0; i < r_size(DBlend); i++) { - if (array_get(ff->memory, DBlend, i, &Element) < 0) - return 0; + if (array_get(ff->memory, DBlend, i, &Element) < 0) { + *ret = 0; + break; + } switch (r_btype(&Element)) { case t_name: name_string_ref(ff->memory, &Element, &string); @@ -619,433 +710,681 @@ FAPI_FF_get_word(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index) break; } } - return length; + *ret = length; + break; } case gs_fapi_font_feature_BlendFontBBox_length: { ref *Blend, *bfbbox; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } - if (dict_find_string(Blend, "FontBBox", &bfbbox) <= 0) - return 0; - return ((ushort)r_size(bfbbox)); + if (dict_find_string(Blend, "FontBBox", &bfbbox) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(bfbbox); + break; } case gs_fapi_font_feature_BlendFontBBox: { ref *Blend, *bfbbox, subbfbbox, val; int aind, ind; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "FontBBox", &bfbbox) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "FontBBox", &bfbbox) <= 0) { + *ret = 0; + break; + } ind = index % 4; aind = (index - ind) /4; - if (array_get(ff->memory, bfbbox, aind, &subbfbbox) < 0) - return 0; - if (array_get(ff->memory, &subbfbbox, ind, &val) < 0) - return 0; + if (array_get(ff->memory, bfbbox, aind, &subbfbbox) < 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, &subbfbbox, ind, &val) < 0) { + *ret = 0; + break; + } - return (ushort)val.value.intval; + *ret = (ushort)val.value.intval; + break; } case gs_fapi_font_feature_BlendBlueValues_length: { ref *Priv, *Blend, *bbv; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueValues", &bbv) <= 0) - return 0; - return ((ushort)r_size(bbv)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueValues", &bbv) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(bbv); + break; } case gs_fapi_font_feature_BlendBlueValues_count: { ref *Priv, *Blend, *bbv, sub; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueValues", &bbv) <= 0) - return 0; - if (array_get(ff->memory, bbv, index, &sub) < 0) - return 0; - return ((ushort)r_size(&sub)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueValues", &bbv) <= 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, bbv, index, &sub) < 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(&sub); + break; } case gs_fapi_font_feature_BlendBlueValues: { ref *Priv, *Blend, *bbv, sub, r; int aind = 0; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueValues", &bbv) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueValues", &bbv) <= 0) { + *ret = 0; + break; + } while (1) { - if (array_get(ff->memory, bbv, aind++, &sub) < 0) - return 0; + if ((code = array_get(ff->memory, bbv, aind++, &sub)) < 0) { + *ret = 0; + break; + } if (index - (int)r_size(&sub) < 0) { break; } index -= r_size(&sub); } - if (array_get(ff->memory, &sub, index, &r) < 0) - return 0; + if (code < 0) + break; + + if (array_get(ff->memory, &sub, index, &r) < 0) { + *ret = 0; + break; + } - return ((ushort)r.value.intval); + *ret = (ushort)r.value.intval; + break; } case gs_fapi_font_feature_BlendOtherBlues_length: { ref *Priv, *Blend, *bob; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "OtherBlues", &bob) <= 0) - return 0; - return ((ushort)r_size(bob)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "OtherBlues", &bob) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(bob); + break; } case gs_fapi_font_feature_BlendOtherBlues_count: { ref *Priv, *Blend, *bob, sub; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "OtherBlues", &bob) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "OtherBlues", &bob) <= 0) { + *ret = 0; + break; + } - if (array_get(ff->memory, bob, index, &sub) < 0) - return 0; - return ((ushort)r_size(&sub)); + if (array_get(ff->memory, bob, index, &sub) < 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(&sub); + break; } case gs_fapi_font_feature_BlendOtherBlues: { ref *Priv, *Blend, *bob, sub, r; int aind = 0; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "OtherBlues", &bob) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "OtherBlues", &bob) <= 0) { + *ret = 0; + break; + } while (1) { - if (array_get(ff->memory, bob, aind++, &sub) < 0) - return 0; + if ((code = array_get(ff->memory, bob, aind++, &sub)) < 0) + break; if (index - (int)r_size(&sub) < 0) { break; } index -= r_size(&sub); } - if (array_get(ff->memory, &sub, index, &r) < 0) - return 0; + if (code < 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, &sub, index, &r) < 0) { + *ret = 0; + break; + } - return ((ushort)r.value.intval); + *ret = (ushort)r.value.intval; + break; } case gs_fapi_font_feature_BlendBlueScale_count: { ref *Priv, *Blend, *bbs; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueScale", &bbs) <= 0) - return 0; - return ((ushort)r_size(bbs)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueScale", &bbs) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(bbs); + break; } case gs_fapi_font_feature_BlendBlueShift_count: { ref *Priv, *Blend, *bbs; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueShift", &bbs) <= 0) - return 0; - return ((ushort)r_size(bbs)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueShift", &bbs) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(bbs); + break; } case gs_fapi_font_feature_BlendBlueShift: { ref *Priv, *Blend, *bbs, r; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueShift", &bbs) <= 0) - return 0; - if (array_get(ff->memory, bbs, index, &r) < 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueShift", &bbs) <= 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, bbs, index, &r) < 0) { + *ret = 0; + break; + } - return ((ushort)r.value.intval); + *ret = (ushort)r.value.intval; + break; } case gs_fapi_font_feature_BlendBlueFuzz_count: { ref *Priv, *Blend, *bbf; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueFuzz", &bbf) <= 0) - return 0; - return ((ushort)r_size(bbf)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueFuzz", &bbf) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(bbf); + break; } case gs_fapi_font_feature_BlendBlueFuzz: { ref *Priv, *Blend, *bbf, r; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueFuzz", &bbf) <= 0) - return 0; - if (array_get(ff->memory, bbf, index, &r) < 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueFuzz", &bbf) <= 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, bbf, index, &r) < 0) { + *ret = 0; + break; + } - return ((ushort)r.value.intval); + *ret = (ushort)r.value.intval; + break; } case gs_fapi_font_feature_BlendForceBold_count: { ref *Priv, *Blend, *bfb; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "ForceBold", &bfb) <= 0) - return 0; - return ((ushort)r_size(bfb)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "ForceBold", &bfb) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(bfb); + break; } case gs_fapi_font_feature_BlendForceBold: { ref *Priv, *Blend, *bfb, r; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueFuzz", &bfb) <= 0) - return 0; - if (array_get(ff->memory, bfb, index, &r) < 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueFuzz", &bfb) <= 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, bfb, index, &r) < 0) { + *ret = 0; + break; + } - return ((ushort)r.value.boolval); + *ret = (ushort)r.value.boolval; } case gs_fapi_font_feature_BlendStdHW_length: { ref *Priv, *Blend, *stdhw; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StdHW", &stdhw) <= 0) - return 0; - return ((ushort)r_size(stdhw)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StdHW", &stdhw) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(stdhw); + break; } case gs_fapi_font_feature_BlendStdHW_count: { ref *Priv, *Blend, *stdhw, sub; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StdHW", &stdhw) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StdHW", &stdhw) <= 0) { + *ret = 0; + break; + } - if (array_get(ff->memory, stdhw, index, &sub) < 0) - return 0; - return ((ushort)r_size(&sub)); + if (array_get(ff->memory, stdhw, index, &sub) < 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(&sub); + break; } case gs_fapi_font_feature_BlendStdHW: { ref *Priv, *Blend, *stdhw, sub, r; int aind = 0; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StdHW", &stdhw) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StdHW", &stdhw) <= 0) { + *ret = 0; + break; + } while (1) { - if (array_get(ff->memory, stdhw, aind++, &sub) < 0) - return 0; + if ((code = array_get(ff->memory, stdhw, aind++, &sub)) < 0) + break; if (index - (int)r_size(&sub) < 0) { break; } index -= r_size(&sub); } - if (array_get(ff->memory, &sub, index, &r) < 0) - return 0; + if (code < 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, &sub, index, &r) < 0) { + *ret = 0; + break; + } - return ((ushort)r.value.intval); + *ret = (ushort)r.value.intval; + break; } case gs_fapi_font_feature_BlendStdVW_length: { ref *Priv, *Blend, *stdvw; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StdVW", &stdvw) <= 0) - return 0; - return ((ushort)r_size(stdvw)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StdVW", &stdvw) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(stdvw); + break; } case gs_fapi_font_feature_BlendStdVW_count: { ref *Priv, *Blend, *stdvw, sub; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StdVW", &stdvw) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } - if (array_get(ff->memory, stdvw, index, &sub) < 0) - return 0; - return ((ushort)r_size(&sub)); + if (dict_find_string(Priv, "StdVW", &stdvw) <= 0) { + *ret = 0; + break; + } + + if (array_get(ff->memory, stdvw, index, &sub) < 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(&sub); + break; } case gs_fapi_font_feature_BlendStdVW: { ref *Priv, *Blend, *stdvw, sub, r; int aind = 0; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StdVW", &stdvw) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StdVW", &stdvw) <= 0) { + *ret = 0; + break; + } while (1) { - if (array_get(ff->memory, stdvw, aind++, &sub) < 0) - return 0; + if ((code = array_get(ff->memory, stdvw, aind++, &sub)) < 0) + break; if (index - (int)r_size(&sub) < 0) { break; } index -= r_size(&sub); } - if (array_get(ff->memory, &sub, index, &r) < 0) - return 0; + if (code < 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, &sub, index, &r) < 0) { + *ret = 0; + break; + } - return ((ushort)r.value.intval); + *ret = (ushort)r.value.intval; + break; } case gs_fapi_font_feature_BlendStemSnapH_length: { ref *Priv, *Blend, *ssh; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StemSnapH", &ssh) <= 0) - return 0; - return ((ushort)r_size(ssh)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StemSnapH", &ssh) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(ssh); + break; } case gs_fapi_font_feature_BlendStemSnapH_count: { ref *Priv, *Blend, *bssh, sub; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StemSnapH", &bssh) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StemSnapH", &bssh) <= 0) { + *ret = 0; + break; + } - if (array_get(ff->memory, bssh, index, &sub) < 0) - return 0; - return ((ushort)r_size(&sub)); + if (array_get(ff->memory, bssh, index, &sub) < 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(&sub); + break; } case gs_fapi_font_feature_BlendStemSnapH: { ref *Priv, *Blend, *bssh, sub, r; int aind = 0; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StemSnapH", &bssh) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StemSnapH", &bssh) <= 0) { + *ret = 0; + break; + } while (1) { - if (array_get(ff->memory, bssh, aind++, &sub) < 0) - return 0; + if ((code = array_get(ff->memory, bssh, aind++, &sub)) < 0) + break; if (index - (int)r_size(&sub) < 0) { break; } index -= r_size(&sub); } - if (array_get(ff->memory, &sub, index, &r) < 0) - return 0; + if (code < 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, &sub, index, &r) < 0) { + *ret = 0; + break; + } - return ((ushort)r.value.intval); + *ret = (ushort)r.value.intval; + break; } case gs_fapi_font_feature_BlendStemSnapV_length: { ref *Priv, *Blend, *ssv; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StdHW", &ssv) <= 0) - return 0; - return ((ushort)r_size(ssv)); + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StdHW", &ssv) <= 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(ssv); + break; } case gs_fapi_font_feature_BlendStemSnapV_count: { ref *Priv, *Blend, *bssv, sub; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StemSnapV", &bssv) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StemSnapV", &bssv) <= 0) { + *ret = 0; + break; + } - if (array_get(ff->memory, bssv, index, &sub) < 0) - return 0; - return ((ushort)r_size(&sub)); + if (array_get(ff->memory, bssv, index, &sub) < 0) { + *ret = 0; + break; + } + *ret = (ushort)r_size(&sub); + break; } case gs_fapi_font_feature_BlendStemSnapV: { ref *Priv, *Blend, *bssv, sub, r; int aind = 0; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "StemSnapV", &bssv) <= 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "StemSnapV", &bssv) <= 0) { + *ret = 0; + break; + } while (1) { - if (array_get(ff->memory, bssv, aind++, &sub) < 0) - return 0; + if ((code = array_get(ff->memory, bssv, aind++, &sub)) < 0) + break; if (index - (int)r_size(&sub) < 0) { break; } index -= r_size(&sub); } - if (array_get(ff->memory, &sub, index, &r) < 0) - return 0; + if (code < 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, &sub, index, &r) < 0) { + *ret = 0; + break; + } - return ((ushort)r.value.intval); + *ret = (ushort)r.value.intval; + break; } /* End MM specifics */ } - return 0; + return code; } -static ulong -FAPI_FF_get_long(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index) +static int +FAPI_FF_get_long(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index, unsigned long *ret) { gs_font_type1 *pfont = (gs_font_type1 *) ff->client_font_data; + int code = 0; ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); switch ((int)var_id) { case gs_fapi_font_feature_UniqueID: - return (pfont->UID.id); + *ret = pfont->UID.id; + break; case gs_fapi_font_feature_BlueScale: - return ((ulong) (pfont->data.BlueScale * 65536)); + *ret = (ulong) (pfont->data.BlueScale * 65536); + break; case gs_fapi_font_feature_Subrs_total_size: { ref *Private, *Subrs, v; @@ -1053,8 +1392,10 @@ FAPI_FF_get_long(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index) ulong size = 0; long i; const char *name[2] = { "Subrs", "GlobalSubrs" }; - if (dict_find_string(pdr, "Private", &Private) <= 0) - return 0; + if (dict_find_string(pdr, "Private", &Private) <= 0) { + *ret = 0; + break; + } for (k = 0; k < 2; k++) { if (dict_find_string(Private, name[k], &Subrs) > 0) for (i = r_size(Subrs) - 1; i >= 0; i--) { @@ -1064,21 +1405,23 @@ FAPI_FF_get_long(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index) } } } - return size; + *ret = size; } + break; case gs_fapi_font_feature_TT_size: - return (true_type_size(pdr)); + code = true_type_size(pdr, ret); + break; } - return 0; + return code; } -static float -FAPI_FF_get_float(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index) +static int +FAPI_FF_get_float(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index, float *ret) { gs_font_type1 *pfont1 = (gs_font_type1 *) ff->client_font_data; gs_font_base *pbfont = (gs_font_base *) ff->client_font_data2; ref *pdr = pfont_dict(pbfont); - + int code = 0; gs_fapi_server *I = pbfont->FAPI; switch ((int)var_id) { @@ -1101,101 +1444,133 @@ FAPI_FF_get_float(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index) switch (index) { case 0: default: - return (mptr->xx / FontMatrix_div); + *ret = (mptr->xx / FontMatrix_div); + break; case 1: - return (mptr->xy / FontMatrix_div); + *ret = (mptr->xy / FontMatrix_div); + break; case 2: - return (mptr->yx / FontMatrix_div); + *ret = (mptr->yx / FontMatrix_div); + break; case 3: - return (mptr->yy / FontMatrix_div); + *ret = (mptr->yy / FontMatrix_div); + break; case 4: - return (mptr->tx / FontMatrix_div); + *ret = (mptr->tx / FontMatrix_div); + break; case 5: - return (mptr->ty / FontMatrix_div); + *ret = (mptr->ty / FontMatrix_div); + break; } + break; } case gs_fapi_font_feature_WeightVector: { if (index < pfont1->data.WeightVector.count) { - return pfont1->data.WeightVector.values[index]; + *ret = pfont1->data.WeightVector.values[index]; } else { - return 0; + *ret = 0; } } + break; case gs_fapi_font_feature_BlendDesignPositionsArrayValue: { ref *Info, *Array, SubArray, value; int array_index = index / 8; index %= 8; - if (dict_find_string(pdr, "FontInfo", &Info) <= 0) - return 0; - if (dict_find_string(Info, "BlendDesignPositions", &Array) <= - 0) - return 0; - if (array_get(ff->memory, Array, array_index, &SubArray) < 0) - return 0; + if (dict_find_string(pdr, "FontInfo", &Info) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Info, "BlendDesignPositions", &Array) <= 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, Array, array_index, &SubArray) < 0) { + *ret = 0; + break; + } if (array_get(ff->memory, &SubArray, index, &value) < 0) return 0; if (!r_has_type(&value, t_integer)) { if (r_has_type(&value, t_real)) { - return (value.value.realval); + *ret = value.value.realval; } else - return 0; + *ret = 0; } else - return ((float)value.value.intval); + *ret = ((float)value.value.intval); } + break; case gs_fapi_font_feature_BlendDesignMapArrayValue: { ref *Info, *Array, SubArray, SubSubArray, value; int array_index = index / 64; index %= 8; - if (dict_find_string(pdr, "FontInfo", &Info) <= 0) - return 0; - if (dict_find_string(Info, "BlendDesignMap", &Array) <= 0) - return 0; - if (array_get(ff->memory, Array, array_index, &SubArray) < 0) - return 0; - if (array_get(ff->memory, &SubArray, index, &SubSubArray) < 0) - return 0; - if (array_get(ff->memory, &SubSubArray, index, &value) < 0) - return 0; + if (dict_find_string(pdr, "FontInfo", &Info) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Info, "BlendDesignMap", &Array) <= 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, Array, array_index, &SubArray) < 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, &SubArray, index, &SubSubArray) < 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, &SubSubArray, index, &value) < 0) { + *ret = 0; + break; + } if (!r_has_type(&value, t_integer)) { if (r_has_type(&value, t_real)) { - return (value.value.realval); + *ret = (value.value.realval); } else - return 0; + *ret = 0; } else - return ((float)value.value.intval); + *ret = ((float)value.value.intval); } + break; case gs_fapi_font_feature_BlendBlueScale: { ref *Priv, *Blend, *bbs, r; - float val = 0; - if (dict_find_string(pdr, "Blend", &Blend) <= 0) - return 0; - if (dict_find_string(Blend, "Private", &Priv) <= 0) - return 0; - if (dict_find_string(Priv, "BlueScale", &bbs) <= 0) - return 0; - if (array_get(ff->memory, bbs, index, &r) < 0) - return 0; + if (dict_find_string(pdr, "Blend", &Blend) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Blend, "Private", &Priv) <= 0) { + *ret = 0; + break; + } + if (dict_find_string(Priv, "BlueScale", &bbs) <= 0) { + *ret = 0; + break; + } + if (array_get(ff->memory, bbs, index, &r) < 0) { + *ret = 0; + break; + } if (r_has_type(&r, t_real)) - val = r.value.realval; + *ret = r.value.realval; else if (r_has_type(&r, t_integer)) - val = (float)r.value.intval; - return (val); + *ret = (float)r.value.intval; } + break; } - return 0; + return code; } static int @@ -1204,28 +1579,42 @@ FAPI_FF_get_name(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index, { ref name, string; ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); + int code = 0; switch ((int)var_id) { case gs_fapi_font_feature_BlendAxisTypes: { ref *Info, *Axes; - if (dict_find_string(pdr, "FontInfo", &Info) <= 0) - return 0; - if (dict_find_string(Info, "BlendAxisTypes", &Axes) <= 0) - return 0; - if (!r_has_type(Axes, t_array)) - return 0; - if (array_get(ff->memory, Axes, index, &name) < 0) - return 0; + if (dict_find_string(pdr, "FontInfo", &Info) <= 0) { + code = gs_note_error(gs_error_undefined); + break; + } + if (dict_find_string(Info, "BlendAxisTypes", &Axes) <= 0) { + code = gs_note_error(gs_error_undefined); + break; + } + if (!r_has_type(Axes, t_array)) { + code = gs_note_error(gs_error_undefined); + break; + } + if (array_get(ff->memory, Axes, index, &name) < 0) { + code = gs_note_error(gs_error_undefined); + break; + } } } - name_string_ref(ff->memory, &name, &string); - if (r_size(&string) >= len) - return 0; - memcpy(Buffer, string.value.const_bytes, r_size(&string)); - Buffer[r_size(&string)] = 0x00; - return 1; + if (code >= 0) { + name_string_ref(ff->memory, &name, &string); + if (r_size(&string) < len) { + memcpy(Buffer, string.value.const_bytes, r_size(&string)); + Buffer[r_size(&string)] = 0x00; + } + else { + code = gs_note_error(gs_error_unknownerror); + } + } + return code; } /* NOTE: we checked the type of $Blend at definefont time, so we know it is a @@ -1237,9 +1626,10 @@ FAPI_FF_get_proc(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index, { ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); char *ptr = Buffer; + int code = 0; if (!Buffer) - return 0; + return_error(gs_error_unknownerror); switch ((int)var_id) { case gs_fapi_font_feature_DollarBlend: @@ -1248,12 +1638,16 @@ FAPI_FF_get_proc(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index, int i; char Buf[32]; - if (dict_find_string(pdr, "$Blend", &DBlend) <= 0) - return 0; + if (dict_find_string(pdr, "$Blend", &DBlend) <= 0) { + code = gs_note_error(gs_error_undefined); + break; + } for (i = 0; i < r_size(DBlend); i++) { *ptr++ = 0x20; - if (array_get(ff->memory, DBlend, i, &Element) < 0) - return 0; + if (array_get(ff->memory, DBlend, i, &Element) < 0) { + code = gs_note_error(gs_error_undefined); + break; + } switch (r_btype(&Element)) { case t_name: name_string_ref(ff->memory, &Element, &string); @@ -1287,7 +1681,7 @@ FAPI_FF_get_proc(gs_fapi_font *ff, gs_fapi_font_feature var_id, int index, } } } - return (ptr - Buffer); + return code < 0 ? code : (ptr - Buffer); } static inline void @@ -1308,7 +1702,7 @@ decode_bytes(byte *p, const byte *s, int l, int lenIV) } } -static ushort +static int get_type1_data(gs_fapi_font *ff, const ref *type1string, byte *buf, ushort buf_length) { @@ -1328,8 +1722,8 @@ get_type1_data(gs_fapi_font *ff, const ref *type1string, return length; } -static ushort -FAPI_FF_get_gsubr(gs_fapi_font *ff, int index, byte *buf, ushort buf_length) +static int +FAPI_FF_get_gsubr(gs_fapi_font *ff, int index, byte *buf, int buf_length) { ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); ref *Private, *GlobalSubrs, subr; @@ -1344,8 +1738,8 @@ FAPI_FF_get_gsubr(gs_fapi_font *ff, int index, byte *buf, ushort buf_length) return (get_type1_data(ff, &subr, buf, buf_length)); } -static ushort -FAPI_FF_get_subr(gs_fapi_font *ff, int index, byte *buf, ushort buf_length) +static int +FAPI_FF_get_subr(gs_fapi_font *ff, int index, byte *buf, int buf_length) { ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); ref *Private, *Subrs, subr; @@ -1360,24 +1754,37 @@ FAPI_FF_get_subr(gs_fapi_font *ff, int index, byte *buf, ushort buf_length) return (get_type1_data(ff, &subr, buf, buf_length)); } -static ushort +static int FAPI_FF_get_raw_subr(gs_fapi_font *ff, int index, byte *buf, - ushort buf_length) + int buf_length) { ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); ref *Private, *Subrs, subr; + int code = 0; - if (dict_find_string(pdr, "Private", &Private) <= 0) - return 0; - if (dict_find_string(Private, "Subrs", &Subrs) <= 0) - return 0; - if (array_get(ff->memory, Subrs, index, &subr) < 0 - || r_type(&subr) != t_string) - return 0; - if (buf && buf_length && buf_length >= r_size(&subr)) { - memcpy(buf, subr.value.const_bytes, r_size(&subr)); - } - return (r_size(&subr)); + do { + if (dict_find_string(pdr, "Private", &Private) <= 0) { + code = gs_note_error(gs_error_undefined); + break; + } + if (dict_find_string(Private, "Subrs", &Subrs) <= 0) { + code = gs_note_error(gs_error_undefined); + break; + } + if (array_get(ff->memory, Subrs, index, &subr) < 0) { + code = gs_note_error(gs_error_undefined); + break; + } + if (r_type(&subr) != t_string) { + code = gs_note_error(gs_error_undefined); + break; + } + if (buf && buf_length && buf_length >= r_size(&subr)) { + memcpy(buf, subr.value.const_bytes, r_size(&subr)); + } + } while(0); + + return code < 0 ? code : r_size(&subr); } /* FAPI_FF_get_charstring_name() and FAPI_FF_get_charstring() @@ -1394,44 +1801,63 @@ FAPI_FF_get_raw_subr(gs_fapi_font *ff, int index, byte *buf, * also handle empty "slots" in the dictionary. */ -static ushort +static int FAPI_FF_get_charstring_name(gs_fapi_font *ff, int index, byte *buf, ushort buf_length) { + int code = 0; ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); ref *CharStrings, eltp[2], string; - if (dict_find_string(pdr, "CharStrings", &CharStrings) <= 0) - return 0; - if (dict_index_entry(CharStrings, index, eltp) < 0) - return 0; - if (r_type(&eltp[0]) != t_name) - return 0; - name_string_ref(ff->memory, &eltp[0], &string); - if (r_size(&string) > buf_length) - return (r_size(&string)); - memcpy(buf, string.value.const_bytes, r_size(&string)); - buf[r_size(&string)] = 0x00; - return (r_size(&string)); + do { + if (dict_find_string(pdr, "CharStrings", &CharStrings) <= 0) { + code = gs_note_error(gs_error_undefined); + break; + } + if (dict_index_entry(CharStrings, index, eltp) < 0) { + code = gs_note_error(gs_error_undefined); + break; + } + if (r_type(&eltp[0]) != t_name) { + code = gs_note_error(gs_error_undefined); + break; + } + name_string_ref(ff->memory, &eltp[0], &string); + if (r_size(&string) <= buf_length) { + memcpy(buf, string.value.const_bytes, r_size(&string)); + buf[r_size(&string)] = 0x00; + } + } while(0); + return code < 0 ? code : r_size(&string); } -static ushort +static int FAPI_FF_get_charstring(gs_fapi_font *ff, int index, byte *buf, ushort buf_length) { + int code = 0; ref *pdr = pfont_dict(((gs_font_base *) ff->client_font_data2)); ref *CharStrings, eltp[2]; - if (dict_find_string(pdr, "CharStrings", &CharStrings) <= 0) - return 0; - if (dict_index_entry(CharStrings, index, eltp) < 0) - return 0; - if (r_type(&eltp[1]) != t_string) - return 0; - if (buf && buf_length && buf_length >= r_size(&eltp[1])) { - memcpy(buf, eltp[1].value.const_bytes, r_size(&eltp[1])); - } - return (r_size(&eltp[1])); + do { + if (dict_find_string(pdr, "CharStrings", &CharStrings) <= 0) { + code = gs_note_error(gs_error_undefined); + break; + } + if (dict_index_entry(CharStrings, index, eltp) < 0) { + code = gs_note_error(gs_error_undefined); + break; + } + if (r_type(&eltp[1]) != t_string) { + code = gs_note_error(gs_error_typecheck); + break; + } + if (buf && buf_length && buf_length >= r_size(&eltp[1])) { + memcpy(buf, eltp[1].value.const_bytes, r_size(&eltp[1])); + } + } while(0); + + return code < 0 ? code : r_size(&eltp[1]); } static int @@ -1467,7 +1893,7 @@ sfnt_get_sfnt_length(ref *pdr, ulong *len) return code; } -static bool +static int sfnt_get_glyph_offset(ref *pdr, gs_font_type42 *pfont42, int index, ulong *offset0) { /* Note : TTC is not supported and probably is unuseful for Type 42. */ @@ -1476,13 +1902,13 @@ sfnt_get_glyph_offset(ref *pdr, gs_font_type42 *pfont42, int index, if (index < pfont42->data.trueNumGlyphs) { sfnts_reader_init(&r, pdr); - r.seek(&r, pfont42->data.loca + index * glyf_elem_size); + r.seek(&r, pfont42->data.loca + index * (ulong)glyf_elem_size); *offset0 = pfont42->data.glyf + (glyf_elem_size == 2 ? r.rword(&r) * 2 : r.rlong(&r)); } else { - r.error = true; + r.error = gs_note_error(gs_error_rangecheck); } return (r.error); } @@ -1559,8 +1985,7 @@ get_charstring(gs_fapi_font *ff, int char_code, ref **proc, ref *char_name) } static int -FAPI_FF_get_glyph(gs_fapi_font *ff, int char_code, byte *buf, - ushort buf_length) +FAPI_FF_get_glyph(gs_fapi_font *ff, gs_glyph char_code, byte *buf, int buf_length) { /* * We assume that renderer requests glyph data with multiple @@ -1621,8 +2046,7 @@ FAPI_FF_get_glyph(gs_fapi_font *ff, int char_code, byte *buf, || array_get(ff->memory, StandardEncoding, char_code, &char_name) < 0) if (name_ref - (ff->memory, (const byte *)".notdef", 7, &char_name, - -1) < 0) + (ff->memory, (const byte *)".notdef", 7, &char_name, -1) < 0) return gs_fapi_glyph_invalid_format; } if (dict_find_string(pdr, "CharStrings", &CharStrings) <= 0) @@ -1630,8 +2054,7 @@ FAPI_FF_get_glyph(gs_fapi_font *ff, int char_code, byte *buf, if (dict_find(CharStrings, &char_name, &glyph) <= 0) { if (name_ref - (ff->memory, (const byte *)".notdef", 7, &char_name, - -1) < 0) { + (ff->memory, (const byte *)".notdef", 7, &char_name, -1) < 0) { return gs_fapi_glyph_invalid_format; } if (dict_find(CharStrings, &char_name, &glyph) <= 0) { @@ -1682,9 +2105,9 @@ FAPI_FF_get_glyph(gs_fapi_font *ff, int char_code, byte *buf, else { gs_font_type42 *pfont42 = (gs_font_type42 *) ff->client_font_data; ulong offset0, length_read; - bool error = sfnt_get_glyph_offset(pdr, pfont42, char_code, &offset0); + int error = sfnt_get_glyph_offset(pdr, pfont42, char_code, &offset0); - if (error != 0) { + if (error < 0) { glyph_length = gs_fapi_glyph_invalid_index; } else if (pfont42->data.len_glyphs) { @@ -1694,19 +2117,29 @@ FAPI_FF_get_glyph(gs_fapi_font *ff, int char_code, byte *buf, glyph_length = gs_fapi_glyph_invalid_index; } else { - ulong noffs; + ulong noffs, endoffs; + int code; /* If we haven't got a len_glyphs array, try using the offset of the next glyph offset * to work out the length */ error = sfnt_get_glyph_offset(pdr, pfont42, char_code + 1, &noffs); if (error == 0) { glyph_length = noffs - offset0; + code = sfnt_get_sfnt_length(pdr, &endoffs); + if (code < 0) { + glyph_length = gs_fapi_glyph_invalid_index; + } + else { + if (glyph_length + offset0 > endoffs) { + glyph_length = gs_fapi_glyph_invalid_index; + } + } } else { /* And if we can't get the next glyph offset, use the end of the sfnt data * to work out the length. */ - int code = sfnt_get_sfnt_length(pdr, &noffs); + code = sfnt_get_sfnt_length(pdr, &noffs); if (code < 0) { glyph_length = gs_fapi_glyph_invalid_index; } @@ -1744,16 +2177,14 @@ FAPI_FF_get_glyph(gs_fapi_font *ff, int char_code, byte *buf, } static int -ps_fapi_get_metrics(gs_fapi_font *ff, gs_string *char_name, int cid, - double *m, bool vertical) +ps_fapi_get_metrics(gs_fapi_font *ff, gs_string *char_name, gs_glyph cid, double *m, bool vertical) { ref glyph; int code; gs_font_base *pbfont = ((gs_font_base *) ff->client_font_data2); if (char_name->data != NULL) { - make_string(&glyph, avm_foreign | a_readonly, char_name->size, - char_name->data); + make_string(&glyph, avm_foreign | a_readonly, char_name->size, char_name->data); } else { make_int(&glyph, cid); @@ -1776,13 +2207,13 @@ ps_fapi_get_metrics(gs_fapi_font *ff, gs_string *char_name, int cid, static int ps_get_glyphname_or_cid(gs_text_enum_t *penum, gs_font_base *pbfont, gs_string *charstring, gs_string *name, - int ccode, gs_string *enc_char_name, + gs_glyph ccode, gs_string *enc_char_name, char *font_file_path, gs_fapi_char_ref *cr, bool bCID); static int ps_fapi_set_cache(gs_text_enum_t *penum, const gs_font_base *pbfont, - const gs_string *char_name, int cid, + const gs_string *char_name, gs_glyph cid, const double pwidth[2], const gs_rect *pbbox, const double Metrics2_sbw_default[4], bool *imagenow); @@ -2211,7 +2642,7 @@ zfapi_finish_render(i_ctx_t *i_ctx_p) static int ps_fapi_set_cache(gs_text_enum_t *penum, const gs_font_base *pbfont, - const gs_string *char_name, int cid, + const gs_string *char_name, gs_glyph cid, const double pwidth[2], const gs_rect *pbbox, const double Metrics2_sbw_default[4], bool *imagenow) { @@ -2219,7 +2650,7 @@ ps_fapi_set_cache(gs_text_enum_t *penum, const gs_font_base *pbfont, op_proc_t exec_cont = 0; /* dummy - see below */ int code = 0; - if (cid < 0) { + if (cid < GS_MIN_CID_GLYPH) { ref cname; make_string(&cname, avm_foreign | a_readonly, char_name->size, @@ -2232,7 +2663,7 @@ ps_fapi_set_cache(gs_text_enum_t *penum, const gs_font_base *pbfont, else { ref cidref; - make_int(&cidref, cid); + make_int(&cidref, (cid - GS_MIN_CID_GLYPH)); code = zchar_set_cache(i_ctx_p, pbfont, &cidref, NULL, pwidth, pbbox, zfapi_finish_render, &exec_cont, Metrics2_sbw_default); @@ -2268,7 +2699,7 @@ find_substring(const byte *where, int length, const char *what) static int ps_get_glyphname_or_cid(gs_text_enum_t *penum, gs_font_base *pbfont, gs_string *charstring, - gs_string *name, int ccode, + gs_string *name, gs_glyph ccode, gs_string *enc_char_name, char *font_file_path, gs_fapi_char_ref *cr, bool bCID) { @@ -2324,7 +2755,7 @@ ps_get_glyphname_or_cid(gs_text_enum_t *penum, enc_char_name->size = 0; } else { - if (ccode >= 0) { + if (ccode != GS_NO_CHAR) { /* Translate from PS encoding to char name : */ ref *Encoding; @@ -2510,9 +2941,9 @@ ps_get_glyphname_or_cid(gs_text_enum_t *penum, /* Too big for single string, so its an array of 2 strings */ code = string_array_access_proc(pbfont->memory, CIDMap, 1, - client_char_code * gdb, gdb, - NULL, NULL, - (const byte **)&Map); + client_char_code * (ulong)gdb, + gdb, NULL, NULL, + (const byte **)&Map); } else { if (CIDMap->tas.rsize <= c_code * gdb) { @@ -2544,7 +2975,28 @@ ps_get_glyphname_or_cid(gs_text_enum_t *penum, } else if (is_TT_from_type42) { /* This font must not use 'cmap', so compute glyph index from CharStrings : */ - ref *CharStrings, *glyph_index; + ref *CharStrings, *glyph_index, *cmaptab; + + if (dict_find_string(pdr, "TT_cmap", &cmaptab) > 0 && + r_has_type(cmaptab, t_dictionary)) { + const char *nd = ".notdef"; + + if (enc_char_name->size >= strlen(nd) && + enc_char_name->data[0] == nd[0] && + !memcmp(enc_char_name->data, nd, strlen(nd))) { + ref ccref, *gidref, boolref; + make_int(&ccref, ccode); + if (dict_find(cmaptab, &ccref, &gidref) > 0 && + r_has_type(gidref, t_integer) && + gidref->value.intval == 0) { + make_bool(&boolref, true); + } + else { + make_bool(&boolref, false); + } + dict_put_string(pdr, ".render_notdef", &boolref, NULL); + } + } if (dict_find_string(pdr, "CharStrings", &CharStrings) <= 0 || !r_has_type(CharStrings, t_dictionary)) @@ -2614,7 +3066,7 @@ ps_get_glyphname_or_cid(gs_text_enum_t *penum, for same char code. The last should be true due to PLRM3, "5.9.4 Subsetting and Incremental Definition of Glyphs". */ - if (ccode >= 0) { + if (ccode != GS_NO_CHAR) { cr->char_codes[0] = client_char_code; } else { @@ -2756,7 +3208,7 @@ FAPI_char(i_ctx_t *i_ctx_p, bool bBuildGlyph, ref *charstring) gs_text_enum_t *penum = op_show_find(i_ctx_p); gs_string char_string, *c_string_p = NULL; gs_string char_name, *c_name_p = NULL; - int cindex = -1; + gs_glyph cindex = GS_NO_CHAR; ref gname; if (I == NULL) @@ -2780,6 +3232,7 @@ FAPI_char(i_ctx_t *i_ctx_p, bool bBuildGlyph, ref *charstring) } else { + int chint; if (bBuildGlyph && pbfont->FontType == ft_CID_TrueType && r_has_type(op, t_name)) { ref *chstrs, *chs; @@ -2800,7 +3253,8 @@ FAPI_char(i_ctx_t *i_ctx_p, bool bBuildGlyph, ref *charstring) make_null(&gname); check_type(*op, t_integer); - int_param(op, 0xFFFF, &cindex); + int_param(op, 0xFFFF, (int *)&chint); + cindex = chint; } if (dict_find_string(pdr, "SubfontId", &v) > 0 @@ -2822,7 +3276,7 @@ FAPI_char(i_ctx_t *i_ctx_p, bool bBuildGlyph, ref *charstring) code = gs_fapi_do_char(pfont, igs, penum, font_file_path, - bBuildGlyph, c_string_p, c_name_p, (gs_char)cindex, (gs_glyph)cindex, + bBuildGlyph, c_string_p, c_name_p, (gs_char)cindex, cindex, subfont); if (font_file_path != NULL) { gs_free_string(imemory, (byte *) font_file_path, r_size(v) + 1, diff --git a/psi/zfarc4.c b/psi/zfarc4.c index d80289e0..dad70171 100644 --- a/psi/zfarc4.c +++ b/psi/zfarc4.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfbcp.c b/psi/zfbcp.c index f68e7ce4..88b4f207 100644 --- a/psi/zfbcp.c +++ b/psi/zfbcp.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfcid.c b/psi/zfcid.c index fce3a3ec..19548d4c 100644 --- a/psi/zfcid.c +++ b/psi/zfcid.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfcid0.c b/psi/zfcid0.c index 055701fa..c9e3ae04 100644 --- a/psi/zfcid0.c +++ b/psi/zfcid0.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfcid1.c b/psi/zfcid1.c index 8e1b78a9..dcaca163 100644 --- a/psi/zfcid1.c +++ b/psi/zfcid1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfcmap.c b/psi/zfcmap.c index db5c2b81..6cb3a237 100644 --- a/psi/zfcmap.c +++ b/psi/zfcmap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfdctd.c b/psi/zfdctd.c index 93570573..c12e8ea8 100644 --- a/psi/zfdctd.c +++ b/psi/zfdctd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfdcte.c b/psi/zfdcte.c index 5d292d93..4adb3389 100644 --- a/psi/zfdcte.c +++ b/psi/zfdcte.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfdecode.c b/psi/zfdecode.c index 8e65a5e1..43f654b2 100644 --- a/psi/zfdecode.c +++ b/psi/zfdecode.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfile.c b/psi/zfile.c index be03a556..ec19796b 100644 --- a/psi/zfile.c +++ b/psi/zfile.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -357,6 +357,7 @@ zdeletefile(i_ctx_t *i_ctx_p) return code; } } + code = (*pname.iodev->procs.delete_file)(pname.iodev, pname.fname); if (code >= 0 && is_temp) diff --git a/psi/zfile.h b/psi/zfile.h index 112dbe6b..a2579344 100644 --- a/psi/zfile.h +++ b/psi/zfile.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfile1.c b/psi/zfile1.c index 2ac1d6ff..db6068f6 100644 --- a/psi/zfile1.c +++ b/psi/zfile1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfileio.c b/psi/zfileio.c index bd9e505e..9b35f2ca 100644 --- a/psi/zfileio.c +++ b/psi/zfileio.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfilter.c b/psi/zfilter.c index 3ce7652c..818e9c65 100644 --- a/psi/zfilter.c +++ b/psi/zfilter.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfilter2.c b/psi/zfilter2.c index 064a59bb..e65a6d8c 100644 --- a/psi/zfilter2.c +++ b/psi/zfilter2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfimscale.c b/psi/zfimscale.c index 3c963d7c..088a6c5f 100644 --- a/psi/zfimscale.c +++ b/psi/zfimscale.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfjbig2.c b/psi/zfjbig2.c index fb569d57..055463b8 100644 --- a/psi/zfjbig2.c +++ b/psi/zfjbig2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfjpx.c b/psi/zfjpx.c index e2fffbad..8b612659 100644 --- a/psi/zfjpx.c +++ b/psi/zfjpx.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfmd5.c b/psi/zfmd5.c index ad3338f0..516c9195 100644 --- a/psi/zfmd5.c +++ b/psi/zfmd5.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfont.c b/psi/zfont.c index 743e914a..5d7dd15f 100644 --- a/psi/zfont.c +++ b/psi/zfont.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -41,8 +41,11 @@ static int setup_unicode_decoder(i_ctx_t *i_ctx_p, ref *Decoding); bool zfont_mark_glyph_name(const gs_memory_t *mem, gs_glyph glyph, void *ignore_data) { - return (glyph >= gs_c_min_std_encoding_glyph || glyph == GS_NO_GLYPH ? false : - name_mark_index(mem, (uint) glyph)); + if (glyph == GS_NO_GLYPH) + return false; + if (glyph >= gs_c_min_std_encoding_glyph) + return false; + return name_mark_index(mem, (uint) glyph); } /* Get a global glyph code. */ diff --git a/psi/zfont0.c b/psi/zfont0.c index db7f2591..31c89d0a 100644 --- a/psi/zfont0.c +++ b/psi/zfont0.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfont1.c b/psi/zfont1.c index 7043d20c..61e1ff4b 100644 --- a/psi/zfont1.c +++ b/psi/zfont1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfont2.c b/psi/zfont2.c index 6e424c9d..db7b81e7 100644 --- a/psi/zfont2.c +++ b/psi/zfont2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfont32.c b/psi/zfont32.c index a7890da9..a8780515 100644 --- a/psi/zfont32.c +++ b/psi/zfont32.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfont42.c b/psi/zfont42.c index ef33f669..7bc2b4c5 100644 --- a/psi/zfont42.c +++ b/psi/zfont42.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfontenum.c b/psi/zfontenum.c index fa60f3b6..97101a80 100644 --- a/psi/zfontenum.c +++ b/psi/zfontenum.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zform.c b/psi/zform.c index 5cc8a296..3c00b5a5 100644 --- a/psi/zform.c +++ b/psi/zform.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfproc.c b/psi/zfproc.c index 8d9d7731..620e5bdb 100644 --- a/psi/zfproc.c +++ b/psi/zfproc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfrsd.c b/psi/zfrsd.c index b9641515..3fa1d92e 100644 --- a/psi/zfrsd.c +++ b/psi/zfrsd.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfrsd.h b/psi/zfrsd.h index f52dea8d..9777e653 100644 --- a/psi/zfrsd.h +++ b/psi/zfrsd.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfsample.c b/psi/zfsample.c index aa92c010..29080940 100644 --- a/psi/zfsample.c +++ b/psi/zfsample.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -712,7 +712,7 @@ int make_sampled_function(i_ctx_t * i_ctx_p, ref *arr, ref *pproc, gs_function_t fail: gs_function_Sd_free_params(¶ms, imemory); - return (code < 0 ? code : gs_note_error(gs_error_rangecheck)); + return code; } /* ------ Initialization procedure ------ */ diff --git a/psi/zfsha2.c b/psi/zfsha2.c index d2b0d36d..816607be 100644 --- a/psi/zfsha2.c +++ b/psi/zfsha2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfunc.c b/psi/zfunc.c index 04081add..091549bf 100644 --- a/psi/zfunc.c +++ b/psi/zfunc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfunc.h b/psi/zfunc.h index 67c7396b..1fef90d9 100644 --- a/psi/zfunc.h +++ b/psi/zfunc.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfunc0.c b/psi/zfunc0.c index e9a9b4b9..9a100207 100644 --- a/psi/zfunc0.c +++ b/psi/zfunc0.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfunc3.c b/psi/zfunc3.c index 55e2e6af..c5179b03 100644 --- a/psi/zfunc3.c +++ b/psi/zfunc3.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zfunc4.c b/psi/zfunc4.c index 99cdde67..97143528 100644 --- a/psi/zfunc4.c +++ b/psi/zfunc4.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -493,7 +493,7 @@ gs_build_function_4(i_ctx_t *i_ctx_p, const ref *op, const gs_function_params_t /* free_params will free the ops string */ fail: gs_function_PtCr_free_params(¶ms, mem); - return (code < 0 ? code : gs_note_error(gs_error_rangecheck)); + return code; } int make_type4_function(i_ctx_t * i_ctx_p, ref *arr, ref *pproc, gs_function_t **func) diff --git a/psi/zfzlib.c b/psi/zfzlib.c index c5eb04c8..bc5a74b5 100644 --- a/psi/zfzlib.c +++ b/psi/zfzlib.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zgeneric.c b/psi/zgeneric.c index 6169e99b..822d23fb 100644 --- a/psi/zgeneric.c +++ b/psi/zgeneric.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zgstate.c b/psi/zgstate.c index 18eb21f4..4910a7ec 100644 --- a/psi/zgstate.c +++ b/psi/zgstate.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -106,7 +106,7 @@ zcurrent_uint(i_ctx_t *i_ctx_p, uint (*current_proc)(const gs_gstate *)) /* "Client" procedures */ static void *gs_istate_alloc(gs_memory_t * mem); static int gs_istate_copy(void *to, const void *from); -static void gs_istate_free(void *old, gs_memory_t * mem); +static void gs_istate_free(void *old, gs_memory_t * mem, gs_gstate *pgs); static const gs_gstate_client_procs istate_procs = { gs_istate_alloc, gs_istate_copy, @@ -125,6 +125,9 @@ int_gstate_alloc(const gs_dual_memory_t * dmem) gs_ref_memory_t *gmem = dmem->space_global; gs_gstate *pgs = gs_gstate_alloc((gs_memory_t *)lmem); + if (pgs == NULL) + return NULL; + iigs = gs_alloc_struct((gs_memory_t *)lmem, int_gstate, &st_int_gstate, "int_gstate_alloc(int_gstate)"); if (iigs == NULL) @@ -690,7 +693,7 @@ gs_istate_copy(void *to, const void *from) /* Free the interpreter's part of a graphics state. */ static void -gs_istate_free(void *old, gs_memory_t * mem) +gs_istate_free(void *old, gs_memory_t * mem, gs_gstate *pgs) { gs_free_object(mem, old, "int_grestore"); } @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -48,14 +48,14 @@ static int dict_threshold2_params(const ref *, gs_threshold2_halftone *, * pointer and a string length. */ int -gs_get_colorname_string(const gs_memory_t *mem, gs_separation_name colorname_index, +gs_get_colorname_string(gs_gstate *pgs, gs_separation_name colorname_index, unsigned char **ppstr, unsigned int *pname_size) { ref nref; - name_index_ref(mem, colorname_index, &nref); - name_string_ref(mem, &nref, &nref); - return obj_string_data(mem, &nref, (const unsigned char**) ppstr, pname_size); + name_index_ref(pgs->memory, colorname_index, &nref); + name_string_ref(pgs->memory, &nref, &nref); + return obj_string_data(pgs->memory, &nref, (const unsigned char**) ppstr, pname_size); } /* Dummy spot function */ @@ -141,7 +141,7 @@ zsethalftone5(i_ctx_t *i_ctx_p) /* Get the name of the component verify that we will use it. */ cname = name_index(mem, &rvalue[0]); - code = gs_get_colorname_string(mem, cname, &pname, &name_size); + code = gs_get_colorname_string(pgs, cname, &pname, &name_size); if (code < 0) break; colorant_number = gs_cname_to_colorant_number(pgs, pname, name_size, @@ -205,7 +205,7 @@ zsethalftone5(i_ctx_t *i_ctx_p) /* Get the name of the component */ cname = name_index(mem, &rvalue[0]); - code = gs_get_colorname_string(mem, cname, &pname, &name_size); + code = gs_get_colorname_string(pgs, cname, &pname, &name_size); if (code < 0) break; colorant_number = gs_cname_to_colorant_number(pgs, pname, name_size, @@ -273,7 +273,7 @@ zsethalftone5(i_ctx_t *i_ctx_p) /* Get the name of the component and verify that we will use it. */ cname = name_index(mem, &rvalue[0]); - code = gs_get_colorname_string(mem, cname, &pname, &name_size); + code = gs_get_colorname_string(pgs, cname, &pname, &name_size); if (code < 0) break; colorant_number = gs_cname_to_colorant_number(pgs, pname, name_size, @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -25,7 +25,7 @@ * This routine translates a gs_separation_name value into a character string * pointer and a string length. */ -int gs_get_colorname_string(const gs_memory_t *mem, +int gs_get_colorname_string(gs_gstate *pgs, gs_separation_name colorname_index, unsigned char **ppstr, unsigned int *pname_size); @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -362,8 +362,8 @@ zset_outputintent(i_ctx_t * i_ctx_p) of the proper Device profile in the icc manager, again, unless someone has explicitly set this default profile. */ - dev_comps = dev_profile->device_profile[0]->num_comps; - index = gsicc_get_default_type(dev_profile->device_profile[0]); + dev_comps = dev_profile->device_profile[GS_DEFAULT_DEVICE_PROFILE]->num_comps; + index = gsicc_get_default_type(dev_profile->device_profile[GS_DEFAULT_DEVICE_PROFILE]); if (ncomps == dev_comps && index < gs_color_space_index_DevicePixel) { /* The OI profile is the same type as the profile for the device and a "default" profile for the device was not externally set. So we go @@ -372,7 +372,7 @@ zset_outputintent(i_ctx_t * i_ctx_p) use a keyword of OIProfile for the user/device parameter to indicate its usage. Also, note conflicts if one is setting object dependent color management */ - rc_assign(dev_profile->device_profile[0], picc_profile, + rc_assign(dev_profile->device_profile[GS_DEFAULT_DEVICE_PROFILE], picc_profile, "zset_outputintent"); if_debug0m(gs_debug_flag_icc, imemory, "[icc] OutputIntent used for device profile\n"); } else { @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zimage.c b/psi/zimage.c index 01c6fa46..c2d31611 100644 --- a/psi/zimage.c +++ b/psi/zimage.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zimage3.c b/psi/zimage3.c index 230c5a93..2747edb8 100644 --- a/psi/zimage3.c +++ b/psi/zimage3.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ziodev.c b/psi/ziodev.c index 2570d81e..7c829bc3 100644 --- a/psi/ziodev.c +++ b/psi/ziodev.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -92,6 +92,8 @@ zgetiodevice(i_ctx_t *i_ctx_p) return 0; } +#define COMPILE_TIME_ASSERT(A,B) typedef char A[(B) ? 1 : -1] + /* ------ %lineedit and %statementedit ------ */ /* <file> <bool> <int> <string> .filelineedit <file> */ @@ -109,6 +111,9 @@ zgetiodevice(i_ctx_t *i_ctx_p) * This could be increased by storing the input line in something * other than a PostScript string. */ +COMPILE_TIME_ASSERT(STATEMENTEDIT_SIZE_CHECK, STATEMENTEDIT_BUF_SIZE <= max_string_size); +COMPILE_TIME_ASSERT(LINEEDIT_BUF_SIZE_CHECK, LINEEDIT_BUF_SIZE <= max_string_size); + int zfilelineedit(i_ctx_t *i_ctx_p) { @@ -139,8 +144,6 @@ zfilelineedit(i_ctx_t *i_ctx_p) /* extend string */ initial_buf_size = statement ? STATEMENTEDIT_BUF_SIZE : LINEEDIT_BUF_SIZE; - if (initial_buf_size > max_string_size) - return_error(gs_error_limitcheck); if (!buf->data || (buf->size < initial_buf_size)) { count = 0; buf->data = gs_alloc_string(imemory_system, initial_buf_size, diff --git a/psi/ziodev2.c b/psi/ziodev2.c index ff6724f9..1eceafd2 100644 --- a/psi/ziodev2.c +++ b/psi/ziodev2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ziodevsc.c b/psi/ziodevsc.c index 203adcfa..1bba4f4b 100644 --- a/psi/ziodevsc.c +++ b/psi/ziodevsc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -107,7 +107,7 @@ s_stdin_read_process(stream_state * st, stream_cursor_read * ignore_pr, /* do the callout */ if (core->stdin_fn) count = (*core->stdin_fn) - (core->caller_handle, (char *)pw->ptr + 1, + (core->std_caller_handle, (char *)pw->ptr + 1, core->stdin_is_interactive ? 1 : wcount); else count = gp_stdin_read((char *)pw->ptr + 1, wcount, @@ -196,7 +196,7 @@ s_stdout_write_process(stream_state * st, stream_cursor_read *pr, if (count == 0) return 0; written = outwrite(st->memory, (const char *)pr->ptr + 1, count); - if (written < count) + if (written != count) return ERRC; pr->ptr += written; return 0; diff --git a/psi/zmath.c b/psi/zmath.c index d6ecae23..518424f2 100644 --- a/psi/zmath.c +++ b/psi/zmath.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -157,11 +157,11 @@ zexp(i_ctx_t *i_ctx_p) result = 1.0; /* match Adobe; can't rely on C library */ else result = pow(args[0], args[1]); - make_real(op - 1, result); #ifdef HAVE_ISINF if (isinf((op - 1)->value.realval)) return_error(gs_error_undefinedresult); #endif + make_real(op - 1, result); pop(1); return 0; } diff --git a/psi/zmatrix.c b/psi/zmatrix.c index abb7b0b3..154f7105 100644 --- a/psi/zmatrix.c +++ b/psi/zmatrix.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zmedia2.c b/psi/zmedia2.c index eb65dda7..94da7327 100644 --- a/psi/zmedia2.c +++ b/psi/zmedia2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zmisc.c b/psi/zmisc.c index 0eb86b52..196b40d5 100644 --- a/psi/zmisc.c +++ b/psi/zmisc.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zmisc1.c b/psi/zmisc1.c index 958aac0c..1ab4bbc0 100644 --- a/psi/zmisc1.c +++ b/psi/zmisc1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zmisc2.c b/psi/zmisc2.c index 3c0ed879..c47ef793 100644 --- a/psi/zmisc2.c +++ b/psi/zmisc2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zmisc3.c b/psi/zmisc3.c index b42be439..b962d61b 100644 --- a/psi/zmisc3.c +++ b/psi/zmisc3.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zncdummy.c b/psi/zncdummy.c index 87a7fa68..e7a98511 100644 --- a/psi/zncdummy.c +++ b/psi/zncdummy.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zpacked.c b/psi/zpacked.c index 7dafe638..3171b44f 100644 --- a/psi/zpacked.c +++ b/psi/zpacked.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zpaint.c b/psi/zpaint.c index 3251c1be..8834a444 100644 --- a/psi/zpaint.c +++ b/psi/zpaint.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zpath.c b/psi/zpath.c index 1e7bf28f..10aceaa1 100644 --- a/psi/zpath.c +++ b/psi/zpath.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zpath1.c b/psi/zpath1.c index 1b5f794f..ab617a7a 100644 --- a/psi/zpath1.c +++ b/psi/zpath1.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zpcolor.c b/psi/zpcolor.c index 4f8b10cd..483d22e4 100644 --- a/psi/zpcolor.c +++ b/psi/zpcolor.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -159,12 +159,12 @@ zbuildpattern1(i_ctx_t *i_ctx_p) code = int_pattern_alloc(&pdata, op1, imemory); if (code < 0) return code; - templat.client_data = pdata; code = gs_makepattern(&cc_instance, &templat, &mat, igs, imemory); if (code < 0) { ifree_object(pdata, "int_pattern"); return code; } + cc_instance.pattern->client_data = pdata; make_istruct(op, a_readonly, cc_instance.pattern); return code; } @@ -200,7 +200,7 @@ pattern_paint_prepare(i_ctx_t *i_ctx_p) gs_gstate *pgs = igs; gs_pattern1_instance_t *pinst = (gs_pattern1_instance_t *)gs_currentcolor(pgs)->pattern; - ref *pdict = &((int_pattern *) pinst->templat.client_data)->dict; + ref *pdict = &((int_pattern *) pinst->client_data)->dict; gx_device_forward *pdev = NULL; gx_device *cdev = gs_currentdevice_inline(igs), *new_dev = NULL; int code; diff --git a/psi/zpdf_r6.c b/psi/zpdf_r6.c index e2f1a711..a958fdb2 100644 --- a/psi/zpdf_r6.c +++ b/psi/zpdf_r6.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -152,6 +152,8 @@ zcheck_r6_password(i_ctx_t * i_ctx_p) return_error(gs_error_undefined); if (!r_has_type(Oref, t_string)) return_error(gs_error_typecheck); + if (r_size(Oref) < 48) + return_error(gs_error_invalidaccess); code = dict_find_string(CryptDict, "OE", &OEref); if (code < 0) @@ -160,6 +162,8 @@ zcheck_r6_password(i_ctx_t * i_ctx_p) return_error(gs_error_undefined); if (!r_has_type(OEref, t_string)) return_error(gs_error_typecheck); + if (r_size(OEref) < 32) + return_error(gs_error_invalidaccess); code = dict_find_string(CryptDict, "U", &Uref); if (code < 0) @@ -168,6 +172,8 @@ zcheck_r6_password(i_ctx_t * i_ctx_p) return_error(gs_error_undefined); if (!r_has_type(Uref, t_string)) return_error(gs_error_typecheck); + if (r_size(Uref) < 48) + return_error(gs_error_invalidaccess); code = dict_find_string(CryptDict, "UE", &UEref); if (code < 0) @@ -176,6 +182,8 @@ zcheck_r6_password(i_ctx_t * i_ctx_p) return_error(gs_error_undefined); if (!r_has_type(UEref, t_string)) return_error(gs_error_typecheck); + if (r_size(UEref) < 32) + return_error(gs_error_invalidaccess); pop(2); op = osp; diff --git a/psi/zpdfops.c b/psi/zpdfops.c index f110915d..0e896eb4 100644 --- a/psi/zpdfops.c +++ b/psi/zpdfops.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zrelbit.c b/psi/zrelbit.c index 9bc7fd1a..cade486f 100644 --- a/psi/zrelbit.c +++ b/psi/zrelbit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zshade.c b/psi/zshade.c index 8bc92c77..d468bdba 100644 --- a/psi/zshade.c +++ b/psi/zshade.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -106,7 +106,6 @@ zbuildshadingpattern(i_ctx_t *i_ctx_p) (code = int_pattern_alloc(&pdata, op2, imemory)) < 0 ) return_error((code < 0 ? code : gs_error_rangecheck)); - templat.client_data = pdata; code = gs_make_pattern(&cc_instance, (const gs_pattern_template_t *)&templat, &mat, igs, imemory); @@ -114,6 +113,7 @@ zbuildshadingpattern(i_ctx_t *i_ctx_p) ifree_object(pdata, "int_pattern"); return code; } + cc_instance.pattern->client_data = pdata; make_istruct(op - 1, a_readonly, cc_instance.pattern); pop(1); return code; diff --git a/psi/zstack.c b/psi/zstack.c index 11c9069b..2f2f0db9 100644 --- a/psi/zstack.c +++ b/psi/zstack.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zstring.c b/psi/zstring.c index fac72fa8..58e1af2b 100644 --- a/psi/zstring.c +++ b/psi/zstring.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -142,13 +142,18 @@ search_impl(i_ctx_t *i_ctx_p, bool forward) return 0; found: op->tas.type_attrs = op1->tas.type_attrs; - op->value.bytes = ptr; - r_set_size(op, size); + op->value.bytes = ptr; /* match */ + op->tas.rsize = size; /* match */ push(2); - op[-1] = *op1; - r_set_size(op - 1, ptr - op[-1].value.bytes); - op1->value.bytes = ptr + size; - r_set_size(op1, count + (!forward ? (size - 1) : 0)); + op[-1] = *op1; /* pre */ + op[-3].value.bytes = ptr + size; /* post */ + if (forward) { + op[-1].tas.rsize = ptr - op[-1].value.bytes; /* pre */ + op[-3].tas.rsize = count; /* post */ + } else { + op[-1].tas.rsize = count; /* pre */ + op[-3].tas.rsize -= count + size; /* post */ + } make_true(op); return 0; } diff --git a/psi/zsysvm.c b/psi/zsysvm.c index ba63c383..0abaa665 100644 --- a/psi/zsysvm.c +++ b/psi/zsysvm.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ztoken.c b/psi/ztoken.c index d15442eb..de7b2b05 100644 --- a/psi/ztoken.c +++ b/psi/ztoken.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ztrans.c b/psi/ztrans.c index 2933e37a..4a26bdd4 100644 --- a/psi/ztrans.c +++ b/psi/ztrans.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -41,20 +41,6 @@ /* ------ Utilities ------ */ -static int -set_float_value(i_ctx_t *i_ctx_p, int (*set_value)(gs_gstate *, double)) -{ - os_ptr op = osp; - double value; - int code; - - if (real_param(op, &value) < 0) - return_op_typecheck(op); - if ((code = set_value(igs, value)) < 0) - return code; - pop(1); - return 0; -} static int current_float_value(i_ctx_t *i_ctx_p, @@ -123,34 +109,6 @@ zcurrentblendmode(i_ctx_t *i_ctx_p) return 0; } -/* <0..1> .setopacityalpha - */ -static int -zsetopacityalpha(i_ctx_t *i_ctx_p) -{ - return set_float_value(i_ctx_p, gs_setopacityalpha); -} - -/* - .currentopacityalpha <0..1> */ -static int -zcurrentopacityalpha(i_ctx_t *i_ctx_p) -{ - return current_float_value(i_ctx_p, gs_currentopacityalpha); -} - -/* <0..1> .setshapealpha - */ -static int -zsetshapealpha(i_ctx_t *i_ctx_p) -{ - return set_float_value(i_ctx_p, gs_setshapealpha); -} - -/* - .currentshapealpha <0..1> */ -static int -zcurrentshapealpha(i_ctx_t *i_ctx_p) -{ - return current_float_value(i_ctx_p, gs_currentshapealpha); -} - /* <bool> .settextknockout - */ static int zsettextknockout(i_ctx_t *i_ctx_p) @@ -216,7 +174,7 @@ static int common_transparency_group(i_ctx_t *i_ctx_p, pdf14_compositor_operatio check_type(*dop, t_dictionary); check_dict_read(*dop); - gs_trans_group_params_init(¶ms); + gs_trans_group_params_init(¶ms, 1.0); if ((code = dict_bool_param(dop, "Isolated", false, ¶ms.Isolated)) < 0 || (code = dict_bool_param(dop, "Knockout", false, ¶ms.Knockout)) < 0 || (code = dict_bool_param(dop, ".image_with_SMask", false, ¶ms.image_with_SMask)) < 0 @@ -245,6 +203,15 @@ static int common_transparency_group(i_ctx_t *i_ctx_p, pdf14_compositor_operatio params.ColorSpace = NULL; } } + + if (gs_getalphaisshape(igs)) { + params.group_shape = gs_getfillconstantalpha(igs); + params.group_opacity = 1.0; + } else { + params.group_opacity = gs_getfillconstantalpha(igs); + params.group_shape = 1.0; + } + code = gs_begin_transparency_group(igs, ¶ms, &bbox, group_type); if (code < 0) return code; @@ -508,6 +475,9 @@ zpushpdf14devicefilter(i_ctx_t *i_ctx_p) gx_device *cdev = gs_currentdevice_inline(igs); check_type(*op, t_integer); + if (dev_proc(cdev, dev_spec_op)(cdev, gxdso_is_pdf14_device, NULL, 0) > 0) + return 0; /* ignore push_device if already is pdf14 device */ + /* Bug 698087: In case some program uses our .pushpdf14devicefilter make */ /* sure that the device knows that we are using the pdf14 */ /* transparency. Note this will close and re-open the device */ @@ -528,8 +498,6 @@ zpushpdf14devicefilter(i_ctx_t *i_ctx_p) if (cdev->is_open) { if ((code = gs_closedevice((gx_device *)cdev)) < 0) return code; - if (dev_proc(cdev, dev_spec_op)(cdev, gxdso_is_pdf14_device, NULL, 0) > 0) - pdf14_disable_device(cdev); /* should already be disabled (bug 698306) */ } if ((code = gs_opendevice((gx_device *)cdev)) < 0) return code; @@ -674,10 +642,6 @@ zcurrentSMask(i_ctx_t *i_ctx_p) const op_def ztrans1_op_defs[] = { {"1.setblendmode", zsetblendmode}, {"0.currentblendmode", zcurrentblendmode}, - {"1.setopacityalpha", zsetopacityalpha}, - {"0.currentopacityalpha", zcurrentopacityalpha}, - {"1.setshapealpha", zsetshapealpha}, - {"0.currentshapealpha", zcurrentshapealpha}, {"1.settextknockout", zsettextknockout}, {"0.currenttextknockout", zcurrenttextknockout}, {"0.pushextendedgstate", zpushextendedgstate}, diff --git a/psi/ztrap.c b/psi/ztrap.c index b73dd00c..31eb28ce 100644 --- a/psi/ztrap.c +++ b/psi/ztrap.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/ztype.c b/psi/ztype.c index 94e5e032..fab27017 100644 --- a/psi/ztype.c +++ b/psi/ztype.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -281,7 +281,18 @@ zcvi(i_ctx_t *i_ctx_p) } if (!REAL_CAN_BE_INT(fval)) return_error(gs_error_rangecheck); - make_int(op, (long)fval); /* truncates towards 0 */ + if (sizeof(ps_int) != 4 && gs_currentcpsimode(imemory)) { + if ((double)fval > (double)MAX_PS_INT32) /* (double)0x7fffffff */ + return_error(gs_error_rangecheck); + else if ((double)fval < (double)MIN_PS_INT32) /* (double)(int)0x80000000 */ + return_error(gs_error_rangecheck); + else { + make_int(op, (ps_int) fval); + } + } + else + make_int(op, (ps_int) fval); + return 0; } @@ -386,7 +397,13 @@ zcvrs(i_ctx_t *i_ctx_p) if (!REAL_CAN_BE_INT(fval)) return_error(gs_error_rangecheck); - ival = (ulong) (long)fval; + ival = (ps_uint)fval; + if (sizeof(ps_int) != 4 && gs_currentcpsimode(imemory)) { + if ((double)fval > (double)MAX_PS_INT32) /* (double)0x7fffffff */ + return_error(gs_error_rangecheck); + else if ((double)fval < (double)MIN_PS_INT32) /* (double)(int)0x80000000 */ + return_error(gs_error_rangecheck); + } } break; case t__invalid: return_error(gs_error_stackunderflow); diff --git a/psi/zupath.c b/psi/zupath.c index b02a3c0a..799471a0 100644 --- a/psi/zupath.c +++ b/psi/zupath.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zusparam.c b/psi/zusparam.c index c3d4a4b5..2ca0f4f9 100644 --- a/psi/zusparam.c +++ b/psi/zusparam.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -58,6 +58,20 @@ typedef struct param_def_s { param_def_common; } param_def_t; +typedef struct size_t_param_def_s { + param_def_common; + size_t min_value, max_value; + size_t (*current)(i_ctx_t *); + int (*set)(i_ctx_t *, size_t); +} size_t_param_def_t; + +typedef struct i64_param_def_s { + param_def_common; + int64_t min_value, max_value; + int64_t (*current)(i_ctx_t *); + int (*set)(i_ctx_t *, int64_t); +} i64_param_def_t; + typedef struct long_param_def_s { param_def_common; long min_value, max_value; @@ -87,6 +101,10 @@ typedef struct string_param_def_s { /* Define a parameter set (user or system). */ typedef struct param_set_s { + const size_t_param_def_t *size_t_defs; + uint size_t_count; + const i64_param_def_t *i64_defs; + uint i64_count; const long_param_def_t *long_defs; uint long_count; const bool_param_def_t *bool_defs; @@ -165,24 +183,34 @@ current_CurFontCache(i_ctx_t *i_ctx_p) gs_cachestatus(ifont_dir, cstat); return cstat[0]; } -static long + +/* Even though size_t is unsigned, PostScript limits this to signed range */ +static size_t current_MaxGlobalVM(i_ctx_t *i_ctx_p) { gs_memory_gc_status_t stat; + size_t val; gs_memory_gc_status(iimemory_global, &stat); + /* RJW: This seems very supicious to me. I get that in CPSI + * mode the max_vm figure needs to be kept to 32bit mode, but + * surely clipping it should be correct, rather than truncating + * it? i.e. min(stat.max_vm, 0x7fffffff) */ if (gs_currentcpsimode(imemory)) return stat.max_vm & 0x7fffffff; - else - return stat.max_vm; + /* else clamp at the maximum positive value for the size_t size signed integer */ + val = min(stat.max_vm, MAX_VM_THRESHOLD); + return val; } + +/* Even though size_t is unsigned, PostScript limits this to signed range */ static int -set_MaxGlobalVM(i_ctx_t *i_ctx_p, long val) +set_MaxGlobalVM(i_ctx_t *i_ctx_p, size_t val) { gs_memory_gc_status_t stat; gs_memory_gc_status(iimemory_global, &stat); - stat.max_vm = max(val, 0); + stat.max_vm = val; gs_memory_set_gc_status(iimemory_global, &stat); return 0; } @@ -203,16 +231,19 @@ current_PageCount(i_ctx_t *i_ctx_p) return 1000 + i_ctx_p->nv_page_count; /* Add 1000 to imitate NV memory */ } +static const size_t_param_def_t system_size_t_params[] = +{ + /* Extensions */ + {"MaxGlobalVM", MIN_VM_THRESHOLD, MAX_VM_THRESHOLD, current_MaxGlobalVM, set_MaxGlobalVM} +}; + static const long_param_def_t system_long_params[] = { {"BuildTime", min_long, max_long, current_BuildTime, NULL}, -{"MaxFontCache", 0, MAX_UINT_PARAM, current_MaxFontCache, set_MaxFontCache}, + {"MaxFontCache", 0, MAX_UINT_PARAM, current_MaxFontCache, set_MaxFontCache}, {"CurFontCache", 0, MAX_UINT_PARAM, current_CurFontCache, NULL}, {"Revision", min_long, max_long, current_Revision, NULL}, - {"PageCount", min_long, max_long, current_PageCount, NULL}, - - /* Extensions */ - {"MaxGlobalVM", 0, max_long, current_MaxGlobalVM, set_MaxGlobalVM} + {"PageCount", min_long, max_long, current_PageCount, NULL} }; /* Boolean values */ @@ -249,6 +280,8 @@ static const string_param_def_t system_string_params[] = /* The system parameter set */ static const param_set system_param_set = { + system_size_t_params, countof(system_size_t_params), + NULL, 0, /* No i64 params for systemparams (yet) */ system_long_params, countof(system_long_params), system_bool_params, countof(system_bool_params), system_string_params, countof(system_string_params) @@ -390,24 +423,31 @@ set_MaxExecStack(i_ctx_t *i_ctx_p, long val) { return ref_stack_set_max_count(&e_stack, val); } -static long +static size_t current_MaxLocalVM(i_ctx_t *i_ctx_p) { gs_memory_gc_status_t stat; + size_t val; gs_memory_gc_status(iimemory_local, &stat); + /* RJW: This seems very supicious to me. I get that in CPSI + * mode the max_vm figure needs to be kept to 32bit mode, but + * surely clipping it should be correct, rather than truncating + * it? i.e. min(stat.max_vm, 0x7fffffff) */ if (gs_currentcpsimode(imemory)) return stat.max_vm & 0x7fffffff; - else - return stat.max_vm; + /* else clamp at the maximun positive value for the size_t size signed integer */ + val = min(stat.max_vm, MAX_VM_THRESHOLD); + return val; } +/* Even though size_t is unsigned, PostScript limits this to signed range */ static int -set_MaxLocalVM(i_ctx_t *i_ctx_p, long val) +set_MaxLocalVM(i_ctx_t *i_ctx_p, size_t val) { gs_memory_gc_status_t stat; gs_memory_gc_status(iimemory_local, &stat); - stat.max_vm = max(val, 0); + stat.max_vm = val; gs_memory_set_gc_status(iimemory_local, &stat); return 0; } @@ -420,7 +460,7 @@ current_VMReclaim(i_ctx_t *i_ctx_p) gs_memory_gc_status(iimemory_local, &lstat); return (!gstat.enabled ? -2 : !lstat.enabled ? -1 : 0); } -static long +static int64_t current_VMThreshold(i_ctx_t *i_ctx_p) { gs_memory_gc_status_t stat; @@ -570,6 +610,16 @@ set_lab_icc(i_ctx_t *i_ctx_p, gs_param_string * pval) return gs_setlabicc(igs, pval); } +static const size_t_param_def_t user_size_t_params[] = +{ + {"MaxLocalVM", MIN_VM_THRESHOLD, MAX_VM_THRESHOLD, current_MaxLocalVM, set_MaxLocalVM} +}; + +static const i64_param_def_t user_i64_params[] = +{ + {"VMThreshold", -1, MAX_VM_THRESHOLD, current_VMThreshold, set_vm_threshold}, +}; + static const long_param_def_t user_long_params[] = { {"JobTimeout", 0, MAX_UINT_PARAM, @@ -584,12 +634,8 @@ static const long_param_def_t user_long_params[] = current_MaxDictStack, set_MaxDictStack}, {"MaxExecStack", -1, max_long, current_MaxExecStack, set_MaxExecStack}, - {"MaxLocalVM", 0, max_long, - current_MaxLocalVM, set_MaxLocalVM}, {"VMReclaim", -2, 0, current_VMReclaim, set_vm_reclaim}, - {"VMThreshold", -1, max_long, - current_VMThreshold, set_vm_threshold}, {"WaitTimeout", 0, MAX_UINT_PARAM, current_WaitTimeout, set_WaitTimeout}, /* Extensions */ @@ -685,6 +731,8 @@ static const bool_param_def_t user_bool_params[] = /* The user parameter set */ static const param_set user_param_set = { + user_size_t_params, countof(user_size_t_params), + user_i64_params, countof(user_i64_params), user_long_params, countof(user_long_params), user_bool_params, countof(user_bool_params), user_string_params, countof(user_string_params) @@ -763,6 +811,48 @@ setparams(i_ctx_t *i_ctx_p, gs_param_list * plist, const param_set * pset) int code; unsigned int i; + for (i = 0; i < pset->size_t_count; i++) { + const size_t_param_def_t *pdef = &pset->size_t_defs[i]; + size_t val; + + if (pdef->set == NULL) + continue; + code = param_read_size_t(plist, pdef->pname, &val); + switch (code) { + default: /* invalid */ + return code; + case 1: /* missing */ + break; + case 0: + if (val < pdef->min_value || val > pdef->max_value) + return_error(gs_error_rangecheck); + code = (*pdef->set)(i_ctx_p, val); + if (code < 0) + return code; + } + } + + for (i = 0; i < pset->i64_count; i++) { + const i64_param_def_t *pdef = &pset->i64_defs[i]; + int64_t val; + + if (pdef->set == NULL) + continue; + code = param_read_i64(plist, pdef->pname, &val); + switch (code) { + default: /* invalid */ + return code; + case 1: /* missing */ + break; + case 0: + if (val < pdef->min_value || val > pdef->max_value) + return_error(gs_error_rangecheck); + code = (*pdef->set)(i_ctx_p, val); + if (code < 0) + return code; + } + } + for (i = 0; i < pset->long_count; i++) { const long_param_def_t *pdef = &pset->long_defs[i]; long val; @@ -837,6 +927,29 @@ current_param_list(i_ctx_t *i_ctx_p, const param_set * pset, unsigned int i; stack_param_list_write(&list, &o_stack, NULL, iimemory); + + for (i = 0; i < pset->size_t_count; i++) { + const char *pname = pset->size_t_defs[i].pname; + + if (pname_matches(pname, psref)) { + size_t val = (*pset->size_t_defs[i].current)(i_ctx_p); + + code = param_write_size_t(plist, pname, &val); + if (code < 0) + return code; + } + } + for (i = 0; i < pset->i64_count; i++) { + const char *pname = pset->i64_defs[i].pname; + + if (pname_matches(pname, psref)) { + int64_t val = (*pset->i64_defs[i].current)(i_ctx_p); + + code = param_write_i64(plist, pname, &val); + if (code < 0) + return code; + } + } for (i = 0; i < pset->long_count; i++) { const char *pname = pset->long_defs[i].pname; diff --git a/psi/zutf8.c b/psi/zutf8.c index 79aec210..5e55c650 100644 --- a/psi/zutf8.c +++ b/psi/zutf8.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or diff --git a/psi/zvmem.c b/psi/zvmem.c index 5c0810f3..63dfe251 100644 --- a/psi/zvmem.c +++ b/psi/zvmem.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -79,8 +79,8 @@ zsave(i_ctx_t *i_ctx_p) ifree_object(vmsave, "zsave"); return_error(gs_error_VMerror); } - if_debug2m('u', imemory, "[u]vmsave 0x%lx, id = %lu\n", - (ulong) vmsave, (ulong) sid); + if_debug2m('u', imemory, "[u]vmsave "PRI_INTPTR", id = %lu\n", + (intptr_t) vmsave, (ulong) sid); code = gs_gsave_for_save(igs, &prev); if (code < 0) return code; @@ -106,8 +106,8 @@ restore_check_save(i_ctx_t *i_ctx_p, alloc_save_t **asave) if (code < 0) return code; - if_debug2m('u', imemory, "[u]vmrestore 0x%lx, id = %lu\n", - (ulong) alloc_save_client_data(*asave), + if_debug2m('u', imemory, "[u]vmrestore "PRI_INTPTR", id = %lu\n", + (intptr_t) alloc_save_client_data(*asave), (ulong) op->value.saveid); if (I_VALIDATE_BEFORE_RESTORE) ivalidate_clean_spaces(i_ctx_p); diff --git a/psi/zvmem2.c b/psi/zvmem2.c index a24c99fb..fe45c900 100644 --- a/psi/zvmem2.c +++ b/psi/zvmem2.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -26,8 +26,6 @@ /* Garbage collector control parameters. */ #define DEFAULT_VM_THRESHOLD_SMALL 100000 #define DEFAULT_VM_THRESHOLD_LARGE 8000000 -#define MIN_VM_THRESHOLD 1 -#define MAX_VM_THRESHOLD max_long /* ------ Local/global VM control ------ */ @@ -75,17 +73,17 @@ zgcheck(i_ctx_t *i_ctx_p) * This is implemented as a PostScript procedure that calls setuserparams. */ int -set_vm_threshold(i_ctx_t *i_ctx_p, long val) +set_vm_threshold(i_ctx_t *i_ctx_p, int64_t val) { if (val < -1) return_error(gs_error_rangecheck); else if (val == -1) val = (gs_debug_c('.') ? DEFAULT_VM_THRESHOLD_SMALL : DEFAULT_VM_THRESHOLD_LARGE); - else if (val < MIN_VM_THRESHOLD) - val = MIN_VM_THRESHOLD; - else if (val > MAX_VM_THRESHOLD) - val = MAX_VM_THRESHOLD; +#if PSINT32BIT==1 + else if (val > max_int) + val = max_int +#endif gs_memory_set_vm_threshold(idmemory->space_system, val); gs_memory_set_vm_threshold(idmemory->space_global, val); gs_memory_set_vm_threshold(idmemory->space_local, val); diff --git a/psi/zwinutf8.c b/psi/zwinutf8.c index 30a512d9..1db79818 100644 --- a/psi/zwinutf8.c +++ b/psi/zwinutf8.c @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2019 Artifex Software, Inc. +/* Copyright (C) 2001-2020 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or |