Merge branch 'CameraMetaData-non-final' into develop

* CameraMetaData-non-final: CameraMetaData: add a test for inheritability Remove final from CameraMetaData to allow derived classes
darktable-org · Oct 27, 2022 · e5cbf27 · e5cbf27
2 parents 70b0145 + fbe495e
commit e5cbf27
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/librawspeed/metadata/CameraMetaData.h b/src/librawspeed/metadata/CameraMetaData.h
@@ -41,7 +41,8 @@ struct CameraId {
   }
 };
 
-class CameraMetaData final {
+// NOTE: *NOT* `final`, could be derived from by downstream.
+class CameraMetaData {
 public:
   CameraMetaData() = default;
 

diff --git a/test/librawspeed/metadata/CameraMetaDataTest.cpp b/test/librawspeed/metadata/CameraMetaDataTest.cpp
@@ -36,6 +36,10 @@ namespace rawspeed_test {
 
 static const std::string camfile(RAWSPEED_SOURCE_DIR "/data/cameras.xml");
 
+TEST(CameraMetaDataTest, CompileTimeCanInherit) {
+  struct MyCameraMetaData : public CameraMetaData {};
+}
+
 TEST(CameraMetaDataTest, CamerasXml) {
   ASSERT_NO_THROW({ CameraMetaData Data(camfile.c_str()); });