Fix issue with ColorFilterArray

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.14)
 
-project(libXISF VERSION 0.2.2 LANGUAGES CXX C)
+project(libXISF VERSION 0.2.3 LANGUAGES CXX C)
 
 include(CMakeDependentOption)
 
@@ -18,48 +18,46 @@ cmake_dependent_option(USE_BUNDLED_ZLIB "Use bundled Zlib" ON "USE_BUNDLED_LIBS"
 
 find_package(PkgConfig REQUIRED)
 
-if(USE_BUNDLED_LIBS)
+if(USE_BUNDLED_LZ4)
-    if(USE_BUNDLED_LZ4)
+    list(APPEND THIRD_PARTY_SRC
-        list(APPEND THIRD_PARTY_SRC
+        lz4/lz4.c
-            lz4/lz4.c
+        lz4/lz4.h
-            lz4/lz4.h
+        lz4/lz4hc.c
-            lz4/lz4hc.c
+        lz4/lz4hc.h)
-            lz4/lz4hc.h)
+    list(APPEND THIRD_PARTY_INCLUDE lz4)
-        list(APPEND THIRD_PARTY_INCLUDE lz4)
+else(USE_BUNDLED_LZ4)
-    else(USE_BUNDLED_LZ4)
+    pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED)
-        pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED)
+endif(USE_BUNDLED_LZ4)
-    endif(USE_BUNDLED_LZ4)
+if(USE_BUNDLED_PUGIXML)
-    if(USE_BUNDLED_PUGIXML)
+    list(APPEND THIRD_PARTY_SRC pugixml/pugixml.cpp)
-        list(APPEND THIRD_PARTY_SRC pugixml/pugixml.cpp)
+    list(APPEND THIRD_PARTY_INCLUDE pugixml)
-        list(APPEND THIRD_PARTY_INCLUDE pugixml)
+else(USE_BUNDLED_PUGIXML)
-    else(USE_BUNDLED_PUGIXML)
+    pkg_check_modules(PUGIXML pugixml IMPORTED_TARGET REQUIRED)
-        pkg_check_modules(PUGIXML pugixml IMPORTED_TARGET REQUIRED)
+endif(USE_BUNDLED_PUGIXML)
-    endif(USE_BUNDLED_PUGIXML)
+if(USE_BUNDLED_ZLIB)
-    if(USE_BUNDLED_ZLIB)
+    list(APPEND THIRD_PARTY_SRC
-        list(APPEND THIRD_PARTY_SRC
+        zlib/adler32.c
-            zlib/adler32.c
+        zlib/compress.c
-            zlib/compress.c
+        zlib/crc32.c
-            zlib/crc32.c
+        zlib/deflate.c
-            zlib/deflate.c
+        zlib/gzclose.c
-            zlib/gzclose.c
+        zlib/gzlib.c
-            zlib/gzlib.c
+        zlib/gzread.c
-            zlib/gzread.c
+        zlib/gzwrite.c
-            zlib/gzwrite.c
+        zlib/inflate.c
-            zlib/inflate.c
+        zlib/infback.c
-            zlib/infback.c
+        zlib/inftrees.c
-            zlib/inftrees.c
+        zlib/inffast.c
-            zlib/inffast.c
+        zlib/trees.c
-            zlib/trees.c
+        zlib/uncompr.c
-            zlib/uncompr.c
+        zlib/zutil.c)
-            zlib/zutil.c)
+    set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
-        set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zlib.pc.cmakein ${ZLIB_PC} @ONLY)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
-        configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zlib/zconf.h.cmakein ${CMAKE_CURRENT_BINARY_DIR}/zconf.h @ONLY)
+    list(APPEND THIRD_PARTY_INCLUDE zlib)
-        list(APPEND THIRD_PARTY_INCLUDE zlib)
+else(USE_BUNDLED_ZLIB)
-    else(USE_BUNDLED_ZLIB)
+    pkg_check_modules(ZLIB zlib IMPORTED_TARGET REQUIRED)
-        pkg_check_modules(ZLIB zlib IMPORTED_TARGET REQUIRED)
+endif(USE_BUNDLED_ZLIB)
-    endif(USE_BUNDLED_ZLIB)
-endif(USE_BUNDLED_LIBS)
 
 add_library(XISF
   bytearray.cpp

libxisf.cpp

@@ -912,7 +912,7 @@ void XISFWriterPrivate::writeImageElement(pugi::xml_node &node, const Image &ima
 
     if(image._cfa.width && image._cfa.height)
     {
-        pugi::xml_node cfa_node = node.append_child("ColorFilterArray");
+        pugi::xml_node cfa_node = image_node.append_child("ColorFilterArray");
         cfa_node.append_attribute("pattern").set_value(image._cfa.pattern.c_str());
         cfa_node.append_attribute("width").set_value(image._cfa.width);
         cfa_node.append_attribute("height").set_value(image._cfa.height);