![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp
index 7a63ba41510a4a9d27c5529e07bf97f7dc59c606..e28264eff9aa2166476c14103418e9ef47c7605d 100644 (file)
#include "unit-constants.h"
#include "io/stringstream.h"
#include "io/base64stream.h"
+#include "display/nr-filter-utils.h"
#include "libnr/nr-matrix-ops.h"
#include "libnr/nr-macros.h"
#include "libnrtype/font-instance.h"
#define TRACE(_args) IFTRACE(g_print _args)
+/**
+ * \struct SvgTransparencyGroup
+ * \brief Holds information about a PDF transparency group
+ */
+struct SvgTransparencyGroup {
+ double bbox[6];
+ Inkscape::XML::Node *container;
+
+ bool isolated;
+ bool knockout;
+ bool for_softmask;
+
+ SvgTransparencyGroup *next;
+};
+
/**
* \class SvgBuilder
*
*/
-SvgBuilder::SvgBuilder() {
- _in_text_object = false;
- _need_font_update = true;
- _invalidated_style = true;
- _font_style = NULL;
- _current_font = NULL;
- _current_state = NULL;
-}
-
SvgBuilder::SvgBuilder(SPDocument *document, gchar *docname, XRef *xref) {
_is_top_level = true;
_doc = document;
_xml_doc = sp_document_repr_doc(_doc);
_container = _root = _doc->rroot;
_root->setAttribute("xml:space", "preserve");
- SvgBuilder();
+ _init();
+
+ // Set default preference settings
+ _preferences = _xml_doc->createElement("svgbuilder:prefs");
+ _preferences->setAttribute("embedImages", "1");
}
SvgBuilder::SvgBuilder(SvgBuilder *parent, Inkscape::XML::Node *root) {
_docname = parent->_docname;
_xref = parent->_xref;
_xml_doc = parent->_xml_doc;
+ _preferences = parent->_preferences;
_container = this->_root = root;
- SvgBuilder();
+ _init();
}
SvgBuilder::~SvgBuilder() {
}
+void SvgBuilder::_init() {
+ _in_text_object = false;
+ _need_font_update = true;
+ _invalidated_style = true;
+ _font_style = NULL;
+ _current_font = NULL;
+ _current_state = NULL;
+
+ _transp_group_stack = NULL;
+ SvgGraphicsState initial_state;
+ initial_state.softmask = NULL;
+ initial_state.group_depth = 0;
+ _state_stack.push_back(initial_state);
+ _node_stack.push_back(_container);
+}
+
void SvgBuilder::setDocumentSize(double width, double height) {
sp_repr_set_svg_double(_root, "width", width);
sp_repr_set_svg_double(_root, "height", height);
}
}
+/**
+ * \brief Sets the current container's opacity
+ */
+void SvgBuilder::setGroupOpacity(double opacity) {
+ sp_repr_set_svg_double(_container, "opacity", CLAMP(opacity, 0.0, 1.0));
+}
+
void SvgBuilder::saveState() {
- _group_depth.push_back(0);
+ SvgGraphicsState new_state;
+ new_state.group_depth = 0;
+ new_state.softmask = _state_stack.back().softmask;
+ _state_stack.push_back(new_state);
pushGroup();
}
void SvgBuilder::restoreState() {
- while (_group_depth.back() > 0) {
+ while( _state_stack.back().group_depth > 0 ) {
popGroup();
}
- _group_depth.pop_back();
+ _state_stack.pop_back();
}
-Inkscape::XML::Node *SvgBuilder::pushGroup() {
- Inkscape::XML::Node *node = _xml_doc->createElement("svg:g");
- _container->appendChild(node);
+Inkscape::XML::Node *SvgBuilder::pushNode(const char *name) {
+ Inkscape::XML::Node *node = _xml_doc->createElement(name);
+ _node_stack.push_back(node);
_container = node;
+ return node;
+}
+
+Inkscape::XML::Node *SvgBuilder::popNode() {
+ Inkscape::XML::Node *node = NULL;
+ if ( _node_stack.size() > 1 ) {
+ node = _node_stack.back();
+ _node_stack.pop_back();
+ _container = _node_stack.back(); // Re-set container
+ } else {
+ TRACE(("popNode() called when stack is empty\n"));
+ node = _root;
+ }
+ return node;
+}
+
+Inkscape::XML::Node *SvgBuilder::pushGroup() {
+ Inkscape::XML::Node *saved_container = _container;
+ Inkscape::XML::Node *node = pushNode("svg:g");
+ saved_container->appendChild(node);
Inkscape::GC::release(node);
- _group_depth.back()++;
+ _state_stack.back().group_depth++;
// Set as a layer if this is a top-level group
if ( _container->parent() == _root && _is_top_level ) {
static int layer_count = 1;
Inkscape::XML::Node *SvgBuilder::popGroup() {
if (_container != _root) { // Pop if the current container isn't root
- _container = _container->parent();
- _group_depth[_group_depth.size()-1] = --_group_depth.back();
+ popNode();
+ _state_stack.back().group_depth--;
}
return _container;
static gchar tmp[1023] = {0};
snprintf(tmp, 1023,
"#%02x%02x%02x",
- CLAMP(SP_COLOR_F_TO_U(r), 0, 255),
- CLAMP(SP_COLOR_F_TO_U(g), 0, 255),
- CLAMP(SP_COLOR_F_TO_U(b), 0, 255));
+ NR::clamp(SP_COLOR_F_TO_U(r)),
+ NR::clamp(SP_COLOR_F_TO_U(g)),
+ NR::clamp(SP_COLOR_F_TO_U(b)));
return (gchar *)&tmp;
}
}
static void svgSetTransform(Inkscape::XML::Node *node, double c0, double c1,
- double c2, double c3, double c4, double c5) {
- NR::Matrix matrix(c0, c1, c2, c3, c4, c5);
+ double c2, double c3, double c4, double c5) {
+ Geom::Matrix matrix(c0, c1, c2, c3, c4, c5);
gchar *transform_text = sp_svg_transform_write(matrix);
node->setAttribute("transform", transform_text);
g_free(transform_text);
}
-static void svgSetTransform(Inkscape::XML::Node *node, double *transform) {
- svgSetTransform(node, transform[0], transform[1], transform[2], transform[3],
- transform[4], transform[5]);
-}
-
/**
* \brief Generates a SVG path string from poppler's data structure
*/
@@ -416,6 +469,27 @@ void SvgBuilder::addShadedFill(GfxShading *shading, double *matrix, GfxPath *pat
_container->appendChild(path_node);
Inkscape::GC::release(path_node);
+
+ // Remove the clipping path emitted before the 'sh' operator
+ int up_walk = 0;
+ Inkscape::XML::Node *node = _container->parent();
+ while( node && node->childCount() == 1 && up_walk < 3 ) {
+ gchar const *clip_path_url = node->attribute("clip-path");
+ if (clip_path_url) {
+ // Obtain clipping path's id from the URL
+ gchar clip_path_id[32];
+ strncpy(clip_path_id, clip_path_url + 5, strlen(clip_path_url) - 6);
+ SPObject *clip_obj = _doc->getObjectById(clip_path_id);
+ if (clip_obj) {
+ clip_obj->deleteObject();
+ node->setAttribute("clip-path", NULL);
+ TRACE(("removed clipping path: %s\n", clip_path_id));
+ }
+ break;
+ }
+ node = node->parent();
+ up_walk++;
+ }
}
/**
* \return true on success; false on invalid transformation
*/
bool SvgBuilder::getTransform(double *transform) {
- NR::Matrix svd;
+ Geom::Matrix svd;
gchar const *tr = _container->attribute("transform");
bool valid = sp_svg_transform_read(tr, &svd);
if (valid) {
void SvgBuilder::setTransform(double c0, double c1, double c2, double c3,
double c4, double c5) {
+ // Avoid transforming a group with an already set clip-path
+ if ( _container->attribute("clip-path") != NULL ) {
+ pushGroup();
+ }
TRACE(("setTransform: %f %f %f %f %f %f\n", c0, c1, c2, c3, c4, c5));
svgSetTransform(_container, c0, c1, c2, c3, c4, c5);
}
-void SvgBuilder::setTransform(double *transform) {
+void SvgBuilder::setTransform(double const *transform) {
setTransform(transform[0], transform[1], transform[2], transform[3],
transform[4], transform[5]);
}
Inkscape::XML::Node *pattern_node = _xml_doc->createElement("svg:pattern");
// Set pattern transform matrix
double *p2u = tiling_pattern->getMatrix();
- NR::Matrix pat_matrix(p2u[0], p2u[1], p2u[2], p2u[3], p2u[4], p2u[5]);
+ Geom::Matrix pat_matrix(p2u[0], p2u[1], p2u[2], p2u[3], p2u[4], p2u[5]);
gchar *transform_text = sp_svg_transform_write(pat_matrix);
pattern_node->setAttribute("patternTransform", transform_text);
g_free(transform_text);
@@ -639,10 +717,10 @@ gchar *SvgBuilder::_createGradient(GfxShading *shading, double *matrix, bool for
gradient->setAttribute("gradientUnits", "userSpaceOnUse");
// If needed, flip the gradient transform around the y axis
if (matrix) {
- NR::Matrix pat_matrix(matrix[0], matrix[1], matrix[2], matrix[3],
+ Geom::Matrix pat_matrix(matrix[0], matrix[1], matrix[2], matrix[3],
matrix[4], matrix[5]);
if ( !for_shading && _is_top_level ) {
- NR::Matrix flip(1.0, 0.0, 0.0, -1.0, 0.0, _height * PT_PER_PX);
+ Geom::Matrix flip(1.0, 0.0, 0.0, -1.0, 0.0, _height * PT_PER_PX);
pat_matrix *= flip;
}
gchar *transform_text = sp_svg_transform_write(pat_matrix);
@@ -676,9 +754,17 @@ void SvgBuilder::_addStopToGradient(Inkscape::XML::Node *gradient, double offset
Inkscape::XML::Node *stop = _xml_doc->createElement("svg:stop");
SPCSSAttr *css = sp_repr_css_attr_new();
Inkscape::CSSOStringStream os_opacity;
- os_opacity << opacity;
+ gchar *color_text = NULL;
+ if ( _transp_group_stack != NULL && _transp_group_stack->for_softmask ) {
+ double gray = (double)color->r / 65535.0;
+ gray = CLAMP(gray, 0.0, 1.0);
+ os_opacity << gray;
+ color_text = (char*) "#ffffff";
+ } else {
+ os_opacity << opacity;
+ color_text = svgConvertGfxRGB(color);
+ }
sp_repr_css_set_property(css, "stop-opacity", os_opacity.str().c_str());
- gchar *color_text = svgConvertGfxRGB(color);
sp_repr_css_set_property(css, "stop-color", color_text);
sp_repr_css_change(stop, css, "style");
* This array holds info about translating font weight names to more or less CSS equivalents
*/
static char *font_weight_translator[][2] = {
- {"bold", "bold"},
- {"light", "300"},
- {"black", "900"},
- {"heavy", "900"},
- {"ultrabold", "800"},
- {"extrabold", "800"},
- {"demibold", "600"},
- {"semibold", "600"},
- {"medium", "500"},
- {"book", "normal"},
- {"regular", "normal"},
- {"roman", "normal"},
- {"normal", "normal"},
- {"ultralight", "200"},
- {"extralight", "200"},
- {"thin", "100"}
+ {(char*) "bold", (char*) "bold"},
+ {(char*) "light", (char*) "300"},
+ {(char*) "black", (char*) "900"},
+ {(char*) "heavy", (char*) "900"},
+ {(char*) "ultrabold", (char*) "800"},
+ {(char*) "extrabold", (char*) "800"},
+ {(char*) "demibold", (char*) "600"},
+ {(char*) "semibold", (char*) "600"},
+ {(char*) "medium", (char*) "500"},
+ {(char*) "book", (char*) "normal"},
+ {(char*) "regular", (char*) "normal"},
+ {(char*) "roman", (char*) "normal"},
+ {(char*) "normal", (char*) "normal"},
+ {(char*) "ultralight", (char*) "200"},
+ {(char*) "extralight", (char*) "200"},
+ {(char*) "thin", (char*) "100"}
};
/**
TRACE(("updateFont()\n"));
_need_font_update = false;
+ updateTextMatrix(state); // Ensure that we have a text matrix built
if (_font_style) {
//sp_repr_css_attr_unref(_font_style);
} else if (font->getName()) {
_font_specification = font->getName()->getCString();
} else {
- _font_specification = "Arial";
+ _font_specification = (char*) "Arial";
}
// Prune the font name to get the correct font family name
char *css_font_weight = NULL;
if ( font_weight != GfxFont::WeightNotDefined ) {
if ( font_weight == GfxFont::W400 ) {
- css_font_weight = "normal";
+ css_font_weight = (char*) "normal";
} else if ( font_weight == GfxFont::W700 ) {
- css_font_weight = "bold";
+ css_font_weight = (char*) "bold";
} else {
gchar weight_num[4] = "100";
weight_num[0] = (gchar)( '1' + (font_weight - GfxFont::W100) );
}
}
} else {
- css_font_weight = "normal";
+ css_font_weight = (char*) "normal";
}
if (css_font_weight) {
sp_repr_css_set_property(_font_style, "font-weight", css_font_weight);
gchar *stretch_value = NULL;
switch (font_stretch) {
case GfxFont::UltraCondensed:
- stretch_value = "ultra-condensed";
+ stretch_value = (char*) "ultra-condensed";
break;
case GfxFont::ExtraCondensed:
- stretch_value = "extra-condensed";
+ stretch_value = (char*) "extra-condensed";
break;
case GfxFont::Condensed:
- stretch_value = "condensed";
+ stretch_value = (char*) "condensed";
break;
case GfxFont::SemiCondensed:
- stretch_value = "semi-condensed";
+ stretch_value = (char*) "semi-condensed";
break;
case GfxFont::Normal:
- stretch_value = "normal";
+ stretch_value = (char*) "normal";
break;
case GfxFont::SemiExpanded:
- stretch_value = "semi-expanded";
+ stretch_value = (char*) "semi-expanded";
break;
case GfxFont::Expanded:
- stretch_value = "expanded";
+ stretch_value = (char*) "expanded";
break;
case GfxFont::ExtraExpanded:
- stretch_value = "extra-expanded";
+ stretch_value = (char*) "extra-expanded";
break;
case GfxFont::UltraExpanded:
- stretch_value = "ultra-expanded";
+ stretch_value = (char*) "ultra-expanded";
break;
default:
break;
// Font size
Inkscape::CSSOStringStream os_font_size;
- double *text_matrix = state->getTextMat();
- double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
- double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
- double max_scale;
- if ( w_scale > h_scale ) {
- max_scale = w_scale;
- } else {
- max_scale = h_scale;
- }
- double css_font_size = max_scale * state->getFontSize();
+ double css_font_size = _font_scaling * state->getFontSize();
if ( font->getType() == fontType3 ) {
double *font_matrix = font->getFontMatrix();
if ( font_matrix[0] != 0.0 ) {
css_font_size *= font_matrix[3] / font_matrix[0];
}
}
-
os_font_size << css_font_size;
sp_repr_css_set_property(_font_style, "font-size", os_font_size.str().c_str());
sp_repr_css_set_property(_font_style, "writing-mode", "tb");
}
- // Calculate new text matrix
- NR::Matrix new_text_matrix(text_matrix[0] * state->getHorizScaling(),
- text_matrix[1] * state->getHorizScaling(),
- -text_matrix[2], -text_matrix[3],
- 0.0, 0.0);
-
- if ( fabs( max_scale - 1.0 ) > EPSILON ) {
- // Cancel out scaling by font size in text matrix
- for ( int i = 0 ; i < 4 ; i++ ) {
- new_text_matrix[i] /= max_scale;
- }
- }
- _text_matrix = new_text_matrix;
- _font_scaling = max_scale;
_current_font = font;
_invalidated_style = true;
}
* \brief Updates current text position
*/
void SvgBuilder::updateTextPosition(double tx, double ty) {
- NR::Point new_position(tx, ty);
+ Geom::Point new_position(tx, ty);
_text_position = new_position;
}
*/
void SvgBuilder::updateTextMatrix(GfxState *state) {
_flushText();
- updateFont(state); // Update text matrix
+ // Update text matrix
+ double *text_matrix = state->getTextMat();
+ double w_scale = sqrt( text_matrix[0] * text_matrix[0] + text_matrix[2] * text_matrix[2] );
+ double h_scale = sqrt( text_matrix[1] * text_matrix[1] + text_matrix[3] * text_matrix[3] );
+ double max_scale;
+ if ( w_scale > h_scale ) {
+ max_scale = w_scale;
+ } else {
+ max_scale = h_scale;
+ }
+ // Calculate new text matrix
+ Geom::Matrix new_text_matrix(text_matrix[0] * state->getHorizScaling(),
+ text_matrix[1] * state->getHorizScaling(),
+ -text_matrix[2], -text_matrix[3],
+ 0.0, 0.0);
+
+ if ( fabs( max_scale - 1.0 ) > EPSILON ) {
+ // Cancel out scaling by font size in text matrix
+ for ( int i = 0 ; i < 4 ; i++ ) {
+ new_text_matrix[i] /= max_scale;
+ }
+ }
+ _text_matrix = new_text_matrix;
+ _font_scaling = max_scale;
}
/**
Inkscape::XML::Node *text_node = _xml_doc->createElement("svg:text");
// Set text matrix
- NR::Matrix text_transform(_text_matrix);
+ Geom::Matrix text_transform(_text_matrix);
text_transform[4] = first_glyph.position[0];
text_transform[5] = first_glyph.position[1];
gchar *transform = sp_svg_transform_write(text_transform);
g_free(transform);
bool new_tspan = true;
+ bool same_coords[2] = {true, true};
+ Geom::Point last_delta_pos;
unsigned int glyphs_in_a_row = 0;
Inkscape::XML::Node *tspan_node = NULL;
Glib::ustring x_coords;
Glib::ustring y_coords;
Glib::ustring text_buffer;
- bool is_vertical = !strcmp(sp_repr_css_property(_font_style, "writing-mode", "lr"), "tb"); // FIXME
// Output all buffered glyphs
while (1) {
if ( new_tspan || i == _glyphs.end() ) {
if (tspan_node) {
// Set the x and y coordinate arrays
- tspan_node->setAttribute("x", x_coords.c_str());
- tspan_node->setAttribute("y", y_coords.c_str());
+ if ( same_coords[0] ) {
+ sp_repr_set_svg_double(tspan_node, "x", last_delta_pos[0]);
+ } else {
+ tspan_node->setAttribute("x", x_coords.c_str());
+ }
+ if ( same_coords[1] ) {
+ sp_repr_set_svg_double(tspan_node, "y", last_delta_pos[1]);
+ } else {
+ tspan_node->setAttribute("y", y_coords.c_str());
+ }
TRACE(("tspan content: %s\n", text_buffer.c_str()));
if ( glyphs_in_a_row > 1 ) {
tspan_node->setAttribute("sodipodi:role", "line");
break;
} else {
tspan_node = _xml_doc->createElement("svg:tspan");
- tspan_node->setAttribute("inkscape:font-specification", glyph.font_specification);
+
+ ///////
+ // Create a font specification string and save the attribute in the style
+ PangoFontDescription *descr = pango_font_description_from_string(glyph.font_specification);
+ Glib::ustring properFontSpec = font_factory::Default()->ConstructFontSpecification(descr);
+ pango_font_description_free(descr);
+ sp_repr_css_set_property(glyph.style, "-inkscape-font-specification", properFontSpec.c_str());
+
// Set style and unref SPCSSAttr if it won't be needed anymore
sp_repr_css_change(tspan_node, glyph.style, "style");
if ( glyph.style_changed && i != _glyphs.begin() ) { // Free previous style
if ( glyphs_in_a_row > 0 ) {
x_coords.append(" ");
y_coords.append(" ");
+ // Check if we have the same coordinates
+ const SvgGlyph& prev_glyph = (*prev_iterator);
+ for ( int p = 0 ; p < 2 ; p++ ) {
+ if ( glyph.text_position[p] != prev_glyph.text_position[p] ) {
+ same_coords[p] = false;
+ }
+ }
}
// Append the coordinates to their respective strings
- NR::Point delta_pos( glyph.text_position - first_glyph.text_position );
+ Geom::Point delta_pos( glyph.text_position - first_glyph.text_position );
delta_pos[1] += glyph.rise;
delta_pos[1] *= -1.0; // flip it
delta_pos *= _font_scaling;
Inkscape::CSSOStringStream os_y;
os_y << delta_pos[1];
y_coords.append(os_y.str());
+ last_delta_pos = delta_pos;
// Append the character to the text buffer
text_buffer.append((char *)&glyph.code, 1);
bool is_space = ( uLen == 1 && u[0] == 32 );
// Skip beginning space
if ( is_space && _glyphs.size() < 1 ) {
- NR::Point delta(dx, dy);
+ Geom::Point delta(dx, dy);
_text_position += delta;
return;
}
// Allow only one space in a row
if ( is_space && _glyphs[_glyphs.size() - 1].code_size == 1 &&
_glyphs[_glyphs.size() - 1].code[0] == 32 ) {
- NR::Point delta(dx, dy);
+ Geom::Point delta(dx, dy);
_text_position += delta;
return;
}
SvgGlyph new_glyph;
new_glyph.is_space = is_space;
- new_glyph.position = NR::Point( x - originX, y - originY );
+ new_glyph.position = Geom::Point( x - originX, y - originY );
new_glyph.text_position = _text_position;
new_glyph.dx = dx;
new_glyph.dy = dy;
- NR::Point delta(dx, dy);
+ Geom::Point delta(dx, dy);
_text_position += delta;
// Convert the character to UTF-8 since that's our SVG document's encoding
@@ -1251,13 +1361,15 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height
png_destroy_write_struct(&png_ptr, &info_ptr);
return NULL;
}
-
+ // Decide whether we should embed this image
+ double attr_value = 1.0;
+ sp_repr_get_double(_preferences, "embedImages", &attr_value);
+ bool embed_image = ( attr_value != 0.0 );
// Set read/write functions
Inkscape::IO::StringOutputStream base64_string;
Inkscape::IO::Base64OutputStream base64_stream(base64_string);
- FILE *fp;
- gchar *file_name;
- bool embed_image = true;
+ FILE *fp = NULL;
+ gchar *file_name = NULL;
if (embed_image) {
base64_stream.setColumnWidth(0); // Disable line breaks
png_set_write_fn(png_ptr, &base64_stream, png_write_base64stream, png_flush_base64stream);
@@ -1323,39 +1435,25 @@ Inkscape::XML::Node *SvgBuilder::_createImage(Stream *str, int width, int height
image_stream->reset();
// Convert grayscale values
- unsigned char *buffer = NULL;
- if ( color_map || invert_alpha ) {
- buffer = new unsigned char[width];
- }
- if ( color_map ) {
- for ( int y = 0 ; y < height ; y++ ) {
- unsigned char *row = image_stream->getLine();
+ unsigned char *buffer = new unsigned char[width];
+ int invert_bit = invert_alpha ? 1 : 0;
+ for ( int y = 0 ; y < height ; y++ ) {
+ unsigned char *row = image_stream->getLine();
+ if (color_map) {
color_map->getGrayLine(row, buffer, width);
- if (invert_alpha) {
- unsigned char *buf_ptr = buffer;
- for ( int x = 0 ; x < width ; x++ ) {
- *buf_ptr++ = ~(*buf_ptr);
- }
- }
- png_write_row(png_ptr, (png_bytep)buffer);
- }
- } else {
- for ( int y = 0 ; y < height ; y++ ) {
- unsigned char *row = image_stream->getLine();
- if (invert_alpha) {
- unsigned char *buf_ptr = buffer;
- for ( int x = 0 ; x < width ; x++ ) {
- *buf_ptr++ = ~row[x];
+ } else {
+ unsigned char *buf_ptr = buffer;
+ for ( int x = 0 ; x < width ; x++ ) {
+ if ( row[x] ^ invert_bit ) {
+ *buf_ptr++ = 0;
+ } else {
+ *buf_ptr++ = 255;
}
- png_write_row(png_ptr, (png_bytep)buffer);
- } else {
- png_write_row(png_ptr, (png_bytep)row);
}
}
+ png_write_row(png_ptr, (png_bytep)buffer);
}
- if (buffer) {
- delete buffer;
- }
+ delete buffer;
} else if (color_map) {
image_stream = new ImageStream(str, width,
color_map->getNumPixelComps(),
} else { // Work around for renderer bug when mask isn't defined in pattern
static int mask_count = 0;
Inkscape::XML::Node *defs = _root->firstChild();
- Inkscape::XML::Node *result = NULL;
if ( !( defs && !strcmp(defs->name(), "svg:defs") ) ) {
// Create <defs> node
defs = _xml_doc->createElement("svg:defs");
@@ -1534,7 +1631,7 @@ void SvgBuilder::addMaskedImage(GfxState *state, Stream *str, int width, int hei
mask_image_node->setAttribute("transform", NULL);
mask_node->appendChild(mask_image_node);
// Scale the mask to the size of the image
- NR::Matrix mask_transform((double)width, 0.0, 0.0, (double)height, 0.0, 0.0);
+ Geom::Matrix mask_transform((double)width, 0.0, 0.0, (double)height, 0.0, 0.0);
gchar *transform_text = sp_svg_transform_write(mask_transform);
mask_node->setAttribute("maskTransform", transform_text);
g_free(transform_text);
@@ -1580,6 +1677,77 @@ void SvgBuilder::addSoftMaskedImage(GfxState *state, Stream *str, int width, int
}
}
+/**
+ * \brief Starts building a new transparency group
+ */
+void SvgBuilder::pushTransparencyGroup(GfxState *state, double *bbox,
+ GfxColorSpace *blending_color_space,
+ bool isolated, bool knockout,
+ bool for_softmask) {
+
+ // Push node stack
+ pushNode("svg:g");
+
+ // Setup new transparency group
+ SvgTransparencyGroup *transpGroup = new SvgTransparencyGroup;
+ memcpy(&transpGroup->bbox, bbox, sizeof(bbox));
+ transpGroup->isolated = isolated;
+ transpGroup->knockout = knockout;
+ transpGroup->for_softmask = for_softmask;
+ transpGroup->container = _container;
+
+ // Push onto the stack
+ transpGroup->next = _transp_group_stack;
+ _transp_group_stack = transpGroup;
+}
+
+void SvgBuilder::popTransparencyGroup(GfxState *state) {
+ // Restore node stack
+ popNode();
+}
+
+/**
+ * \brief Places the current transparency group into the current container
+ */
+void SvgBuilder::paintTransparencyGroup(GfxState *state, double *bbox) {
+ SvgTransparencyGroup *transpGroup = _transp_group_stack;
+ _container->appendChild(transpGroup->container);
+ Inkscape::GC::release(transpGroup->container);
+ // Pop the stack
+ _transp_group_stack = transpGroup->next;
+ delete transpGroup;
+}
+
+/**
+ * \brief Creates a mask using the current transparency group as its content
+ */
+void SvgBuilder::setSoftMask(GfxState *state, double *bbox, bool alpha,
+ Function *transfer_func, GfxColor *backdrop_color) {
+
+ // Create mask
+ Inkscape::XML::Node *mask_node = _createMask(1.0, 1.0);
+ // Add the softmask content to it
+ SvgTransparencyGroup *transpGroup = _transp_group_stack;
+ mask_node->appendChild(transpGroup->container);
+ Inkscape::GC::release(transpGroup->container);
+ // Apply the mask
+ _state_stack.back().softmask = mask_node;
+ pushGroup();
+ gchar *mask_url = g_strdup_printf("url(#%s)", mask_node->attribute("id"));
+ _container->setAttribute("mask", mask_url);
+ g_free(mask_url);
+ // Pop the stack
+ _transp_group_stack = transpGroup->next;
+ delete transpGroup;
+}
+
+void SvgBuilder::clearSoftMask(GfxState *state) {
+ if (_state_stack.back().softmask) {
+ _state_stack.back().softmask = NULL;
+ popGroup();
+ }
+}
+
} } } /* namespace Inkscape, Extension, Internal */
#endif /* HAVE_POPPLER */