diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-09-10 06:33:47 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-09-10 06:33:47 +0000 |
| commit | 16888ce63e21b83d94595055150072ef3037ca1d (patch) | |
| tree | 649a9f640d4f0354e59196404833e6d1ae9833cb /src/extension/internal/ps.cpp | |
| parent | rearrange, disable fidelity for color modes (diff) | |
| download | inkscape-16888ce63e21b83d94595055150072ef3037ca1d.tar.gz inkscape-16888ce63e21b83d94595055150072ef3037ca1d.zip | |
Purged fill type enum
(bzr r3706)
Diffstat (limited to 'src/extension/internal/ps.cpp')
| -rw-r--r-- | src/extension/internal/ps.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/extension/internal/ps.cpp b/src/extension/internal/ps.cpp index 8cf284536..ac424e85e 100644 --- a/src/extension/internal/ps.cpp +++ b/src/extension/internal/ps.cpp @@ -646,18 +646,18 @@ PrintPS::comment(Inkscape::Extension::Print *mod, char const *comment) void PrintPS::print_fill_style(SVGOStringStream &os, SPStyle const *const style, NRRect const *pbox) { - g_return_if_fail( style->fill.type == SP_PAINT_TYPE_COLOR - || ( style->fill.type == SP_PAINT_TYPE_PAINTSERVER + g_return_if_fail( style->fill.isColor() + || ( style->fill.isPaintserver() && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ) ); - if (style->fill.type == SP_PAINT_TYPE_COLOR) { + if (style->fill.isColor()) { float rgb[3]; sp_color_get_rgb_floatv(&style->fill.value.color, rgb); os << rgb[0] << " " << rgb[1] << " " << rgb[2] << " setrgbcolor\n"; } else { - g_assert( style->fill.type == SP_PAINT_TYPE_PAINTSERVER + g_assert( style->fill.isPaintserver() && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ); if (SP_IS_LINEARGRADIENT(SP_STYLE_FILL_SERVER(style))) { @@ -799,8 +799,8 @@ PrintPS::fill(Inkscape::Extension::Print *mod, NRBPath const *bpath, NRMatrix co if (!_stream) return 0; // XXX: fixme, returning -1 as unsigned. if (_bitmap) return 0; - if ( style->fill.type == SP_PAINT_TYPE_COLOR - || ( style->fill.type == SP_PAINT_TYPE_PAINTSERVER + if ( style->fill.isColor() + || ( style->fill.isPaintserver() && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ) ) { Inkscape::SVGOStringStream os; @@ -812,10 +812,10 @@ PrintPS::fill(Inkscape::Extension::Print *mod, NRBPath const *bpath, NRMatrix co print_bpath(os, bpath->path); if (style->fill_rule.value == SP_WIND_RULE_EVENODD) { - if (style->fill.type == SP_PAINT_TYPE_COLOR) { + if (style->fill.isColor()) { os << "eofill\n"; } else { - g_assert( style->fill.type == SP_PAINT_TYPE_PAINTSERVER + g_assert( style->fill.isPaintserver() && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ); SPGradient const *g = SP_GRADIENT(SP_STYLE_FILL_SERVER(style)); os << "eoclip\n"; @@ -830,10 +830,10 @@ PrintPS::fill(Inkscape::Extension::Print *mod, NRBPath const *bpath, NRMatrix co } } } else { - if (style->fill.type == SP_PAINT_TYPE_COLOR) { + if (style->fill.isColor()) { os << "fill\n"; } else { - g_assert( style->fill.type == SP_PAINT_TYPE_PAINTSERVER + g_assert( style->fill.isPaintserver() && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ); SPGradient const *g = SP_GRADIENT(SP_STYLE_FILL_SERVER(style)); os << "clip\n"; @@ -865,7 +865,7 @@ PrintPS::stroke(Inkscape::Extension::Print *mod, NRBPath const *bpath, NRMatrix if (!_stream) return 0; // XXX: fixme, returning -1 as unsigned. if (_bitmap) return 0; - if (style->stroke.type == SP_PAINT_TYPE_COLOR) { + if (style->stroke.isColor()) { Inkscape::SVGOStringStream os; print_stroke_style(os, style); @@ -1367,8 +1367,8 @@ PrintPS::text(Inkscape::Extension::Print *mod, char const *text, NR::Point p, //The commented line beneath causes Inkscape to crash under Linux but not under Windows //g_free((void*) fn); - if ( style->fill.type == SP_PAINT_TYPE_COLOR - || ( style->fill.type == SP_PAINT_TYPE_PAINTSERVER + if ( style->fill.isColor() + || ( style->fill.isPaintserver() && SP_IS_GRADIENT(SP_STYLE_FILL_SERVER(style)) ) ) { // set fill style @@ -1385,7 +1385,7 @@ PrintPS::text(Inkscape::Extension::Print *mod, char const *text, NR::Point p, os << ") show\n"; } - if (style->stroke.type == SP_PAINT_TYPE_COLOR) { + if (style->stroke.isColor()) { // set stroke style print_stroke_style(os, style); |