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()

rtengine/imagedata.h

@@ -40,7 +40,8 @@ class ImageData : public ImageMetaData {
     time_t timeStamp;
     int iso_speed;
     double aperture;
-    double focal_len;
+    double focal_len, focal_len35mm;
+    float focus_dist;  // dist: 0=unknown, 10000=infinity
     double shutter;
     double expcomp;
     std::string make, model, serial;
@@ -65,6 +66,8 @@ class ImageData : public ImageMetaData {
     int         getISOSpeed () const { return iso_speed; }
     double      getFNumber  () const { return aperture;  }
     double      getFocalLen () const { return focal_len;   }
+    double      getFocalLen35mm () const { return focal_len35mm;   }
+    float       getFocusDist () const { return focus_dist; }
     double      getShutterSpeed () const { return shutter;   }
     double      getExpComp  () const { return expcomp;   }
     std::string getMake     () const { return make;      }
@@ -73,5 +76,5 @@ class ImageData : public ImageMetaData {
     std::string getSerialNumber () const { return serial;}
     std::string getOrientation () const { return orientation; }
 };
-};
+}
 #endif