Merge with e190c52ab7861c68762aaa552f3dc0f59fe2e225 from default
This revision compiles and runs on Win7x64- but further evaluation is necessary. There may be an issue with cmake step -After cmake I had to copy rtgui/version.h & config.h into out of source build /rtgui folder. Additional notes: - ImProcFunctions::hsv2rgb01 -> this likely need to be added to color.h & color.cc - Use of array2D should be verified in NR code - compilation warning for rtengine::RawImageSource::isWBProviderReady()
This commit is contained in:
@@ -121,7 +121,7 @@ void PopUpCommon::entrySelected (int i) {
|
||||
* Set the button image with the selected item
|
||||
*/
|
||||
bool PopUpCommon::setSelected (int entryNum) {
|
||||
if (entryNum < 0 || entryNum > (int)images.size()-1 || (int)entryNum == selected)
|
||||
if (entryNum < 0 || entryNum > ((int)images.size()-1) || (int)entryNum == selected)
|
||||
return false;
|
||||
else {
|
||||
// Maybe we could do something better than loading the image file each time the selection is changed !?
|
||||
|
Reference in New Issue
Block a user