![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
index 6f30937829e35a7f3aa95dc8bd461671f67b50b2..f45a2da4f8c8c44e2a05b7733731aadf6e5303aa 100644 (file)
*/
#include <libnr/nr-compose-transform.h>
+#include <2geom/transforms.h>
#include <libnr/nr-blit.h>
-#include "../prefs-utils.h"
+#include "../preferences.h"
#include "nr-arena-image.h"
#include "style.h"
#include "display/nr-arena.h"
#include "display/nr-filter.h"
#include "display/nr-filter-gaussian.h"
-#include <livarot/Path.h>
-#include <livarot/Shape.h>
#include "sp-filter.h"
#include "sp-filter-reference.h"
#include "sp-gaussian-blur.h"
-#include "sp-feblend.h"
+#include "filters/blend.h"
#include "display/nr-filter-blend.h"
int nr_arena_image_x_sample = 1;
*
*/
-// defined in nr-arena-shape.cpp
-void nr_pixblock_render_shape_mask_or(NRPixBlock &m, Shape *theS);
-
static void nr_arena_image_class_init (NRArenaImageClass *klass);
static void nr_arena_image_init (NRArenaImage *image);
static void nr_arena_image_finalize (NRObject *object);
static unsigned int nr_arena_image_update (NRArenaItem *item, NRRectL *area, NRGC *gc, unsigned int state, unsigned int reset);
static unsigned int nr_arena_image_render (cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags);
-static NRArenaItem *nr_arena_image_pick (NRArenaItem *item, NR::Point p, double delta, unsigned int sticky);
+static NRArenaItem *nr_arena_image_pick (NRArenaItem *item, Geom::Point p, double delta, unsigned int sticky);
static NRArenaItemClass *parent_class;
NRType
nr_arena_image_get_type (void)
{
- static NRType type = 0;
- if (!type) {
- type = nr_object_register_type (NR_TYPE_ARENA_ITEM,
- "NRArenaImage",
- sizeof (NRArenaImageClass),
- sizeof (NRArenaImage),
- (void (*) (NRObjectClass *)) nr_arena_image_class_init,
- (void (*) (NRObject *)) nr_arena_image_init);
- }
- return type;
+ static NRType type = 0;
+ if (!type) {
+ type = nr_object_register_type (NR_TYPE_ARENA_ITEM,
+ "NRArenaImage",
+ sizeof (NRArenaImageClass),
+ sizeof (NRArenaImage),
+ (void (*) (NRObjectClass *)) nr_arena_image_class_init,
+ (void (*) (NRObject *)) nr_arena_image_init);
+ }
+ return type;
}
static void
nr_arena_image_class_init (NRArenaImageClass *klass)
{
- NRObjectClass *object_class;
- NRArenaItemClass *item_class;
+ NRObjectClass *object_class;
+ NRArenaItemClass *item_class;
- object_class = (NRObjectClass *) klass;
- item_class = (NRArenaItemClass *) klass;
+ object_class = (NRObjectClass *) klass;
+ item_class = (NRArenaItemClass *) klass;
- parent_class = (NRArenaItemClass *) ((NRObjectClass *) klass)->parent;
+ parent_class = (NRArenaItemClass *) ((NRObjectClass *) klass)->parent;
- object_class->finalize = nr_arena_image_finalize;
- object_class->cpp_ctor = NRObject::invoke_ctor<NRArenaImage>;
+ object_class->finalize = nr_arena_image_finalize;
+ object_class->cpp_ctor = NRObject::invoke_ctor<NRArenaImage>;
- item_class->update = nr_arena_image_update;
- item_class->render = nr_arena_image_render;
- item_class->pick = nr_arena_image_pick;
+ item_class->update = nr_arena_image_update;
+ item_class->render = nr_arena_image_render;
+ item_class->pick = nr_arena_image_pick;
}
static void
nr_arena_image_init (NRArenaImage *image)
{
- image->px = NULL;
+ image->px = NULL;
- image->pxw = image->pxh = image->pxrs = 0;
- image->x = image->y = 0.0;
- image->width = 256.0;
- image->height = 256.0;
+ image->pxw = image->pxh = image->pxrs = 0;
+ image->x = image->y = 0.0;
+ image->width = 256.0;
+ image->height = 256.0;
- nr_matrix_set_identity (&image->grid2px);
+ image->grid2px.setIdentity();
- image->style = 0;
+ image->style = 0;
}
static void
nr_arena_image_finalize (NRObject *object)
{
- NRArenaImage *image = NR_ARENA_IMAGE (object);
+ NRArenaImage *image = NR_ARENA_IMAGE (object);
- image->px = NULL;
+ image->px = NULL;
- ((NRObjectClass *) parent_class)->finalize (object);
+ ((NRObjectClass *) parent_class)->finalize (object);
}
static unsigned int
-nr_arena_image_update (NRArenaItem *item, NRRectL *area, NRGC *gc, unsigned int state, unsigned int reset)
+nr_arena_image_update( NRArenaItem *item, NRRectL */*area*/, NRGC *gc, unsigned int /*state*/, unsigned int /*reset*/ )
{
- NRMatrix grid2px;
-
- NRArenaImage *image = NR_ARENA_IMAGE (item);
-
- /* Request render old */
- nr_arena_item_request_render (item);
-
- /* Copy affine */
- nr_matrix_invert (&grid2px, &gc->transform);
- double hscale, vscale; // todo: replace with NR::scale
- if (image->px) {
- hscale = image->pxw / image->width;
- vscale = image->pxh / image->height;
- } else {
- hscale = 1.0;
- vscale = 1.0;
- }
-
- image->grid2px[0] = grid2px.c[0] * hscale;
- image->grid2px[2] = grid2px.c[2] * hscale;
- image->grid2px[4] = grid2px.c[4] * hscale;
- image->grid2px[1] = grid2px.c[1] * vscale;
- image->grid2px[3] = grid2px.c[3] * vscale;
- image->grid2px[5] = grid2px.c[5] * vscale;
-
- image->grid2px[4] -= image->x * hscale;
- image->grid2px[5] -= image->y * vscale;
-
- /* Calculate bbox */
- if (image->px) {
- NRRect bbox;
-
- bbox.x0 = image->x;
- bbox.y0 = image->y;
- bbox.x1 = image->x + image->width;
- bbox.y1 = image->y + image->height;
-
- image->c00 = (NR::Point(bbox.x0, bbox.y0) * gc->transform);
- image->c01 = (NR::Point(bbox.x0, bbox.y1) * gc->transform);
- image->c10 = (NR::Point(bbox.x1, bbox.y0) * gc->transform);
- image->c11 = (NR::Point(bbox.x1, bbox.y1) * gc->transform);
-
- nr_rect_d_matrix_transform (&bbox, &bbox, &gc->transform);
-
- item->bbox.x0 = (int) floor (bbox.x0);
- item->bbox.y0 = (int) floor (bbox.y0);
- item->bbox.x1 = (int) ceil (bbox.x1);
- item->bbox.y1 = (int) ceil (bbox.y1);
- } else {
- item->bbox.x0 = (int) gc->transform[4];
- item->bbox.y0 = (int) gc->transform[5];
- item->bbox.x1 = item->bbox.x0 - 1;
- item->bbox.y1 = item->bbox.y0 - 1;
- }
-
- nr_arena_item_request_render (item);
-
- return NR_ARENA_ITEM_STATE_ALL;
+ Geom::Matrix grid2px;
+
+ // clear old bbox
+ nr_arena_item_request_render(item);
+
+ NRArenaImage *image = NR_ARENA_IMAGE (item);
+
+ /* Copy affine */
+ grid2px = gc->transform.inverse();
+ double hscale, vscale; // todo: replace with Geom::Scale
+ if (image->px) {
+ hscale = image->pxw / image->width;
+ vscale = image->pxh / image->height;
+ } else {
+ hscale = 1.0;
+ vscale = 1.0;
+ }
+
+ image->grid2px[0] = grid2px[0] * hscale;
+ image->grid2px[2] = grid2px[2] * hscale;
+ image->grid2px[4] = grid2px[4] * hscale;
+ image->grid2px[1] = grid2px[1] * vscale;
+ image->grid2px[3] = grid2px[3] * vscale;
+ image->grid2px[5] = grid2px[5] * vscale;
+
+ image->grid2px[4] -= image->x * hscale;
+ image->grid2px[5] -= image->y * vscale;
+
+ /* Calculate bbox */
+ if (image->px) {
+ NRRect bbox;
+
+ bbox.x0 = image->x;
+ bbox.y0 = image->y;
+ bbox.x1 = image->x + image->width;
+ bbox.y1 = image->y + image->height;
+
+ image->c00 = (Geom::Point(bbox.x0, bbox.y0) * gc->transform);
+ image->c01 = (Geom::Point(bbox.x0, bbox.y1) * gc->transform);
+ image->c10 = (Geom::Point(bbox.x1, bbox.y0) * gc->transform);
+ image->c11 = (Geom::Point(bbox.x1, bbox.y1) * gc->transform);
+
+ nr_rect_d_matrix_transform (&bbox, &bbox, gc->transform);
+
+ item->bbox.x0 = (int) floor (bbox.x0);
+ item->bbox.y0 = (int) floor (bbox.y0);
+ item->bbox.x1 = (int) ceil (bbox.x1);
+ item->bbox.y1 = (int) ceil (bbox.y1);
+ } else {
+ item->bbox.x0 = (int) gc->transform[4];
+ item->bbox.y0 = (int) gc->transform[5];
+ item->bbox.x1 = item->bbox.x0 - 1;
+ item->bbox.y1 = item->bbox.y0 - 1;
+ }
+
+ return NR_ARENA_ITEM_STATE_ALL;
}
#define FBITS 12
#define b2i (image->grid2px)
static unsigned int
-nr_arena_image_render (cairo_t *ct, NRArenaItem *item, NRRectL *area, NRPixBlock *pb, unsigned int flags)
+nr_arena_image_render( cairo_t *ct, NRArenaItem *item, NRRectL */*area*/, NRPixBlock *pb, unsigned int /*flags*/ )
{
- nr_arena_image_x_sample = prefs_get_int_attribute ("options.bitmapoversample", "value", 1);
- nr_arena_image_y_sample = nr_arena_image_x_sample;
+ Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+ nr_arena_image_x_sample = prefs->getInt("/options/bitmapoversample/value", 1);
+ nr_arena_image_y_sample = nr_arena_image_x_sample;
- bool outline = (item->arena->rendermode == RENDERMODE_OUTLINE);
+ bool outline = (item->arena->rendermode == Inkscape::RENDERMODE_OUTLINE);
- NRArenaImage *image = NR_ARENA_IMAGE (item);
+ NRArenaImage *image = NR_ARENA_IMAGE (item);
- NR::Matrix d2s;
+ Geom::Matrix d2s;
- d2s[0] = b2i[0];
- d2s[1] = b2i[1];
- d2s[2] = b2i[2];
- d2s[3] = b2i[3];
- d2s[4] = b2i[0] * pb->area.x0 + b2i[2] * pb->area.y0 + b2i[4];
- d2s[5] = b2i[1] * pb->area.x0 + b2i[3] * pb->area.y0 + b2i[5];
+ d2s[0] = b2i[0];
+ d2s[1] = b2i[1];
+ d2s[2] = b2i[2];
+ d2s[3] = b2i[3];
+ d2s[4] = b2i[0] * pb->area.x0 + b2i[2] * pb->area.y0 + b2i[4];
+ d2s[5] = b2i[1] * pb->area.x0 + b2i[3] * pb->area.y0 + b2i[5];
- if (!outline) {
+ if (!outline) {
- if (!image->px) return item->state;
+ if (!image->px) return item->state;
- guint32 Falpha = item->opacity;
- if (Falpha < 1) return item->state;
+ guint32 Falpha = item->opacity;
+ if (Falpha < 1) return item->state;
- unsigned char * dpx = NR_PIXBLOCK_PX (pb);
- int const drs = pb->rs;
- int const dw = pb->area.x1 - pb->area.x0;
- int const dh = pb->area.y1 - pb->area.y0;
+ unsigned char * dpx = NR_PIXBLOCK_PX (pb);
+ int const drs = pb->rs;
+ int const dw = pb->area.x1 - pb->area.x0;
+ int const dh = pb->area.y1 - pb->area.y0;
- unsigned char * spx = image->px;
- int const srs = image->pxrs;
- int const sw = image->pxw;
- int const sh = image->pxh;
+ unsigned char * spx = image->px;
+ int const srs = image->pxrs;
+ int const sw = image->pxw;
+ int const sh = image->pxh;
- if (pb->mode == NR_PIXBLOCK_MODE_R8G8B8) {
- /* fixme: This is not implemented yet (Lauris) */
- /* nr_R8G8B8_R8G8B8_R8G8B8A8_N_TRANSFORM (dpx, dw, dh, drs, spx, sw, sh, srs, d2s, Falpha, nr_arena_image_x_sample, nr_arena_image_y_sample); */
- } else if (pb->mode == NR_PIXBLOCK_MODE_R8G8B8A8P) {
- nr_R8G8B8A8_P_R8G8B8A8_P_R8G8B8A8_N_TRANSFORM (dpx, dw, dh, drs, spx, sw, sh, srs, d2s, Falpha, nr_arena_image_x_sample, nr_arena_image_y_sample);
- } else if (pb->mode == NR_PIXBLOCK_MODE_R8G8B8A8N) {
+ if (pb->mode == NR_PIXBLOCK_MODE_R8G8B8) {
+ /* fixme: This is not implemented yet (Lauris) */
+ /* nr_R8G8B8_R8G8B8_R8G8B8A8_N_TRANSFORM (dpx, dw, dh, drs, spx, sw, sh, srs, d2s, Falpha, nr_arena_image_x_sample, nr_arena_image_y_sample); */
+ } else if (pb->mode == NR_PIXBLOCK_MODE_R8G8B8A8P) {
+ nr_R8G8B8A8_P_R8G8B8A8_P_R8G8B8A8_N_TRANSFORM (dpx, dw, dh, drs, spx, sw, sh, srs, d2s, Falpha, nr_arena_image_x_sample, nr_arena_image_y_sample);
+ } else if (pb->mode == NR_PIXBLOCK_MODE_R8G8B8A8N) {
- //FIXME: The _N_N_N_ version gives a gray border around images, see bug 906376
- // This mode is only used when exporting, screen rendering always has _P_P_P_, so I decided to simply replace it for now
- // Feel free to propose a better fix
+ //FIXME: The _N_N_N_ version gives a gray border around images, see bug 906376
+ // This mode is only used when exporting, screen rendering always has _P_P_P_, so I decided to simply replace it for now
+ // Feel free to propose a better fix
- //nr_R8G8B8A8_N_R8G8B8A8_N_R8G8B8A8_N_TRANSFORM (dpx, dw, dh, drs, spx, sw, sh, srs, d2s, Falpha, nr_arena_image_x_sample, nr_arena_image_y_sample);
- nr_R8G8B8A8_P_R8G8B8A8_P_R8G8B8A8_N_TRANSFORM (dpx, dw, dh, drs, spx, sw, sh, srs, d2s, Falpha, nr_arena_image_x_sample, nr_arena_image_y_sample);
- }
+ //nr_R8G8B8A8_N_R8G8B8A8_N_R8G8B8A8_N_TRANSFORM (dpx, dw, dh, drs, spx, sw, sh, srs, d2s, Falpha, nr_arena_image_x_sample, nr_arena_image_y_sample);
+ nr_R8G8B8A8_P_R8G8B8A8_P_R8G8B8A8_N_TRANSFORM (dpx, dw, dh, drs, spx, sw, sh, srs, d2s, Falpha, nr_arena_image_x_sample, nr_arena_image_y_sample);
+ }
- pb->empty = FALSE;
+ pb->empty = FALSE;
- } else { // outline; draw a rect instead
+ } else { // outline; draw a rect instead
- if (!ct)
- return item->state;
+ if (!ct)
+ return item->state;
- guint32 rgba = prefs_get_int_attribute("options.wireframecolors", "images", 0xff0000ff);
- // FIXME: we use RGBA buffers but cairo writes BGRA (on i386), so we must cheat
- // by setting color channels in the "wrong" order
- cairo_set_source_rgba(ct, SP_RGBA32_B_F(rgba), SP_RGBA32_G_F(rgba), SP_RGBA32_R_F(rgba), SP_RGBA32_A_F(rgba));
+ guint32 rgba = prefs->getInt("/options/wireframecolors/images", 0xff0000ff);
+ // FIXME: we use RGBA buffers but cairo writes BGRA (on i386), so we must cheat
+ // by setting color channels in the "wrong" order
+ cairo_set_source_rgba(ct, SP_RGBA32_B_F(rgba), SP_RGBA32_G_F(rgba), SP_RGBA32_R_F(rgba), SP_RGBA32_A_F(rgba));
- cairo_set_line_width(ct, 0.5);
- cairo_new_path(ct);
+ cairo_set_line_width(ct, 0.5);
+ cairo_new_path(ct);
- NR::Point shift(pb->area.x0, pb->area.y0);
- NR::Point c00 = image->c00 - shift;
- NR::Point c01 = image->c01 - shift;
- NR::Point c11 = image->c11 - shift;
- NR::Point c10 = image->c10 - shift;
+ Geom::Point shift(pb->area.x0, pb->area.y0);
+ Geom::Point c00 = image->c00 - shift;
+ Geom::Point c01 = image->c01 - shift;
+ Geom::Point c11 = image->c11 - shift;
+ Geom::Point c10 = image->c10 - shift;
- cairo_move_to (ct, c00[NR::X], c00[NR::Y]);
+ cairo_move_to (ct, c00[Geom::X], c00[Geom::Y]);
- // the box
- cairo_line_to (ct, c10[NR::X], c10[NR::Y]);
- cairo_line_to (ct, c11[NR::X], c11[NR::Y]);
- cairo_line_to (ct, c01[NR::X], c01[NR::Y]);
- cairo_line_to (ct, c00[NR::X], c00[NR::Y]);
- // the diagonals
- cairo_line_to (ct, c11[NR::X], c11[NR::Y]);
- cairo_move_to (ct, c10[NR::X], c10[NR::Y]);
- cairo_line_to (ct, c01[NR::X], c01[NR::Y]);
+ // the box
+ cairo_line_to (ct, c10[Geom::X], c10[Geom::Y]);
+ cairo_line_to (ct, c11[Geom::X], c11[Geom::Y]);
+ cairo_line_to (ct, c01[Geom::X], c01[Geom::Y]);
+ cairo_line_to (ct, c00[Geom::X], c00[Geom::Y]);
+ // the diagonals
+ cairo_line_to (ct, c11[Geom::X], c11[Geom::Y]);
+ cairo_move_to (ct, c10[Geom::X], c10[Geom::Y]);
+ cairo_line_to (ct, c01[Geom::X], c01[Geom::Y]);
- cairo_stroke(ct);
+ cairo_stroke(ct);
- pb->empty = FALSE;
- }
+ pb->empty = FALSE;
+ }
- return item->state;
+ return item->state;
}
/** Calculates the closest distance from p to the segment a1-a2*/
-double
-distance_to_segment (NR::Point p, NR::Point a1, NR::Point a2)
+double
+distance_to_segment (Geom::Point p, Geom::Point a1, Geom::Point a2)
{
- // calculate sides of the triangle and their squares
- double d1 = NR::L2(p - a1);
- double d1_2 = d1 * d1;
- double d2 = NR::L2(p - a2);
- double d2_2 = d2 * d2;
- double a = NR::L2(a1 - a2);
- double a_2 = a * a;
-
- // if one of the angles at the base is > 90, return the corresponding side
- if (d1_2 + a_2 <= d2_2) return d1;
- if (d2_2 + a_2 <= d1_2) return d2;
-
- // otherwise calculate the height to the base
- double peri = (a + d1 + d2)/2;
- return (2*sqrt(peri * (peri - a) * (peri - d1) * (peri - d2))/a);
+ // calculate sides of the triangle and their squares
+ double d1 = Geom::L2(p - a1);
+ double d1_2 = d1 * d1;
+ double d2 = Geom::L2(p - a2);
+ double d2_2 = d2 * d2;
+ double a = Geom::L2(a1 - a2);
+ double a_2 = a * a;
+
+ // if one of the angles at the base is > 90, return the corresponding side
+ if (d1_2 + a_2 <= d2_2) return d1;
+ if (d2_2 + a_2 <= d1_2) return d2;
+
+ // otherwise calculate the height to the base
+ double peri = (a + d1 + d2)/2;
+ return (2*sqrt(peri * (peri - a) * (peri - d1) * (peri - d2))/a);
}
static NRArenaItem *
-nr_arena_image_pick (NRArenaItem *item, NR::Point p, double delta, unsigned int sticky)
+nr_arena_image_pick( NRArenaItem *item, Geom::Point p, double delta, unsigned int /*sticky*/ )
{
- NRArenaImage *image = NR_ARENA_IMAGE (item);
+ NRArenaImage *image = NR_ARENA_IMAGE (item);
- if (!image->px) return NULL;
+ if (!image->px) return NULL;
- bool outline = (item->arena->rendermode == RENDERMODE_OUTLINE);
+ bool outline = (item->arena->rendermode == Inkscape::RENDERMODE_OUTLINE);
- if (outline) {
+ if (outline) {
- // frame
- if (distance_to_segment (p, image->c00, image->c10) < delta) return item;
- if (distance_to_segment (p, image->c10, image->c11) < delta) return item;
- if (distance_to_segment (p, image->c11, image->c01) < delta) return item;
- if (distance_to_segment (p, image->c01, image->c00) < delta) return item;
+ // frame
+ if (distance_to_segment (p, image->c00, image->c10) < delta) return item;
+ if (distance_to_segment (p, image->c10, image->c11) < delta) return item;
+ if (distance_to_segment (p, image->c11, image->c01) < delta) return item;
+ if (distance_to_segment (p, image->c01, image->c00) < delta) return item;
- // diagonals
- if (distance_to_segment (p, image->c00, image->c11) < delta) return item;
- if (distance_to_segment (p, image->c10, image->c01) < delta) return item;
+ // diagonals
+ if (distance_to_segment (p, image->c00, image->c11) < delta) return item;
+ if (distance_to_segment (p, image->c10, image->c01) < delta) return item;
- return NULL;
+ return NULL;
- } else {
+ } else {
- unsigned char *const pixels = image->px;
- int const width = image->pxw;
- int const height = image->pxh;
- int const rowstride = image->pxrs;
- NR::Point tp = p * image->grid2px;
- int const ix = (int)(tp[NR::X]);
- int const iy = (int)(tp[NR::Y]);
+ unsigned char *const pixels = image->px;
+ int const width = image->pxw;
+ int const height = image->pxh;
+ int const rowstride = image->pxrs;
+ Geom::Point tp = p * image->grid2px;
+ int const ix = (int)(tp[Geom::X]);
+ int const iy = (int)(tp[Geom::Y]);
- if ((ix < 0) || (iy < 0) || (ix >= width) || (iy >= height))
- return NULL;
+ if ((ix < 0) || (iy < 0) || (ix >= width) || (iy >= height))
+ return NULL;
- unsigned char *pix_ptr = pixels + iy * rowstride + ix * 4;
- // is the alpha not transparent?
- return (pix_ptr[3] > 0) ? item : NULL;
- }
+ unsigned char *pix_ptr = pixels + iy * rowstride + ix * 4;
+ // is the alpha not transparent?
+ return (pix_ptr[3] > 0) ? item : NULL;
+ }
}
/* Utility */
@@ -334,29 +329,29 @@ nr_arena_image_pick (NRArenaItem *item, NR::Point p, double delta, unsigned int
void
nr_arena_image_set_pixels (NRArenaImage *image, unsigned char const *px, unsigned int pxw, unsigned int pxh, unsigned int pxrs)
{
- nr_return_if_fail (image != NULL);
- nr_return_if_fail (NR_IS_ARENA_IMAGE (image));
+ nr_return_if_fail (image != NULL);
+ nr_return_if_fail (NR_IS_ARENA_IMAGE (image));
- image->px = (unsigned char *) px;
- image->pxw = pxw;
- image->pxh = pxh;
- image->pxrs = pxrs;
+ image->px = (unsigned char *) px;
+ image->pxw = pxw;
+ image->pxh = pxh;
+ image->pxrs = pxrs;
- nr_arena_item_request_update (NR_ARENA_ITEM (image), NR_ARENA_ITEM_STATE_ALL, FALSE);
+ nr_arena_item_request_update (NR_ARENA_ITEM (image), NR_ARENA_ITEM_STATE_ALL, FALSE);
}
void
nr_arena_image_set_geometry (NRArenaImage *image, double x, double y, double width, double height)
{
- nr_return_if_fail (image != NULL);
- nr_return_if_fail (NR_IS_ARENA_IMAGE (image));
+ nr_return_if_fail (image != NULL);
+ nr_return_if_fail (NR_IS_ARENA_IMAGE (image));
- image->x = x;
- image->y = y;
- image->width = width;
- image->height = height;
+ image->x = x;
+ image->y = y;
+ image->width = width;
+ image->height = height;
- nr_arena_item_request_update (NR_ARENA_ITEM (image), NR_ARENA_ITEM_STATE_ALL, FALSE);
+ nr_arena_item_request_update (NR_ARENA_ITEM (image), NR_ARENA_ITEM_STATE_ALL, FALSE);
}
void nr_arena_image_set_style (NRArenaImage *image, SPStyle *style)
if (style->filter.set && style->getFilter()) {
if (!image->filter) {
int primitives = sp_filter_primitive_count(SP_FILTER(style->getFilter()));
- image->filter = new NR::Filter(primitives);
+ image->filter = new Inkscape::Filters::Filter(primitives);
}
sp_filter_build_renderer(SP_FILTER(style->getFilter()), image->filter);
} else {
&& style->enable_background.value == SP_CSS_BACKGROUND_NEW) {
image->background_new = true;
}
+
+ nr_arena_item_request_update(image, NR_ARENA_ITEM_STATE_ALL, FALSE);
}
+
/*
Local Variables:
mode:c++