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

@@ -36,12 +36,12 @@ class RawProcess : public Gtk::VBox, public AdjusterListener, public FoldableToo
Gtk::VBox *ccOptions;
Adjuster* dcbIterations;
Gtk::CheckButton* dcbEnhance;
Gtk::VBox *allOptions;
Gtk::CheckButton* allEnhance;
//Gtk::VBox *allOptions;
//Gtk::CheckButton* allEnhance;
bool lastDCBen;
bool lastALLen;
sigc::connection methodconn,dcbEnhconn,allEnhconn;
//bool lastALLen;
sigc::connection methodconn,dcbEnhconn; //,allEnhconn;
public:
RawProcess ();
@@ -54,7 +54,7 @@ class RawProcess : public Gtk::VBox, public AdjusterListener, public FoldableToo
void methodChanged ();
void adjusterChanged (Adjuster* a, double newval);
void dcbEnhanceChanged();
void allEnhanceChanged();
//void allEnhanceChanged();
};