more final fixes
This commit is contained in:
parent
9a4ade6f20
commit
0d2ffb5e61
@ -14,7 +14,7 @@ struct camera_const_levels {
|
|||||||
int levels[4];
|
int levels[4];
|
||||||
};
|
};
|
||||||
|
|
||||||
class CameraConst
|
class CameraConst final
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
std::string make_model;
|
std::string make_model;
|
||||||
@ -56,7 +56,7 @@ public:
|
|||||||
void update_globalGreenEquilibration(bool other);
|
void update_globalGreenEquilibration(bool other);
|
||||||
};
|
};
|
||||||
|
|
||||||
class CameraConstantsStore
|
class CameraConstantsStore final
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
std::map<std::string, CameraConst *> mCameraConstants;
|
std::map<std::string, CameraConst *> mCameraConstants;
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
namespace rtengine
|
namespace rtengine
|
||||||
{
|
{
|
||||||
|
|
||||||
class CieImage :
|
class CieImage final :
|
||||||
public NonCopyable
|
public NonCopyable
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
|
@ -35,7 +35,7 @@ using namespace procparams;
|
|||||||
|
|
||||||
class ImProcCoordinator;
|
class ImProcCoordinator;
|
||||||
|
|
||||||
class Crop : public DetailedCrop, public PipetteBuffer
|
class Crop final : public DetailedCrop, public PipetteBuffer
|
||||||
{
|
{
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
@ -31,7 +31,7 @@ namespace rtengine
|
|||||||
{
|
{
|
||||||
|
|
||||||
class RawImage;
|
class RawImage;
|
||||||
class dfInfo
|
class dfInfo final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@ -74,7 +74,7 @@ protected:
|
|||||||
void updateRawImage();
|
void updateRawImage();
|
||||||
};
|
};
|
||||||
|
|
||||||
class DFManager
|
class DFManager final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void init(const Glib::ustring &pathname);
|
void init(const Glib::ustring &pathname);
|
||||||
|
@ -29,7 +29,7 @@ namespace rtengine
|
|||||||
{
|
{
|
||||||
|
|
||||||
class RawImage;
|
class RawImage;
|
||||||
class ffInfo
|
class ffInfo final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
@ -71,7 +71,7 @@ protected:
|
|||||||
void updateRawImage();
|
void updateRawImage();
|
||||||
};
|
};
|
||||||
|
|
||||||
class FFManager
|
class FFManager final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
void init(const Glib::ustring &pathname);
|
void init(const Glib::ustring &pathname);
|
||||||
|
@ -39,7 +39,7 @@ namespace procparams
|
|||||||
|
|
||||||
typedef const double(*TMatrix)[3];
|
typedef const double(*TMatrix)[3];
|
||||||
|
|
||||||
class ProfileContent
|
class ProfileContent final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ProfileContent();
|
ProfileContent();
|
||||||
@ -54,7 +54,7 @@ private:
|
|||||||
std::string data;
|
std::string data;
|
||||||
};
|
};
|
||||||
|
|
||||||
class ICCStore
|
class ICCStore final
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
enum class ProfileType {
|
enum class ProfileType {
|
||||||
|
@ -658,7 +658,7 @@ public:
|
|||||||
|
|
||||||
/* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed
|
/* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed
|
||||||
* Can be safely used to reallocate an existing image */
|
* Can be safely used to reallocate an existing image */
|
||||||
void allocate (int W, int H) override final
|
void allocate (int W, int H) final
|
||||||
{
|
{
|
||||||
|
|
||||||
if (W == width && H == height) {
|
if (W == width && H == height) {
|
||||||
@ -746,7 +746,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void rotate (int deg) override final
|
void rotate (int deg) final
|
||||||
{
|
{
|
||||||
|
|
||||||
if (deg == 90) {
|
if (deg == 90) {
|
||||||
@ -873,7 +873,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void hflip () override final
|
void hflip () final
|
||||||
{
|
{
|
||||||
int width2 = width / 2;
|
int width2 = width / 2;
|
||||||
|
|
||||||
@ -905,7 +905,7 @@ public:
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void vflip () override final
|
void vflip () final
|
||||||
{
|
{
|
||||||
|
|
||||||
int height2 = height / 2;
|
int height2 = height / 2;
|
||||||
@ -989,7 +989,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override final
|
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const final
|
||||||
{
|
{
|
||||||
histogram.clear();
|
histogram.clear();
|
||||||
avg_r = avg_g = avg_b = 0.;
|
avg_r = avg_g = avg_b = 0.;
|
||||||
@ -1328,7 +1328,7 @@ public:
|
|||||||
* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed
|
* If any of the required allocation fails, "width" and "height" are set to -1, and all remaining buffer are freed
|
||||||
* Can be safely used to reallocate an existing image or to free up it's memory with "allocate (0,0);"
|
* Can be safely used to reallocate an existing image or to free up it's memory with "allocate (0,0);"
|
||||||
*/
|
*/
|
||||||
void allocate (int W, int H) override final
|
void allocate (int W, int H) final
|
||||||
{
|
{
|
||||||
|
|
||||||
if (W == width && H == height) {
|
if (W == width && H == height) {
|
||||||
@ -1382,7 +1382,7 @@ public:
|
|||||||
memcpy (dest->data, data, 3 * width * height * sizeof(T));
|
memcpy (dest->data, data, 3 * width * height * sizeof(T));
|
||||||
}
|
}
|
||||||
|
|
||||||
void rotate (int deg) override final
|
void rotate (int deg) final
|
||||||
{
|
{
|
||||||
|
|
||||||
if (deg == 90) {
|
if (deg == 90) {
|
||||||
@ -1516,7 +1516,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void hflip () override final
|
void hflip () final
|
||||||
{
|
{
|
||||||
int width2 = width / 2;
|
int width2 = width / 2;
|
||||||
|
|
||||||
@ -1552,7 +1552,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void vflip () override final
|
void vflip () final
|
||||||
{
|
{
|
||||||
|
|
||||||
AlignedBuffer<T> lBuffer(3 * width);
|
AlignedBuffer<T> lBuffer(3 * width);
|
||||||
@ -1619,7 +1619,7 @@ public:
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const override final
|
void computeHistogramAutoWB (double &avg_r, double &avg_g, double &avg_b, int &n, LUTu &histogram, const int compression) const final
|
||||||
{
|
{
|
||||||
histogram.clear();
|
histogram.clear();
|
||||||
avg_r = avg_g = avg_b = 0.;
|
avg_r = avg_g = avg_b = 0.;
|
||||||
|
@ -143,11 +143,11 @@ public:
|
|||||||
|
|
||||||
virtual void setProgressListener (ProgressListener* pl) {}
|
virtual void setProgressListener (ProgressListener* pl) {}
|
||||||
|
|
||||||
void increaseRef () override final
|
void increaseRef () final
|
||||||
{
|
{
|
||||||
references++;
|
references++;
|
||||||
}
|
}
|
||||||
void decreaseRef () override final
|
void decreaseRef () final
|
||||||
{
|
{
|
||||||
references--;
|
references--;
|
||||||
|
|
||||||
@ -175,15 +175,15 @@ public:
|
|||||||
return dirpyrdenoiseExpComp;
|
return dirpyrdenoiseExpComp;
|
||||||
}
|
}
|
||||||
// functions inherited from the InitialImage interface
|
// functions inherited from the InitialImage interface
|
||||||
Glib::ustring getFileName () override final
|
Glib::ustring getFileName () final
|
||||||
{
|
{
|
||||||
return fileName;
|
return fileName;
|
||||||
}
|
}
|
||||||
cmsHPROFILE getEmbeddedProfile () override final
|
cmsHPROFILE getEmbeddedProfile () final
|
||||||
{
|
{
|
||||||
return embProfile;
|
return embProfile;
|
||||||
}
|
}
|
||||||
const FramesMetaData* getMetaData () override final
|
const FramesMetaData* getMetaData () final
|
||||||
{
|
{
|
||||||
return idata;
|
return idata;
|
||||||
}
|
}
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
namespace rtengine
|
namespace rtengine
|
||||||
{
|
{
|
||||||
|
|
||||||
class LabImage
|
class LabImage final
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
void allocLab(size_t w, size_t h);
|
void allocLab(size_t w, size_t h);
|
||||||
|
@ -113,10 +113,10 @@ protected:
|
|||||||
void updateBackBuffer();
|
void updateBackBuffer();
|
||||||
|
|
||||||
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
|
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
|
||||||
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const override final;
|
void get_preferred_height_vfunc (int& minimum_height, int& natural_height) const final;
|
||||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override final;
|
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const final;
|
||||||
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override final;
|
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const final;
|
||||||
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override final;
|
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const final;
|
||||||
void on_realize () override;
|
void on_realize () override;
|
||||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
||||||
bool on_button_press_event (GdkEventButton* event) override;
|
bool on_button_press_event (GdkEventButton* event) override;
|
||||||
|
@ -60,10 +60,10 @@ class ThumbBrowserBase :
|
|||||||
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
bool on_draw(const ::Cairo::RefPtr< Cairo::Context> &cr) override;
|
||||||
|
|
||||||
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
|
Gtk::SizeRequestMode get_request_mode_vfunc () const override;
|
||||||
void get_preferred_height_vfunc (int &minimum_height, int &natural_height) const override final;
|
void get_preferred_height_vfunc (int &minimum_height, int &natural_height) const final;
|
||||||
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const override final;
|
void get_preferred_width_vfunc (int &minimum_width, int &natural_width) const final;
|
||||||
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const override final;
|
void get_preferred_height_for_width_vfunc (int width, int &minimum_height, int &natural_height) const final;
|
||||||
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const override final;
|
void get_preferred_width_for_height_vfunc (int height, int &minimum_width, int &natural_width) const final;
|
||||||
|
|
||||||
bool on_button_press_event (GdkEventButton* event) override;
|
bool on_button_press_event (GdkEventButton* event) override;
|
||||||
bool on_button_release_event (GdkEventButton* event) override;
|
bool on_button_release_event (GdkEventButton* event) override;
|
||||||
|
@ -164,11 +164,11 @@ public:
|
|||||||
|
|
||||||
FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName, Glib::ustring UILabel, bool need11 = false, bool useEnabled = false);
|
FoldableToolPanel(Gtk::Box* content, Glib::ustring toolName, Glib::ustring UILabel, bool need11 = false, bool useEnabled = false);
|
||||||
|
|
||||||
MyExpander* getExpander() override final
|
MyExpander* getExpander() final
|
||||||
{
|
{
|
||||||
return exp;
|
return exp;
|
||||||
}
|
}
|
||||||
void setExpanded (bool expanded) override final
|
void setExpanded (bool expanded) final
|
||||||
{
|
{
|
||||||
if (exp) {
|
if (exp) {
|
||||||
exp->set_expanded( expanded );
|
exp->set_expanded( expanded );
|
||||||
@ -186,7 +186,7 @@ public:
|
|||||||
exp->show();
|
exp->show();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
bool getExpanded () override final
|
bool getExpanded () final
|
||||||
{
|
{
|
||||||
if (exp) {
|
if (exp) {
|
||||||
return exp->get_expanded();
|
return exp->get_expanded();
|
||||||
@ -194,11 +194,11 @@ public:
|
|||||||
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
void setParent (Gtk::Box* parent) override final
|
void setParent (Gtk::Box* parent) final
|
||||||
{
|
{
|
||||||
parentContainer = parent;
|
parentContainer = parent;
|
||||||
}
|
}
|
||||||
Gtk::Box* getParent () override final
|
Gtk::Box* getParent () final
|
||||||
{
|
{
|
||||||
return parentContainer;
|
return parentContainer;
|
||||||
}
|
}
|
||||||
|
@ -314,11 +314,11 @@ public:
|
|||||||
|
|
||||||
// imageareatoollistener interface
|
// imageareatoollistener interface
|
||||||
void spotWBselected(int x, int y, Thumbnail* thm = nullptr) override;
|
void spotWBselected(int x, int y, Thumbnail* thm = nullptr) override;
|
||||||
void sharpMaskSelected(bool sharpMask) override;
|
void sharpMaskSelected(bool sharpMask) override final;
|
||||||
int getSpotWBRectSize() const override;
|
int getSpotWBRectSize() const override;
|
||||||
void cropSelectionReady() override;
|
void cropSelectionReady() override;
|
||||||
void rotateSelectionReady(double rotate_deg, Thumbnail* thm = nullptr) override;
|
void rotateSelectionReady(double rotate_deg, Thumbnail* thm = nullptr) override;
|
||||||
ToolBar* getToolBar() const override final;
|
ToolBar* getToolBar() const final;
|
||||||
CropGUIListener* startCropEditing(Thumbnail* thm = nullptr) override;
|
CropGUIListener* startCropEditing(Thumbnail* thm = nullptr) override;
|
||||||
|
|
||||||
void updateTPVScrollbar (bool hide);
|
void updateTPVScrollbar (bool hide);
|
||||||
@ -326,7 +326,7 @@ public:
|
|||||||
|
|
||||||
// ToolBarListener interface
|
// ToolBarListener interface
|
||||||
void toolSelected (ToolMode tool) override;
|
void toolSelected (ToolMode tool) override;
|
||||||
void editModeSwitchedOff () override final;
|
void editModeSwitchedOff () final;
|
||||||
|
|
||||||
void setEditProvider (EditDataProvider *provider);
|
void setEditProvider (EditDataProvider *provider);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user