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:
@@ -300,19 +300,19 @@ ExifFilterSettings FilterPanel::getFilter () {
|
||||
efs.filterFiletype = enaFiletype->get_active ();
|
||||
|
||||
std::vector<int> sel = camera->get_selected ();
|
||||
for (int i=0; i<sel.size(); i++)
|
||||
for (size_t i=0; i<sel.size(); i++)
|
||||
efs.cameras.insert (camera->get_text (sel[i]));
|
||||
|
||||
sel = expcomp->get_selected ();
|
||||
for (int i=0; i<sel.size(); i++)
|
||||
for (size_t i=0; i<sel.size(); i++)
|
||||
efs.expcomp.insert (expcomp->get_text (sel[i]));
|
||||
|
||||
sel = lens->get_selected ();
|
||||
for (int i=0; i<sel.size(); i++)
|
||||
for (size_t i=0; i<sel.size(); i++)
|
||||
efs.lenses.insert (lens->get_text (sel[i]));
|
||||
|
||||
sel = filetype->get_selected ();
|
||||
for (int i=0; i<sel.size(); i++)
|
||||
for (size_t i=0; i<sel.size(); i++)
|
||||
efs.filetypes.insert (filetype->get_text (sel[i]));
|
||||
|
||||
return efs;
|
||||
|
Reference in New Issue
Block a user