Merge branch 'dev' into metadata-exiv2

2023-02-05 12:29:58 -08:00
parent 7324ea7230 9a245c1acb
commit 3833c6e634
278 changed files with 74278 additions and 13534 deletions
--- a/rtengine/dcp.cc
+++ b/rtengine/dcp.cc
@@ -2114,7 +2114,7 @@ inline void DCPProfile::hsdApply(const HsdTableInfo& table_info, const std::vect
    }
 }

-bool DCPProfile::isValid()
+bool DCPProfile::isValid() const
 {
    return valid;
 }
@@ -2196,7 +2196,7 @@ void DCPStore::init(const Glib::ustring& rt_profile_dir, bool loadAll)
    }
 }

-bool DCPStore::isValidDCPFileName(const Glib::ustring& filename) const
+bool DCPStore::isValidDCPFileName(const Glib::ustring& filename)
 {
    if (!Glib::file_test(filename, Glib::FILE_TEST_EXISTS) || Glib::file_test(filename, Glib::FILE_TEST_IS_DIR)) {
        return false;