summaryrefslogtreecommitdiff
path: root/pxl
diff options
context:
space:
mode:
authorHenry Stiles <henry.stiles@artifex.com>2006-10-24 18:32:09 +0000
committerHenry Stiles <henry.stiles@artifex.com>2006-10-24 18:32:09 +0000
commita98d43de1c1235ba9b827db051dbf9c2ed74e62e (patch)
treec4c1a64e228dae41cf387028999fb0d388e8d223 /pxl
parentc3e57bea6831964cfb18938bc93b49b71cac4232 (diff)
WARNING: msvc makefile changes will be necessary.
pcl6_gcc.mak, ugcc_top.mak, pluchar.c, plulfont.c: modified so standalone pcl can use gxfapiu.dev. psi.mak:(uconfig_h) should only be needed by plulfont.c as far as I can tell. pxptrh.c: the pcl personality was not initialized properly for pcl xl passthrough mode. pximage.c: "don't care" uninitialized read cleanup. git-svn-id: http://svn.ghostscript.com/ghostpcl/trunk/ghostpcl@2658 06663e23-700e-0410-b217-a244a6096597
Diffstat (limited to 'pxl')
-rw-r--r--pxl/pximage.c2
-rw-r--r--pxl/pxpthr.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/pxl/pximage.c b/pxl/pximage.c
index e14f401d6..9958b3980 100644
--- a/pxl/pximage.c
+++ b/pxl/pximage.c
@@ -385,7 +385,7 @@ read_deltarow_bitmap_data(px_bitmap_enum_t *benum, byte **pdata, px_args_t *par)
const byte *pout_start = pout;
bool end_of_row = false;
- if ( deltarow->rowwritten == par->pv[1]->value.i && benum->initialized ) {
+ if ( benum->initialized && deltarow->rowwritten == par->pv[1]->value.i ) {
gs_free_object(benum->mem, deltarow->seedrow, "read_deltarow_bitmap_data");
benum->initialized = 0;
return 0;
diff --git a/pxl/pxpthr.c b/pxl/pxpthr.c
index b705882f7..58f57f6fc 100644
--- a/pxl/pxpthr.c
+++ b/pxl/pxpthr.c
@@ -40,6 +40,7 @@ pxPassthrough(px_args_t *par, px_state_t *pxs)
/* retrieve the current pcl state and initialize pcl */
if ( !pcs ) {
global_pcs = pcs = pcl_get_gstate(pxs->pcls);
+ pcs->personality = 0; /* default to pcl5c */
/* do an initial reset to set up a permanent reset. The
permanent reset will fail if some common resources
(i.e. font dictionary are not in the state */
@@ -50,7 +51,6 @@ pxPassthrough(px_args_t *par, px_state_t *pxs)
code = gs_setdevice_no_erase(pcs->pgs, gs_currentdevice(pxs->pgs));
if ( code < 0 )
return code;
- pcs->personality = 0; /* default to pcl5c */
/* now reset with the new page device and the reset permanent "clean slate" */
pcl_do_resets(pcs, pcl_reset_initial);
/* if pxs has dirtied the page - snippet mode */