diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2014-02-25 09:23:36 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2014-02-25 09:23:36 +0000 |
| commit | 63ea2ee830a7e94007c59724e736af8b32c14cf9 (patch) | |
| tree | 1c5aba4b6a65042d7fb0d4051385620600562bcc /src/util/units.cpp | |
| parent | update to trunk (diff) | |
| parent | Move filter reordering closer to the layers.cpp patern of reordering xml (diff) | |
| download | inkscape-63ea2ee830a7e94007c59724e736af8b32c14cf9.tar.gz inkscape-63ea2ee830a7e94007c59724e736af8b32c14cf9.zip | |
update to trunk
(bzr r11950.1.256)
Diffstat (limited to 'src/util/units.cpp')
| -rw-r--r-- | src/util/units.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/util/units.cpp b/src/util/units.cpp index 40cce028d..d2053f60b 100644 --- a/src/util/units.cpp +++ b/src/util/units.cpp @@ -505,16 +505,23 @@ double Quantity::convert(double from_dist, char const *from, char const *to) return convert(from_dist, unit_table.getUnit(from), unit_table.getUnit(to)); } -bool Quantity::operator<(Quantity const &other) const +bool Quantity::operator<(Quantity const &rhs) const { - if (unit->type != other.unit->type) { + if (unit->type != rhs.unit->type) { g_warning("Incompatible units"); return false; } - return quantity < other.value(unit); + return quantity < rhs.value(unit); } bool Quantity::operator==(Quantity const &other) const { + /** \fixme This is overly strict. I think we should change this to: + if (unit->type != other.unit->type) { + g_warning("Incompatible units"); + return false; + } + return are_near(quantity, other.value(unit)); + */ return (*unit == *other.unit) && (quantity == other.quantity); } |