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:
@@ -49,7 +49,8 @@ class CacheImageData {
|
||||
bool exifValid;
|
||||
double fnumber;
|
||||
double shutter;
|
||||
double focalLen;
|
||||
double focalLen,focalLen35mm;
|
||||
float focusDist;
|
||||
unsigned iso;
|
||||
Glib::ustring lens;
|
||||
Glib::ustring camera;
|
||||
@@ -64,7 +65,7 @@ class CacheImageData {
|
||||
enum
|
||||
{
|
||||
FULL_THUMBNAIL = 0, // was the thumbnail generated from whole file
|
||||
QUICK_THUMBNAIL = 1, // was rhe thumbnail generated from embedded jpeg
|
||||
QUICK_THUMBNAIL = 1 // was rhe thumbnail generated from embedded jpeg
|
||||
};
|
||||
|
||||
CacheImageData ();
|
||||
|
Reference in New Issue
Block a user