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:
@@ -19,6 +19,7 @@
|
||||
#ifndef _DARKFRAME_H_
|
||||
#define _DARKFRAME_H_
|
||||
|
||||
#include <auto_ptr.h>
|
||||
#include <gtkmm.h>
|
||||
#include "toolpanel.h"
|
||||
#include "../rtengine/rawimage.h"
|
||||
@@ -35,6 +36,7 @@ class DarkFrame : public Gtk::VBox, public FoldableToolPanel {
|
||||
protected:
|
||||
|
||||
MyFileChooserButton *darkFrameFile;
|
||||
std::auto_ptr<FileChooserLastFolderPersister> darkFrameFilePersister;
|
||||
Gtk::HBox *hbdf;
|
||||
Gtk::Button *btnReset;
|
||||
Gtk::Label *dfLabel;
|
||||
|
Reference in New Issue
Block a user