diff options
| author | Glenn Kennard <glenn.kennard@gmail.com> | 2008-04-20 11:51:40 +0200 |
|---|---|---|
| committer | Glenn Kennard <glenn.kennard@gmail.com> | 2008-04-20 11:51:40 +0200 |
| commit | 704339802c88bc470187bd77c4680d19108dab0b (patch) | |
| tree | 1f7ba85c4beddd4eceeb37c68a70066d09707d08 | |
| parent | 19a13bd71f79f577be8c835f40b6c45cb67bca7d (diff) | |
| download | mupdf-704339802c88bc470187bd77c4680d19108dab0b.tar.xz | |
Restore alpha handling lost in error handling refactor patch.
| -rw-r--r-- | mupdf/pdf_build.c | 10 | ||||
| -rw-r--r-- | mupdf/pdf_cmap.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/mupdf/pdf_build.c b/mupdf/pdf_build.c index e62ebd0d..522ce23a 100644 --- a/mupdf/pdf_build.c +++ b/mupdf/pdf_build.c @@ -223,7 +223,7 @@ pdf_buildfillpath(pdf_gstate *gs, fz_pathnode *path, int eofill) } static fz_error * -addcolorshape(pdf_gstate *gs, fz_node *shape, fz_colorspace *cs, float *v) +addcolorshape(pdf_gstate *gs, fz_node *shape, float alpha, fz_colorspace *cs, float *v) { fz_error *error; fz_node *mask; @@ -233,7 +233,7 @@ addcolorshape(pdf_gstate *gs, fz_node *shape, fz_colorspace *cs, float *v) if (error) return fz_rethrow(error, "cannot create mask node"); - error = fz_newsolidnode(&solid, 1.0, cs, cs->n, v); + error = fz_newsolidnode(&solid, alpha, cs, cs->n, v); if (error) { fz_dropnode(mask); @@ -376,7 +376,7 @@ addpatternshape(pdf_gstate *gs, fz_node *shape, if (pat->ismask) { - error = addcolorshape(gs, mask, cs, v); + error = addcolorshape(gs, mask, 1.0, cs, v); if (error) return fz_rethrow(error, "cannot add colored shape"); return fz_okay; @@ -488,7 +488,7 @@ pdf_addfillshape(pdf_gstate *gs, fz_node *shape) case PDF_MCOLOR: case PDF_MLAB: case PDF_MINDEXED: - error = addcolorshape(gs, shape, gs->fill.cs, gs->fill.v); + error = addcolorshape(gs, shape, gs->fill.alpha, gs->fill.cs, gs->fill.v); if (error) return fz_rethrow(error, "cannot add colored shape"); break; @@ -526,7 +526,7 @@ pdf_addstrokeshape(pdf_gstate *gs, fz_node *shape) case PDF_MCOLOR: case PDF_MLAB: case PDF_MINDEXED: - error = addcolorshape(gs, shape, gs->stroke.cs, gs->stroke.v); + error = addcolorshape(gs, shape, gs->stroke.alpha, gs->stroke.cs, gs->stroke.v); if (error) return fz_rethrow(error, "cannot add colored shape"); break; diff --git a/mupdf/pdf_cmap.c b/mupdf/pdf_cmap.c index 5b3f7769..0afd4cf7 100644 --- a/mupdf/pdf_cmap.c +++ b/mupdf/pdf_cmap.c @@ -358,7 +358,7 @@ pdf_maponetomany(pdf_cmap *cmap, int low, int *values, int len) /* * Sort the input ranges. - * Merge contiguous input ranges to range-to-range if the output is contiguos. + * Merge contiguous input ranges to range-to-range if the output is contiguous. * Merge contiguous input ranges to range-to-table if the output is random. */ fz_error * |