diff --git a/src/extension/internal/cairo-render-context.h b/src/extension/internal/cairo-render-context.h
index 5950434675903749433ec83e2b120da6e3f3c3f9..948efc438a87dc7516d028867e3892132adaf8d1 100644 (file)
SPClipPath *clip_path;
SPMask* mask;
- NRMatrix transform; // the CTM
+ NR::Matrix transform; // the CTM
};
class CairoRenderContext {
CairoRenderState *getParentState(void) const;
void setStateForStyle(SPStyle const *style);
- void transform(NRMatrix const *transform);
- void setTransform(NRMatrix const *transform);
- void getTransform(NRMatrix *copy) const;
- void getParentTransform(NRMatrix *copy) const;
+ void transform(NR::Matrix const *transform);
+ void setTransform(NR::Matrix const *transform);
+ void getTransform(NR::Matrix *copy) const;
+ void getParentTransform(NR::Matrix *copy) const;
/* Clipping methods */
void addClipPath(NArtBpath const *bp, SPIEnum const *fill_rule);
/* Rendering methods */
bool renderPath(NRBPath const *bpath, SPStyle const *style, NRRect const *pbox);
bool renderImage(unsigned char *px, unsigned int w, unsigned int h, unsigned int rs,
- NRMatrix const *image_transform, SPStyle const *style);
- bool renderGlyphtext(PangoFont *font, NRMatrix const *font_matrix,
+ NR::Matrix const *image_transform, SPStyle const *style);
+ bool renderGlyphtext(PangoFont *font, NR::Matrix const *font_matrix,
std::vector<CairoGlyphInfo> const &glyphtext, SPStyle const *style);
/* More general rendering methods will have to be added (like fill, stroke) */
void _setFillStyle(SPStyle const *style, NRRect const *pbox);
void _setStrokeStyle(SPStyle const *style, NRRect const *pbox);
- void _initCairoMatrix(cairo_matrix_t *matrix, NRMatrix const *transform);
+ void _initCairoMatrix(cairo_matrix_t *matrix, NR::Matrix const *transform);
void _concatTransform(cairo_t *cr, double xx, double yx, double xy, double yy, double x0, double y0);
- void _concatTransform(cairo_t *cr, NRMatrix const *transform);
+ void _concatTransform(cairo_t *cr, NR::Matrix const *transform);
CairoRenderState *_createState(void);
};