24 Commits

Author SHA1 Message Date
nou 76ee3f361c Release 0.2.6 2023-06-02 08:50:37 +02:00
nou cde2fc9a17 Fix "string sub-command REPLACE requires at least four arguments" 2023-05-31 14:56:26 +02:00
nou 0ddff094ef Fix generating pkgconfig file 2023-05-29 23:16:53 +02:00
nou 5dcc383090 Fix generating pkgconfig file 2023-05-29 22:59:24 +02:00
nou 0893bfa048 Add method to for ICC profile 2023-05-24 16:28:11 +02:00
nou a536a271ab Add StreamBuffer to optimize save/load from memory 2023-05-21 19:33:36 +02:00
nou 3ee8bd4027 Update version to 0.2.4 2023-05-19 21:43:59 +02:00
nou b7cd8cb72f Add support for thumbnail 2023-05-19 21:35:35 +02:00
nou 1c0d6e4e05 Add generation of pkgconfig file 2023-05-17 16:40:46 +02:00
nou f2907d7e53 Make pkg-config optional 2023-04-11 15:20:35 +02:00
nou dafc26984e Fix issue with ColorFilterArray 2023-04-11 12:25:14 +02:00
nou f9731614c8 Fix error with USE_BUNDLED_LIBS 2023-04-09 10:34:15 +02:00
nou ae46f09edf Version 0.2.2 2023-04-07 13:01:42 +02:00
nou ad50c5e323 Add option to exclude each bundled lib 2023-04-07 12:09:33 +02:00
nou 164183f348 Remove debian directory. It will remain in ubuntu branch 2023-03-20 21:14:27 +01:00
nou c74a67184c Changes for debian packaging 2023-03-19 22:11:24 +01:00
nou 77b83e4832 Remote chm file 2023-03-19 22:06:56 +01:00
nou e2d3c878c4 Add license header to bytearray.cpp 2023-03-18 09:53:27 +01:00
nou 3b3d472149 Update README.md 2023-03-18 09:49:16 +01:00
nou 8f8cc94ddb Updated debian/control 2023-03-15 23:54:45 +01:00
nou bf20f8eb9c Add license for pugixml 2023-03-15 23:47:32 +01:00
nou dd66850fdf Fix test condition 2023-03-12 16:51:55 +01:00
nou 83f12a434c Fix includes 2023-03-12 16:51:39 +01:00
nou 43533aa363 Fix tm initialization 2023-03-11 10:02:55 +01:00
20 changed files with 380 additions and 163 deletions
+72 -30
View File
@@ -1,6 +1,10 @@
cmake_minimum_required(VERSION 3.14) cmake_minimum_required(VERSION 3.14)
project(libXISF VERSION 0.2.0 LANGUAGES CXX C) project(libXISF VERSION 0.2.6 LANGUAGES CXX C
HOMEPAGE_URL https://gitea.nouspiro.space/nou/libXISF
DESCRIPTION "LibXISF is C++ library that can read and write XISF files produced by PixInsight.")
include(CMakeDependentOption)
set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
@@ -9,54 +13,83 @@ set(CMAKE_C_VISIBILITY_PRESET hidden)
set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden)
option(BUILD_SHARED_LIBS "Build using shared libraries" ON) option(BUILD_SHARED_LIBS "Build using shared libraries" ON)
option(USE_BUNDLED_LIBS "Use bundled LZ4 PugiXML and Zlib" ON) option(USE_BUNDLED_LIBS "Use bundled LZ4 PugiXML and Zlib. You can still exclude some" ON)
cmake_dependent_option(USE_BUNDLED_LZ4 "Use bundled LZ4" ON "USE_BUNDLED_LIBS" OFF)
cmake_dependent_option(USE_BUNDLED_PUGIXML "Use bundled PugiXML" ON "USE_BUNDLED_LIBS" OFF)
cmake_dependent_option(USE_BUNDLED_ZLIB "Use bundled Zlib" ON "USE_BUNDLED_LIBS" OFF)
if(USE_BUNDLED_LIBS) find_package(PkgConfig)
set(THIRD_PARTY_SRC
lz4/lz4.c if(USE_BUNDLED_LZ4)
lz4/lz4.h list(APPEND THIRD_PARTY_SRC
lz4/lz4hc.c lz4/lz4.c
lz4/lz4hc.h lz4/lz4.h
pugixml/pugixml.cpp lz4/lz4hc.c
zlib/adler32.c lz4/lz4hc.h)
zlib/compress.c list(APPEND THIRD_PARTY_INCLUDE lz4)
zlib/crc32.c else(USE_BUNDLED_LZ4)
zlib/deflate.c pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED)
zlib/gzclose.c endif(USE_BUNDLED_LZ4)
zlib/gzlib.c if(USE_BUNDLED_PUGIXML)
zlib/gzread.c list(APPEND THIRD_PARTY_SRC pugixml/pugixml.cpp)
zlib/gzwrite.c list(APPEND THIRD_PARTY_INCLUDE pugixml)
zlib/inflate.c else(USE_BUNDLED_PUGIXML)
zlib/infback.c pkg_check_modules(PUGIXML pugixml IMPORTED_TARGET REQUIRED)
zlib/inftrees.c endif(USE_BUNDLED_PUGIXML)
zlib/inffast.c if(USE_BUNDLED_ZLIB)
zlib/trees.c list(APPEND THIRD_PARTY_SRC
zlib/uncompr.c zlib/adler32.c
zlib/zutil.c) zlib/compress.c
zlib/crc32.c
zlib/deflate.c
zlib/gzclose.c
zlib/gzlib.c
zlib/gzread.c
zlib/gzwrite.c
zlib/inflate.c
zlib/infback.c
zlib/inftrees.c
zlib/inffast.c
zlib/trees.c
zlib/uncompr.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)
else(USE_BUNDLED_LIBS) list(APPEND THIRD_PARTY_INCLUDE zlib)
find_package(PkgConfig REQUIRED) else(USE_BUNDLED_ZLIB)
pkg_check_modules(LZ4 liblz4 IMPORTED_TARGET REQUIRED)
pkg_check_modules(PUGIXML pugixml IMPORTED_TARGET REQUIRED)
pkg_check_modules(ZLIB zlib IMPORTED_TARGET REQUIRED) pkg_check_modules(ZLIB zlib IMPORTED_TARGET REQUIRED)
endif(USE_BUNDLED_LIBS) endif(USE_BUNDLED_ZLIB)
add_library(XISF add_library(XISF
bytearray.cpp bytearray.cpp
libXISF_global.h libXISF_global.h
libxisf.cpp libxisf.cpp
libxisf.h libxisf.h
streambuffer.cpp
streambuffer.h
utils.cpp utils.cpp
variant.cpp variant.cpp
${THIRD_PARTY_SRC} ${THIRD_PARTY_SRC}
) )
if(USE_BUNDLED_LIBS) if(USE_BUNDLED_LIBS)
target_include_directories(XISF PRIVATE lz4 pugixml zlib) target_include_directories(XISF PRIVATE ${THIRD_PARTY_INCLUDE})
if(NOT USE_BUNDLED_LZ4)
target_link_libraries(XISF PUBLIC PkgConfig::LZ4)
list(APPEND PC_LIBS_REQUIRE lz4)
endif(NOT USE_BUNDLED_LZ4)
if(NOT USE_BUNDLED_PUGIXML)
target_link_libraries(XISF PUBLIC PkgConfig::PUGIXML)
list(APPEND PC_LIBS_REQUIRE pugixml)
endif(NOT USE_BUNDLED_PUGIXML)
if(NOT USE_BUNDLED_ZLIB)
target_link_libraries(XISF PUBLIC PkgConfig::ZLIB)
list(APPEND PC_LIBS_REQUIRE zlib)
endif(NOT USE_BUNDLED_ZLIB)
else(USE_BUNDLED_LIBS) else(USE_BUNDLED_LIBS)
target_link_libraries(XISF PUBLIC PkgConfig::LZ4 PkgConfig::PUGIXML PkgConfig::ZLIB) target_link_libraries(XISF PUBLIC PkgConfig::LZ4 PkgConfig::PUGIXML PkgConfig::ZLIB)
list(APPEND PC_LIBS_REQUIRE lz4 pugixml zlib)
endif(USE_BUNDLED_LIBS) endif(USE_BUNDLED_LIBS)
set_target_properties(XISF PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR}) set_target_properties(XISF PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION ${PROJECT_VERSION_MAJOR})
@@ -72,8 +105,17 @@ set(XISF_PUBLIC_HEADERS libxisf.h libXISF_global.h)
include(GNUInstallDirs) include(GNUInstallDirs)
install(FILES ${XISF_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(FILES ${XISF_PUBLIC_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libxisf.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
install(TARGETS XISF LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS XISF LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
list(JOIN PC_LIBS_REQUIRE ", " PC_REQUIRE_STR2)
if(NOT PC_REQUIRE_STR2 STREQUAL "")
string(REPLACE "lz4" "liblz4" PC_REQUIRE_STR ${PC_REQUIRE_STR2})
endif()
list(TRANSFORM PC_LIBS_REQUIRE PREPEND "-l")
list(JOIN PC_LIBS_REQUIRE " " PC_LIBS_STR)
configure_file(libxisf.pc.in libxisf.pc @ONLY)
#testing #testing
enable_testing() enable_testing()
+12 -1
View File
@@ -3,4 +3,15 @@ LibXISF
LibXISF is C++ library that can read and write XISF files produced by [PixInsight](https://pixinsight.com/). LibXISF is C++ library that can read and write XISF files produced by [PixInsight](https://pixinsight.com/).
It implement [XISF 1.0 specification](https://pixinsight.com/doc/docs/XISF-1.0-spec/XISF-1.0-spec.html). It implement [XISF 1.0 specification](https://pixinsight.com/doc/docs/XISF-1.0-spec/XISF-1.0-spec.html).
It is licensed under GPLv3. To compile you will need C++17 compiler. It is licensed under GPLv3 or later. To compile you will need C++17 compiler.
To compile simply run these commands
```
cmake -B build -S .
cmake --build build --parallel
cmake --install .
```
By default it use bundled libraries. If you wish to use external libraries you will may add
`-DUSE_BUNDLED_LIBS=Off` to first command. Then you will need *lz4 pkg-config pugixml zlib* installed.
You may also specify `-DBUILD_SHARED_LIBS=Off` if you want build static lib.
+18
View File
@@ -1,3 +1,21 @@
/************************************************************************
* LibXISF - library to load and save XISF files *
* Copyright (C) 2023 Dušan Poizl *
* *
* This program is free software: you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation, either version 3 of the License, or *
* (at your option) any later version. *
* *
* This program is distributed in the hope that it will be useful, *
* but WITHOUT ANY WARRANTY; without even the implied warranty of *
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
* GNU General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program. If not, see <http://www.gnu.org/licenses/>.*
************************************************************************/
#include "libxisf.h" #include "libxisf.h"
namespace LibXISF namespace LibXISF
-29
View File
@@ -1,29 +0,0 @@
libxisf (0.2.0-ubuntu1) focal; urgency=medium
* Rewrite to remove Qt as dependency
-- Dušan Poizl <nou@nouspiro.space> Fri, 10 Mar 2023 22:10:01 +0100
libxisf (0.1.3-ubuntu1) focal; urgency=medium
* Write missing pixelStorage attribute
-- Dušan Poizl <nou@nouspiro.space> Fri, 17 Feb 2023 16:57:30 +0100
libxisf (0.1.2-ubuntu1) focal; urgency=medium
* Add qtbase5-dev as dependency to libxisf-dev
-- Dušan Poizl <nou@nouspiro.space> Thu, 09 Feb 2023 21:28:45 +0100
libxisf (0.1.1-ubuntu1) focal; urgency=medium
* Fixed packaging
-- Dušan Poizl <nou@nouspiro.space> Wed, 08 Feb 2023 18:57:50 +0100
libxisf (0.1.0-ubuntu1) focal; urgency=low
* Initial release.
-- Dušan Poizl <nou@nouspiro.space> Tue, 07 Feb 2023 10:47:08 +0100
-1
View File
@@ -1 +0,0 @@
10
-25
View File
@@ -1,25 +0,0 @@
Source: libxisf
Priority: optional
Maintainer: Dušan Poizl <nou@nouspiro.space>
Build-Depends: debhelper (>= 9),
cdbs,
cmake,
Standards-Version: 4.5.0
Section: libs
Homepage: https://gitea.nouspiro.space/nou/libXISF
Vcs-Git: https://gitea.nouspiro.space/nou/libXISF.git
Package: libxisf-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends: libxisf (= ${binary:Version}), ${misc:Depends}, qtbase5-dev
Description: Library to load and save XISF images
Native format of PixInsight astroprocessing suite
Package: libxisf
Architecture: any
Multi-Arch: same
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: Library to load and save XISF images
Native format of PixInsight astroprocessing suite
-52
View File
@@ -1,52 +0,0 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libxisf
Source: https://gitea.nouspiro.space/nou/libXISF
Files: * debian/*
Copyright: (c) 2023 <Dušan Poizl nou@nouspiro.space>
License: GPL-3+
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
.
On Debian systems, the complete texts of the GNU General Public Licenses
version 2 and 3 can be found in '/usr/share/common-licenses/GPL-2' and
'/usr/share/common-licenses/GPL-3'.
Files: lz4/*
Copyright: (c) 2011-2020, Yann Collet
License: BSD-2-clause
LZ4 Library
Copyright (c) 2011-2020, Yann Collet
All rights reserved.
.
Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met:
.
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
.
* Redistributions in binary form must reproduce the above copyright notice, this
list of conditions and the following disclaimer in the documentation and/or
other materials provided with the distribution.
.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-2
View File
@@ -1,2 +0,0 @@
usr/include
usr/lib/*/*.so
-1
View File
@@ -1 +0,0 @@
usr/lib/*/*.so.*
-10
View File
@@ -1,10 +0,0 @@
#!/usr/bin/make -f
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/cmake.mk
export CFLAGS := $(shell dpkg-buildflags --get CFLAGS)
export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS)
export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS)
-1
View File
@@ -1 +0,0 @@
3.0 (quilt)
+45 -6
View File
@@ -27,6 +27,7 @@
#include <lz4hc.h> #include <lz4hc.h>
#include <pugixml.hpp> #include <pugixml.hpp>
#include <zlib.h> #include <zlib.h>
#include "streambuffer.h"
namespace LibXISF namespace LibXISF
{ {
@@ -357,6 +358,16 @@ bool Image::addFITSKeywordAsProperty(const String &name, const String &value)
return false; return false;
} }
const ByteArray &Image::iccProfile() const
{
return _iccProfile;
}
void Image::setIccProfile(const ByteArray &iccProfile)
{
_iccProfile = iccProfile;
}
void *Image::imageData() void *Image::imageData()
{ {
return _dataBlock.data.size() ? _dataBlock.data.data() : nullptr; return _dataBlock.data.size() ? _dataBlock.data.data() : nullptr;
@@ -520,6 +531,7 @@ public:
* @param readPixel when false it will read pixel data from file and imageData() * @param readPixel when false it will read pixel data from file and imageData()
* will return nullptr */ * will return nullptr */
const Image& getImage(uint32_t n, bool readPixels = true); const Image& getImage(uint32_t n, bool readPixels = true);
const Image& getThumbnail();
private: private:
void readXISFHeader(); void readXISFHeader();
void readSignature(); void readSignature();
@@ -531,7 +543,9 @@ private:
Image parseImage(const pugi::xml_node &node); Image parseImage(const pugi::xml_node &node);
std::unique_ptr<std::istream> _io; std::unique_ptr<std::istream> _io;
std::unique_ptr<StreamBuffer> _buffer;
std::vector<Image> _images; std::vector<Image> _images;
Image _thumbnail;
std::vector<Property> _properties; std::vector<Property> _properties;
}; };
@@ -546,8 +560,8 @@ void XISFReaderPrivate::open(const String &name)
void XISFReaderPrivate::open(const ByteArray &data) void XISFReaderPrivate::open(const ByteArray &data)
{ {
close(); close();
std::string str((char*)data.data(), data.size()); _buffer = std::make_unique<StreamBuffer>(data);
_io = std::make_unique<std::istringstream>(str, std::ios_base::in | std::ios_base::binary); _io = std::make_unique<std::istream>(_buffer.get());
readSignature(); readSignature();
readXISFHeader(); readXISFHeader();
} }
@@ -563,6 +577,7 @@ void XISFReaderPrivate::open(std::istream *io)
void XISFReaderPrivate::close() void XISFReaderPrivate::close()
{ {
_io.reset(); _io.reset();
_buffer.reset();
_images.clear(); _images.clear();
_properties.clear(); _properties.clear();
} }
@@ -588,6 +603,19 @@ const Image& XISFReaderPrivate::getImage(uint32_t n, bool readPixels)
return img; return img;
} }
const Image &XISFReaderPrivate::getThumbnail()
{
Image &img = _thumbnail;
if(_thumbnail._dataBlock.attachmentPos)
{
_io->seekg(img._dataBlock.attachmentPos);
ByteArray data(img._dataBlock.attachmentSize);
_io->read(data.data(), data.size());
img._dataBlock.decompress(data);
}
return _thumbnail;
}
void XISFReaderPrivate::readXISFHeader() void XISFReaderPrivate::readXISFHeader()
{ {
uint32_t headerLen[2] = {0}; uint32_t headerLen[2] = {0};
@@ -608,6 +636,9 @@ void XISFReaderPrivate::readXISFHeader()
for(auto &property : root.children("Property")) for(auto &property : root.children("Property"))
_properties.push_back(parseProperty(property)); _properties.push_back(parseProperty(property));
if(root.child("Thumbnail"))
_thumbnail = parseImage(root.child("Thumbnail"));
} }
else throw Error("Unknown root XML element"); else throw Error("Unknown root XML element");
} }
@@ -784,6 +815,9 @@ Image XISFReaderPrivate::parseImage(const pugi::xml_node &node)
image._iccProfile = icc.data; image._iccProfile = icc.data;
} }
if(node.child("Thumbnail") && std::strcmp(node.name(), "Thumbnail"))
_thumbnail = parseImage(node.child("Thumbnail"));
return image; return image;
} }
@@ -818,10 +852,10 @@ void XISFWriterPrivate::save(const String &name)
void XISFWriterPrivate::save(ByteArray &data) void XISFWriterPrivate::save(ByteArray &data)
{ {
std::ostringstream oss; StreamBuffer buffer;
std::ostream oss(&buffer);
save(oss); save(oss);
std::string str = oss.str(); data = buffer.byteArray();
data = ByteArray(str.data(), str.size());
} }
void XISFWriterPrivate::save(std::ostream &io) void XISFWriterPrivate::save(std::ostream &io)
@@ -912,7 +946,7 @@ void XISFWriterPrivate::writeImageElement(pugi::xml_node &node, const Image &ima
if(image._cfa.width && image._cfa.height) 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("pattern").set_value(image._cfa.pattern.c_str());
cfa_node.append_attribute("width").set_value(image._cfa.width); cfa_node.append_attribute("width").set_value(image._cfa.width);
cfa_node.append_attribute("height").set_value(image._cfa.height); cfa_node.append_attribute("height").set_value(image._cfa.height);
@@ -1034,6 +1068,11 @@ const Image &XISFReader::getImage(uint32_t n, bool readPixels)
return p->getImage(n, readPixels); return p->getImage(n, readPixels);
} }
const Image &XISFReader::getThumbnail()
{
return p->getThumbnail();
}
XISFWriter::XISFWriter() XISFWriter::XISFWriter()
{ {
p = new XISFWriterPrivate; p = new XISFWriterPrivate;
+9 -2
View File
@@ -301,6 +301,8 @@ public:
* For example OBSERVER => Observer:Name, SITELAT => Observation:Location:Latitude * For example OBSERVER => Observer:Name, SITELAT => Observation:Location:Latitude
*/ */
bool addFITSKeywordAsProperty(const String &name, const String &value); bool addFITSKeywordAsProperty(const String &name, const String &value);
const ByteArray& iccProfile() const;
void setIccProfile(const ByteArray &iccProfile);
void* imageData(); void* imageData();
const void* imageData() const; const void* imageData() const;
@@ -364,9 +366,14 @@ public:
int imagesCount() const; int imagesCount() const;
/** Return reference to Image /** Return reference to Image
* @param n index of image * @param n index of image
* @param readPixel when false it will read pixel data from file and imageData() * @param readPixel when false it will not read pixel data from file and imageData()
* will return nullptr */ * will return nullptr. Other properties like width, height, format etc will be returned correctly */
const Image& getImage(uint32_t n, bool readPixels = true); const Image& getImage(uint32_t n, bool readPixels = true);
/**
* @brief getThumbnail
* @return image thumbnail
*/
const Image& getThumbnail();
private: private:
XISFReaderPrivate *p; XISFReaderPrivate *p;
}; };
+12
View File
@@ -0,0 +1,12 @@
prefix="@CMAKE_INSTALL_PREFIX@"
exec_prefix="${prefix}"
libdir="${exec_prefix}/@CMAKE_INSTALL_LIBDIR@"
includedir="${prefix}/@CMAKE_INSTALL_INCLUDEDIR@"
Name: @PROJECT_NAME@
Description: @CMAKE_PROJECT_DESCRIPTION@
URL: @CMAKE_PROJECT_HOMEPAGE_URL@
Version: @PROJECT_VERSION@
Requires.private: @PC_REQUIRE_STR@
Cflags: -I"${includedir}"
Libs: -L"${libdir}" -lXISF
+24
View File
@@ -0,0 +1,24 @@
MIT License
Copyright (c) 2006-2022 Arseny Kapoulkine
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation
files (the "Software"), to deal in the Software without
restriction, including without limitation the rights to use,
copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following
conditions:
The above copyright notice and this permission notice shall be
included in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
+144
View File
@@ -0,0 +1,144 @@
#include "streambuffer.h"
namespace LibXISF
{
StreamBuffer::StreamBuffer()
{
setg(nullptr, nullptr, nullptr);
setp(nullptr, nullptr);
}
StreamBuffer::StreamBuffer(const ByteArray &byteArray) :
_size(byteArray.size()),
_byteArray(byteArray)
{
if(_byteArray.size())
{
char *ptr = _byteArray.data();
setg(ptr, ptr, ptr + _size);
setp(ptr, ptr + _size);
}
else
{
setg(nullptr, nullptr, nullptr);
setp(nullptr, nullptr);
}
}
ByteArray StreamBuffer::byteArray()
{
return _byteArray;
}
StreamBuffer::pos_type StreamBuffer::seekoff(off_type off, std::ios_base::seekdir dir, std::ios_base::openmode mode)
{
pos_type ret = pos_type(off_type(-1));
off_type newoffi = off;
off_type newoffo = off;
if(dir == std::ios_base::cur)
{
newoffi += gptr() - eback();
newoffo += pptr() - pbase();
}
else if(dir == std::ios_base::end)
newoffo = newoffi = _byteArray.size() - off;
char *ptr = _byteArray.data();
if(mode & std::ios_base::in && newoffi >= 0 && newoffi <= _size)
{
setg(ptr, ptr + newoffi, ptr + _size);
ret = pos_type(newoffi);
}
if(mode & std::ios_base::out && newoffo >= 0 && newoffo <= _size)
{
setp(ptr, ptr + _size);
pbump(newoffo);
ret = pos_type(newoffo);
}
return ret;
}
StreamBuffer::pos_type StreamBuffer::seekpos(pos_type pos, std::ios_base::openmode mode)
{
pos_type ret = pos_type(off_type(-1));
off_type off = pos;
if(off >= 0 && off <= (off_type)_byteArray.size())
{
char *ptr = _byteArray.data();
if(mode & std::ios_base::in)
setg(ptr, ptr + pos, ptr + _size);
if(mode & std::ios_base::out)
{
setp(ptr, ptr + _size);
pbump(pos);
}
ret = pos;
}
return ret;
}
std::streamsize StreamBuffer::xsgetn(char_type *s, std::streamsize n)
{
std::streamsize ret = 0;
std::streamsize len = egptr() - gptr();
if(len > 0)
{
std::streamsize c = std::min(n, len);
std::memcpy(s, gptr(), c);
gbump(c);
ret = c;
}
return ret;
}
StreamBuffer::int_type StreamBuffer::underflow()
{
if(gptr() < egptr())
return traits_type::to_int_type(*gptr());
else
return traits_type::eof();
}
std::streamsize StreamBuffer::xsputn(const char_type *s, std::streamsize n)
{
off_type len = epptr() - pptr();
if(len < n)
{
_size += n - len;
_byteArray.resize(_size);
update_ptrs();
}
std::memcpy(pptr(), s, n);
pbump(n);
return n;
}
StreamBuffer::int_type StreamBuffer::overflow(int_type c)
{
if(traits_type::eq_int_type(traits_type::eof(), c))
return traits_type::eof();
_byteArray.append(c);
_size++;
pbump(1);
update_ptrs();
return c;
}
void StreamBuffer::update_ptrs()
{
off_type ipos = gptr() - eback();
off_type opos = pptr() - pbase();
char *ptr = _byteArray.data();
setg(ptr, ptr + ipos, ptr + _size);
setp(ptr, ptr + _size);
pbump(opos);
}
}
+33
View File
@@ -0,0 +1,33 @@
#ifndef STREAMBUFFER_H
#define STREAMBUFFER_H
#include <streambuf>
#include "libxisf.h"
namespace LibXISF
{
class StreamBuffer : public std::streambuf
{
public:
StreamBuffer();
StreamBuffer(const ByteArray &byteArray);
ByteArray byteArray();
protected:
pos_type seekoff(off_type off, std::ios_base::seekdir dir, std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out) override;
pos_type seekpos(pos_type pos, std::ios_base::openmode mode = std::ios_base::in | std::ios_base::out) override;
std::streamsize xsgetn(char_type *s, std::streamsize n) override;
int_type underflow() override;
std::streamsize xsputn(const char_type *s, std::streamsize n) override;
int_type overflow(int_type c = traits_type::eof()) override;
private:
void update_ptrs();
off_type _size = 0;
ByteArray _byteArray;
};
}
#endif // STREAMBUFFER_H
+9 -2
View File
@@ -54,7 +54,7 @@ int main(int argc, char **argv)
m(0, 2) = 2; m(0, 2) = 2;
m(1, 0) = 10; m(1, 0) = 10;
image.addProperty(Property("UI16Matrix", m)); image.addProperty(Property("UI16Matrix", m));
std::tm tm = {12, 22, 23, 1, 2, 2023, 0, 0, 0, 0, 0}; std::tm tm = {12, 22, 23, 1, 2, 2023, 0, 0, 0};
image.addProperty(Property("TimeObs", tm)); image.addProperty(Property("TimeObs", tm));
image.addFITSKeyword({"RA", "226.9751163116387", "Right ascension of the center of the image (deg)"}); image.addFITSKeyword({"RA", "226.9751163116387", "Right ascension of the center of the image (deg)"});
image.addFITSKeyword({"DEC", "62.02302376908295", "Declination of the center of the image (deg)"}); image.addFITSKeyword({"DEC", "62.02302376908295", "Declination of the center of the image (deg)"});
@@ -94,7 +94,14 @@ int main(int argc, char **argv)
TEST(image.height() != 10, "Invalid height"); TEST(image.height() != 10, "Invalid height");
TEST(image.colorSpace() != LibXISF::Image::Gray, "Invalid color space"); TEST(image.colorSpace() != LibXISF::Image::Gray, "Invalid color space");
TEST(image.pixelStorage() != LibXISF::Image::Planar, "Invalid pixel storage"); TEST(image.pixelStorage() != LibXISF::Image::Planar, "Invalid pixel storage");
TEST(image.compression() != LibXISF::DataBlock::None, "Invalid compression codec"); if(std::strstr(argv[1], "lz4"))
{
TEST(image.compression() != LibXISF::DataBlock::LZ4, "Invalid compression codec");
}
else
{
TEST(image.compression() != LibXISF::DataBlock::None, "Invalid compression codec");
}
//TEST(!image.dataBlock.embedded, "Not embedded"); //TEST(!image.dataBlock.embedded, "Not embedded");
TEST(image.imageDataSize() != 80*2, "Invalid data size"); TEST(image.imageDataSize() != 80*2, "Invalid data size");
} }
+2 -1
View File
@@ -21,8 +21,9 @@
#include <map> #include <map>
#include <regex> #include <regex>
#include <iomanip> #include <iomanip>
#include <sstream>
#include "libxisf.h" #include "libxisf.h"
#include "pugixml/pugixml.hpp" #include <pugixml.hpp>
namespace LibXISF namespace LibXISF
{ {
Binary file not shown.