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:
@@ -371,7 +371,7 @@ int histrgbupdate (void* data) {
|
||||
|
||||
gdk_threads_enter ();
|
||||
|
||||
HistogramRGBAreaIdleHelper* harih = (HistogramRGBAreaIdleHelper*)data;
|
||||
HistogramRGBAreaIdleHelper* harih = static_cast<HistogramRGBAreaIdleHelper*>(data);
|
||||
|
||||
if (harih->destroyed) {
|
||||
if (harih->pending == 1)
|
||||
@@ -533,7 +533,7 @@ void HistogramArea::updateOptions (bool r, bool g, bool b, bool l, bool raw) {
|
||||
|
||||
int histupdateUI (void* data) {
|
||||
|
||||
HistogramAreaIdleHelper* haih = (HistogramAreaIdleHelper*)data;
|
||||
HistogramAreaIdleHelper* haih = static_cast<HistogramAreaIdleHelper*>(data);
|
||||
|
||||
if (haih->destroyed) {
|
||||
if (haih->pending == 1)
|
||||
|
Reference in New Issue
Block a user