diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2007-09-14 04:41:34 +0000 |
|---|---|---|
| committer | joncruz <joncruz@users.sourceforge.net> | 2007-09-14 04:41:34 +0000 |
| commit | ffe7d05327e21adc2d0ad254e23c1d2f08e9eb19 (patch) | |
| tree | d1083e7386000dfadd5c1429bf0463d159d52e5f /src | |
| parent | * Added email contact for msgid error (diff) | |
| download | inkscape-ffe7d05327e21adc2d0ad254e23c1d2f08e9eb19.tar.gz inkscape-ffe7d05327e21adc2d0ad254e23c1d2f08e9eb19.zip | |
Fixed min/max confusion bug
(bzr r3744)
Diffstat (limited to 'src')
| -rw-r--r-- | src/libnr/nr-object.h | 2 | ||||
| -rw-r--r-- | src/libnr/nr-rect.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libnr/nr-object.h b/src/libnr/nr-object.h index f39814b0d..269130284 100644 --- a/src/libnr/nr-object.h +++ b/src/libnr/nr-object.h @@ -91,7 +91,7 @@ private: NRObject(NRObject const &); // no copy void operator=(NRObject const &); // no assign - void *operator new(size_t size, void *placement) { return placement; } + void *operator new(size_t size, void *placement) { (void)size; return placement; } }; struct NRObjectClass { diff --git a/src/libnr/nr-rect.h b/src/libnr/nr-rect.h index 439538e29..fc4d617df 100644 --- a/src/libnr/nr-rect.h +++ b/src/libnr/nr-rect.h @@ -254,7 +254,7 @@ struct NRMatrix; struct NRRect { NRRect() {} NRRect(NR::Coord xmin, NR::Coord ymin, NR::Coord xmax, NR::Coord ymax) - : x0(xmin), y0(ymin), x1(xmin), y1(ymin) + : x0(xmin), y0(ymin), x1(xmax), y1(ymax) {} explicit NRRect(NR::Rect const &rect); explicit NRRect(NR::Maybe<NR::Rect> const &rect); |