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:
michael
2012-07-03 23:15:07 -04:00
parent 78d4f80875
commit 3a4100e710
374 changed files with 47381 additions and 39387 deletions

View File

@@ -209,7 +209,7 @@ void DirBrowser::row_expanded (const Gtk::TreeModel::iterator& iter, const Gtk::
else {
std::sort (subDirs.begin(), subDirs.end());
for (int i=0; i<subDirs.size(); i++)
for (size_t i=0; i<subDirs.size(); i++)
addDir (iter, subDirs[i]);
for (int i=0; i<todel; i++)
@@ -273,7 +273,7 @@ void DirBrowser::row_activated (const Gtk::TreeModel::Path& path, Gtk::TreeViewC
Glib::ustring dname = dirTreeModel->get_iter (path)->get_value (dtColumns.dirname);
if (safe_file_test (dname, Glib::FILE_TEST_IS_DIR))
for (int i=0; i<dllisteners.size(); i++)
for (size_t i=0; i<dllisteners.size(); i++)
dllisteners[i]->dirSelected (dname);
}
@@ -344,7 +344,7 @@ void DirBrowser::open (const Glib::ustring& dirname, const Glib::ustring& fileNa
Gtk::TreePath path = expandToDir (absDirPath);
dirtree->scroll_to_row (path);
dirtree->get_selection()->select (path);
for (int i=0; i<dllisteners.size(); i++)
for (size_t i=0; i<dllisteners.size(); i++)
dllisteners[i]->dirSelected (absDirPath, Glib::build_filename (absDirPath, fileName));
}