Merge branch 'dev' into spot-removal-tool

2020-11-24 17:16:41 +01:00
parent f42548b018 0367d31403
commit 19e3833e66
257 changed files with 79066 additions and 10075 deletions
--- a/rtengine/image8.h
+++ b/rtengine/image8.h
@@ -64,11 +64,6 @@ public:
        return getEmbeddedProfile ();
    }

-    int getBitsPerPixel () const override
-    {
-        return 8 * sizeof(unsigned char);
-    }
-
    int saveToFile (const Glib::ustring &fname) const override
    {
        return save (fname);
@@ -94,11 +89,6 @@ public:
        setProgressListener (pl);
    }

-    void free () override
-    {
-        delete this;
-    }
-
 };

 }