diff options
| author | bulia byak <buliabyak@gmail.com> | 2007-02-04 15:10:56 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2007-02-04 15:10:56 +0000 |
| commit | 9a2bcb294fb75bdfe1c4af93795ca874d1bbca87 (patch) | |
| tree | 89ff55dcc4e183fd5e6ac4be3e4276b7c6ac8989 /src/display/nr-arena.cpp | |
| parent | remove rudimental general-purpose clipart, add some Inkscape-related graphics... (diff) | |
| download | inkscape-9a2bcb294fb75bdfe1c4af93795ca874d1bbca87.tar.gz inkscape-9a2bcb294fb75bdfe1c4af93795ca874d1bbca87.zip | |
Unions Are Evil! When pixblock size is TINY, it stores data right in the data.px field (as data.p) and clears it, so when read as data.px it yields NULL. This fixes the problems with the dropper tool (which uses tiny buffers)
(bzr r2325)
Diffstat (limited to 'src/display/nr-arena.cpp')
| -rw-r--r-- | src/display/nr-arena.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/display/nr-arena.cpp b/src/display/nr-arena.cpp index ba845d1a2..e6d0105fb 100644 --- a/src/display/nr-arena.cpp +++ b/src/display/nr-arena.cpp @@ -111,7 +111,7 @@ nr_arena_render_paintserver_fill (NRPixBlock *pb, NRRectL *area, SPPainter *pain nr_pixblock_setup_fast (&cb_opa, NR_PIXBLOCK_MODE_R8G8B8A8N, area->x0, area->y0, area->x1, area->y1, TRUE); // if memory allocation failed, abort - if (cb.data.px == NULL || cb_opa.data.px == NULL) { + if ((cb.size != NR_PIXBLOCK_SIZE_TINY && cb.data.px == NULL) || (cb_opa.size != NR_PIXBLOCK_SIZE_TINY && cb_opa.data.px == NULL)) { return; } |