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

@@ -29,7 +29,7 @@ PreviewHandler::PreviewHandler () : image(NULL) {
pih->phandler = this;
pih->destroyed = false;
pih->pending = 0;
};
}
PreviewHandler::~PreviewHandler () {
@@ -37,7 +37,7 @@ PreviewHandler::~PreviewHandler () {
pih->destroyed = true;
else
delete pih;
};
}
//----------------previewimagelistener functions--------------------
@@ -49,7 +49,7 @@ struct iaimgpar {
};
int setImageUI (void* data) {
iaimgpar* iap = (iaimgpar*)data;
iaimgpar* iap = static_cast<iaimgpar*>(data);
PreviewHandlerIdleHelper* pih = iap->pih;
if (pih->destroyed) {
@@ -95,7 +95,7 @@ void PreviewHandler::setImage (rtengine::IImage8* i, double scale, rtengine::pro
int delImageUI (void* data) {
iaimgpar* iap = (iaimgpar*)data;
iaimgpar* iap = static_cast<iaimgpar*>(data);
PreviewHandlerIdleHelper* pih = iap->pih;
if (pih->destroyed) {
@@ -138,7 +138,7 @@ void PreviewHandler::delImage (IImage8* i) {
int imageReadyUI (void* data) {
iaimgpar* iap = (iaimgpar*)data;
iaimgpar* iap = static_cast<iaimgpar*>(data);
PreviewHandlerIdleHelper* pih = iap->pih;
if (pih->destroyed) {