summaryrefslogtreecommitdiff
path: root/pxl
diff options
context:
space:
mode:
authorHenry Stiles <henry.stiles@artifex.com>2011-03-31 17:30:58 +0000
committerHenry Stiles <henry.stiles@artifex.com>2011-03-31 17:30:58 +0000
commit7825ac4552256609c8060b5af13bb168170db6eb (patch)
tree53cf085c04fb943d60f101d5919aa972e44dc0f6 /pxl
parent91b7f320484904d60e8cf017611f5a8da4a6c685 (diff)
Bug #692100, padding was being treated inconsistently within 2
procedures resulting in UMR's and incorrect results. I'm afraid we still don't understand the details of HP's seemingly bug-ridden padding implementation but this fix at least makes the code internally consistent. git-svn-id: http://svn.ghostscript.com/ghostscript/trunk@12337 a1074d23-0009-0410-80fe-cf8c14f379e6
Diffstat (limited to 'pxl')
-rw-r--r--pxl/pximage.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/pxl/pximage.c b/pxl/pximage.c
index 51e110eca..091210ace 100644
--- a/pxl/pximage.c
+++ b/pxl/pximage.c
@@ -765,9 +765,11 @@ pxReadRastPattern(px_args_t *par, px_state_t *pxs)
if ( par->source.available == 0 && par->pv[1]->value.i != 0 )
return pxNeedData;
/* emulate hp bug */
- if ( par->pv[2]->value.i == eDeltaRowCompression )
- input_per_row = pxenum->benum.data_per_row;
-
+ {
+ pxeCompressMode_t c = par->pv[2]->value.i;
+ if ( c == eDeltaRowCompression || c == eJPEGCompression )
+ input_per_row = pxenum->benum.data_per_row;
+ }
for ( ; ; )
{
byte *data = pxenum->pattern->data +