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:
@@ -168,7 +168,7 @@ int createpixbufs (void* data) {
|
||||
|
||||
GThreadLock lock;
|
||||
|
||||
CropHandlerIdleHelper* chi = (CropHandlerIdleHelper*) data;
|
||||
CropHandlerIdleHelper* chi = static_cast<CropHandlerIdleHelper*>(data);
|
||||
if (chi->destroyed) {
|
||||
if (chi->pending == 1)
|
||||
delete chi;
|
||||
@@ -333,6 +333,15 @@ void CropHandler::getSize (int& w, int& h) {
|
||||
h = cropH;
|
||||
}
|
||||
|
||||
void CropHandler::getFullImageSize (int& w, int& h) {
|
||||
if (ipc) {
|
||||
w = ipc->getFullWidth ();
|
||||
h = ipc->getFullHeight ();
|
||||
} else {
|
||||
w=h=0;
|
||||
}
|
||||
}
|
||||
|
||||
void CropHandler::compDim () {
|
||||
|
||||
cropX = cx;
|
||||
|
Reference in New Issue
Block a user