Mercurial > hg > svgui
comparison layer/SingleColourLayer.cpp @ 810:b68af2be4545 tonioni
Merge from branch warnfix_no_size_t
author | Chris Cannam |
---|---|
date | Wed, 18 Jun 2014 13:42:25 +0100 |
parents | 1d526ba11a24 |
children | a5488775f880 |
comparison
equal
deleted
inserted
replaced
802:584b11df8e4f | 810:b68af2be4545 |
---|---|
113 SingleColourLayer::getPropertyValueLabel(const PropertyName &name, | 113 SingleColourLayer::getPropertyValueLabel(const PropertyName &name, |
114 int value) const | 114 int value) const |
115 { | 115 { |
116 if (name == "Colour") { | 116 if (name == "Colour") { |
117 ColourDatabase *db = ColourDatabase::getInstance(); | 117 ColourDatabase *db = ColourDatabase::getInstance(); |
118 if (value >= 0 && size_t(value) < db->getColourCount()) { | 118 if (value >= 0 && value < db->getColourCount()) { |
119 return db->getColourName(value); | 119 return db->getColourName(value); |
120 } | 120 } |
121 } | 121 } |
122 return tr("<unknown>"); | 122 return tr("<unknown>"); |
123 } | 123 } |