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

@@ -128,7 +128,7 @@ void ThumbBrowserEntryBase::updateBackBuffer () {
if (!bbIcons.empty()) {
int iwidth = igap;
int iheight = 0;
for (int i=0; i<bbIcons.size(); i++) {
for (size_t i=0; i<bbIcons.size(); i++) {
iwidth += bbIcons[i]->get_width() + igap;
if (bbIcons[i]->get_height() > iheight)
iheight = bbIcons[i]->get_height();
@@ -140,7 +140,7 @@ void ThumbBrowserEntryBase::updateBackBuffer () {
cr->set_source_rgba (0, 0, 0, 0.75);
cr->fill ();
}
for (int i=0; i<bbIcons.size(); i++) {
for (size_t i=0; i<bbIcons.size(); i++) {
backBuffer->draw_pixbuf (gc_, bbIcons[i], 0, 0, istartx, istarty, bbIcons[i]->get_width(), bbIcons[i]->get_height(), Gdk::RGB_DITHER_NONE, 0, 0);
istartx += bbIcons[i]->get_width() + igap;
}