liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge master into gtk3

Browse Source
This commit is contained in:
heckflosse
2016-10-28 17:59:47 +02:00
parent 5244c44420 3a346d919d
commit b16ef8d1f5
259 changed files with 5061 additions and 3654 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/toolpanelcoord.h
View File

@@ -230,7 +230,7 @@ public:
void panelChanged (rtengine::ProcEvent event, const Glib::ustring& descr);
// profilechangelistener interface
void profileChange (const rtengine::procparams::PartialProfile* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited = NULL);
void profileChange (const rtengine::procparams::PartialProfile* nparams, rtengine::ProcEvent event, const Glib::ustring& descr, const ParamsEdited* paramsEdited = nullptr);
void setDefaults (rtengine::procparams::ProcParams* defparams);
// DirSelectionListener interface
@@ -287,15 +287,15 @@ public:
void saveInputICCReference (Glib::ustring fname, bool apply_wb);
// imageareatoollistener interface
void spotWBselected (int x, int y, Thumbnail* thm = NULL);
void spotWBselected (int x, int y, Thumbnail* thm = nullptr);
void cropSelectionReady ();
void rotateSelectionReady (double rotate_deg, Thumbnail* thm = NULL);
void rotateSelectionReady (double rotate_deg, Thumbnail* thm = nullptr);
ToolBar* getToolBar ()
{
return toolBar;
}
int getSpotWBRectSize ();
CropGUIListener* startCropEditing (Thumbnail* thm = NULL)
CropGUIListener* startCropEditing (Thumbnail* thm = nullptr)
{
return crop;
}