File _service:download_files:8548627..9280d1a.patch of Package exiv2

Overview Repositories Revisions Requests Users Attributes Meta

File _service:download_files:8548627..9280d1a.patch of Package exiv2 (Revision 53449015ee945eadc5d1c7ec2b2c3919)

Currently displaying revision 53449015ee945eadc5d1c7ec2b2c3919 , Show latest

From 7dc7012308075a9064d71232b159ba678a3b0358 Mon Sep 17 00:00:00 2001
From: antermin <103918092+antermin@users.noreply.github.com>
Date: Tue, 21 Mar 2023 15:23:07 +0900
Subject: [PATCH 1/3] Add getUint64_t

---
 src/helper_functions.cpp | 9 +++++++++
 src/helper_functions.hpp | 9 +++++++++
 2 files changed, 18 insertions(+)

diff --git a/src/helper_functions.cpp b/src/helper_functions.cpp
index e01a8bf20c..7efbfe3afa 100644
--- a/src/helper_functions.cpp
+++ b/src/helper_functions.cpp
@@ -27,3 +27,12 @@ std::string string_from_unterminated(const char* data, size_t data_length)
 
     return std::string(data, StringLength);
 }
+
+uint64_t getUint64_t(Exiv2::DataBuf& buf) {
+    uint64_t temp = 0;
+
+    for(size_t i = 0; i < static_cast<size_t>(buf.size_); ++i){
+        temp = temp + static_cast<uint64_t>(buf.pData_[i]*(pow(static_cast<float>(256), i)));
+    }
+    return temp;
+}
diff --git a/src/helper_functions.hpp b/src/helper_functions.hpp
index 6ec990d6a3..3fb6e47a7f 100644
--- a/src/helper_functions.hpp
+++ b/src/helper_functions.hpp
@@ -20,7 +20,10 @@
 #ifndef HELPER_FUNCTIONS_HPP
 #define HELPER_FUNCTIONS_HPP
 
+#include <cmath>
 #include <string>
+#include "basicio.hpp"
+#include "types.hpp"
 
 /*!
   @brief Convert a (potentially not null terminated) array into a
@@ -39,4 +42,10 @@
  */
 std::string string_from_unterminated(const char* data, size_t data_length);
 
+/*!
+  @brief Converts buffer data into 64-bit Integer, information stored
+  in littleEndian format
+ */
+uint64_t getUint64_t(Exiv2::DataBuf& buf);
+
 #endif  // HELPER_FUNCTIONS_HPP

From 7944aa5afb47cac034689abd1fbc82779dab4f87 Mon Sep 17 00:00:00 2001
From: antermin <103918092+antermin@users.noreply.github.com>
Date: Tue, 4 Apr 2023 16:45:21 +0900
Subject: [PATCH 2/3] Experimental JXL/codestream support

---
 include/exiv2/CMakeLists.txt |   1 +
 include/exiv2/jxlimage.hpp   | 128 ++++++++++++++++++++++++++++++++++
 src/CMakeLists.txt           |   2 +
 src/image.cpp                |   2 +
 src/jxlimage.cpp             | 129 +++++++++++++++++++++++++++++++++++
 src/jxlimage_int.cpp         |  69 +++++++++++++++++++
 src/jxlimage_int.hpp         |  23 +++++++
 7 files changed, 354 insertions(+)
 create mode 100644 include/exiv2/jxlimage.hpp
 create mode 100644 src/jxlimage.cpp
 create mode 100644 src/jxlimage_int.cpp
 create mode 100644 src/jxlimage_int.hpp

diff --git a/include/exiv2/CMakeLists.txt b/include/exiv2/CMakeLists.txt
index c8900b56e6..f926c2acfd 100644
--- a/include/exiv2/CMakeLists.txt
+++ b/include/exiv2/CMakeLists.txt
@@ -21,6 +21,7 @@ install(FILES
             iptc.hpp
             jp2image.hpp
             jpgimage.hpp
+            jxlimage.hpp
             matroskavideo.hpp
             metadatum.hpp
             mrwimage.hpp
diff --git a/include/exiv2/jxlimage.hpp b/include/exiv2/jxlimage.hpp
new file mode 100644
index 0000000000..f4dfa3f0ce
--- /dev/null
+++ b/include/exiv2/jxlimage.hpp
@@ -0,0 +1,128 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2023 Exiv2 authors
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*!
+  @file    jxlimage.hpp
+  @brief   JPEG XL (JXL) bare codestream image
+  @author  antermin
+  @date    09-Mar-2023, antermin: created
+ */
+#ifndef JXLIMAGE_HPP_
+#define JXLIMAGE_HPP_
+
+// *****************************************************************************
+#include "exiv2lib_export.h"
+
+// included header files
+#include "image.hpp"
+
+// *****************************************************************************
+// namespace extensions
+namespace Exiv2 {
+
+// *****************************************************************************
+// class definitions
+
+    // Add JPEG XL (JXL) bare codestream to the supported image formats
+    namespace ImageType {
+        const int jxl = 25; //!< JPEG XL (JXL) bare codestream image type (see class JxlImage)
+        // TODO need to check whether the above is correct
+    }
+
+    /*!
+      @brief Class to access JPEG XL bare codestream. This is just a stub - we only
+          read width and height.
+     */
+    class EXIV2API JxlImage : public Image {
+        //! @name NOT Implemented
+        //@{
+        //! Copy constructor
+        JxlImage(const JxlImage& rhs);
+        //! Assignment operator
+        JxlImage& operator=(const JxlImage& rhs);
+        //@}
+
+    public:
+        //! @name Creators
+        //@{
+        /*!
+          @brief Constructor to open a Windows bitmap image. Since the
+              constructor can not return a result, callers should check the
+              good() method after object construction to determine success
+              or failure.
+          @param io An auto-pointer that owns a BasicIo instance used for
+              reading and writing image metadata. \b Important: The constructor
+              takes ownership of the passed in BasicIo instance through the
+              auto-pointer. Callers should not continue to use the BasicIo
+              instance after it is passed to this method.  Use the Image::io()
+              method to get a temporary reference.
+         */
+        explicit JxlImage(BasicIo::AutoPtr io);
+        //@}
+
+        //! @name Manipulators
+        //@{
+        void readMetadata();
+        /*!
+          @brief Todo: Write metadata back to the image. This method is not
+              yet(?) implemented. Calling it will throw an Error(kerWritingImageFormatUnsupported).
+         */
+        void writeMetadata();
+        /*!
+          @brief Todo: Not supported yet(?). Calling this function will throw
+              an instance of Error(kerInvalidSettingForImage).
+         */
+        void setExifData(const ExifData& exifData);
+        /*!
+          @brief Todo: Not supported yet(?). Calling this function will throw
+              an instance of Error(kerInvalidSettingForImage).
+         */
+        void setIptcData(const IptcData& iptcData);
+        /*!
+          @brief Not supported. Calling this function will throw an instance
+              of Error(kerInvalidSettingForImage).
+         */
+        void setComment(const std::string& comment);
+        //@}
+
+        //! @name Accessors
+        //@{
+        std::string mimeType() const;
+        //@}
+
+    }; // class JxlImage
+
+// *****************************************************************************
+// template, inline and free functions
+
+    // These could be static private functions on Image subclasses but then
+    // ImageFactory needs to be made a friend.
+    /*!
+      @brief Create a new JxlImage instance and return an auto-pointer to it.
+             Caller owns the returned object and the auto-pointer ensures that
+             it will be deleted.
+     */
+    EXIV2API Image::AutoPtr newJxlInstance(BasicIo::AutoPtr io, bool create);
+
+    //! Check if the file iIo is a JPEG XL bare codestream image.
+    EXIV2API bool isJxlType(BasicIo& iIo, bool advance);
+
+}                                       // namespace Exiv2
+
+#endif                                  // #ifndef JXLIMAGE_HPP_
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index aa72075bdf..f5b492cf0b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,6 +20,7 @@ add_library( exiv2lib_int OBJECT
     helper_functions.cpp    helper_functions.hpp
     image_int.cpp           image_int.hpp
     jp2image_int.cpp        jp2image_int.hpp
+    jxlimage_int.cpp        jxlimage_int.hpp
     makernote_int.cpp       makernote_int.hpp
     minoltamn_int.cpp       minoltamn_int.hpp
     nikonmn_int.cpp         nikonmn_int.hpp
@@ -64,6 +65,7 @@ add_library( exiv2lib
     iptc.cpp                ../include/exiv2/iptc.hpp
     jp2image.cpp            ../include/exiv2/jp2image.hpp
     jpgimage.cpp            ../include/exiv2/jpgimage.hpp
+    jxlimage.cpp            ../include/exiv2/jxlimage.hpp
     metadatum.cpp           ../include/exiv2/metadatum.hpp
     mrwimage.cpp            ../include/exiv2/mrwimage.hpp
     orfimage.cpp            ../include/exiv2/orfimage.hpp
diff --git a/src/image.cpp b/src/image.cpp
index c478dcce34..63e08579d1 100644
--- a/src/image.cpp
+++ b/src/image.cpp
@@ -52,6 +52,7 @@
 #include "tgaimage.hpp"
 #include "bmpimage.hpp"
 #include "jp2image.hpp"
+#include "jxlimage.hpp"
 #include "nikonmn_int.hpp"
 
 #ifdef   EXV_ENABLE_VIDEO
@@ -132,6 +133,7 @@ namespace {
         { ImageType::tga,  newTgaInstance,  isTgaType,  amNone,      amNone,      amNone,      amNone      },
         { ImageType::bmp,  newBmpInstance,  isBmpType,  amNone,      amNone,      amNone,      amNone      },
         { ImageType::jp2,  newJp2Instance,  isJp2Type,  amReadWrite, amReadWrite, amReadWrite, amNone      },
+        { ImageType::jxl,  newJxlInstance,  isJxlType,  amNone,      amNone,      amNone,      amNone      },
 #ifdef EXV_ENABLE_BMFF
         { ImageType::bmff, newBmffInstance, isBmffType, amRead,      amRead,      amRead,      amNone      },
 #endif // EXV_ENABLE_BMFF
diff --git a/src/jxlimage.cpp b/src/jxlimage.cpp
new file mode 100644
index 0000000000..ebfa7acd4c
--- /dev/null
+++ b/src/jxlimage.cpp
@@ -0,0 +1,129 @@
+// ***************************************************************** -*- C++ -*-
+/*
+ * Copyright (C) 2004-2023 Exiv2 authors
+ * This program is part of the Exiv2 distribution.
+ *
+ * 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 2
+ * 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, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
+ */
+/*
+  File:      jxlimage.cpp
+  Author(s): antermin
+  History:   09-Mar-2023, antermin: created
+ */
+// *****************************************************************************
+// included header files
+#include "config.h"
+
+#include "basicio.hpp"
+#include "jxlimage.hpp"
+#include "jxlimage_int.hpp"
+#include "error.hpp"
+#include "futils.hpp"
+#include "helper_functions.hpp"
+#include "image.hpp"
+
+// + standard includes
+#include <cstring>
+#include <iostream>
+#include <string>
+
+namespace Exiv2
+{
+    JxlImage::JxlImage(BasicIo::AutoPtr io) : Image(ImageType::jxl, mdNone, io)
+    {
+    }
+
+    std::string JxlImage::mimeType() const
+    {
+        return "image/jxl";
+    }
+
+    void JxlImage::setExifData(const ExifData& /*exifData*/)
+    {
+        // not supported for JXL bare codestream
+        throw(Error(kerInvalidSettingForImage, "Exif metadata", "JXL"));
+    }
+
+    void JxlImage::setIptcData(const IptcData& /*iptcData*/)
+    {
+        // not supported for JXL bare codestream
+        throw(Error(kerInvalidSettingForImage, "IPTC metadata", "JXL"));
+    }
+
+    void JxlImage::setComment(const std::string& /*comment*/)
+    {
+        // not supported
+        throw(Error(kerInvalidSettingForImage, "Image comment", "JXL"));
+    }
+
+    void JxlImage::readMetadata()
+    {
+#ifdef EXIV2_DEBUG_MESSAGES
+        std::cerr << "Exiv2::JxlImage::readMetadata: Reading JXL bare codestream file " << io_->path() << "\n";
+#endif
+        if (io_->open() != 0) {
+            throw Error(kerDataSourceOpenFailed, io_->path(), strError());
+        }
+        IoCloser closer(*io_);
+        // Ensure that this is the correct image type
+        if (!isJxlType(*io_, false)) {
+            if (io_->error() || io_->eof()) throw Error(kerFailedToReadImageData);
+            throw Error(kerNotAnImage, "JXL");
+        }
+        clearMetadata();
+
+        DataBuf data(11); // Takes up to 11 bytes to parse width and height
+        if (io_->read(data.pData_, data.size_)) {
+            Internal::JxlStream jxlstream;
+            jxlstream.databits = getUint64_t(data);
+            Internal::parseJxlDimensions(&jxlstream, false); // false: !nosig
+            pixelHeight_ = jxlstream.height;
+            pixelWidth_ = jxlstream.width;
+        }
+    }
+
+    void JxlImage::writeMetadata()
+    {
+        // Todo: implement me!
+        throw(Error(kerWritingImageFormatUnsupported, "JXL"));
+    }
+
+    // *************************************************************************
+    // free functions
+    Image::AutoPtr newJxlInstance(BasicIo::AutoPtr io, bool /*create*/)
+    {
+        Image::AutoPtr image(new JxlImage(io));
+        if (!image->good()) {
+            image.reset();
+        }
+        return image;
+    }
+
+    bool isJxlType(BasicIo& iIo, bool advance)
+    {
+        const int32_t len = 2;
+        const unsigned char JxlImageId[2] = { 0xFF, 0x0A };
+        byte buf[len];
+        iIo.read(buf, len);
+        if (iIo.error() || iIo.eof()) {
+            return false;
+        }
+        bool matched = (memcmp(buf, JxlImageId, len) == 0);
+        if (!advance || !matched) {
+            iIo.seek(-len, BasicIo::cur);
+        }
+        return matched;
+    }
+}
diff --git a/src/jxlimage_int.cpp b/src/jxlimage_int.cpp
new file mode 100644
index 0000000000..eaa535f93a
--- /dev/null
+++ b/src/jxlimage_int.cpp
@@ -0,0 +1,69 @@
+#include "jxlimage_int.hpp"
+
+#include <cassert>
+
+#include "error.hpp"
+#include "types.hpp"
+
+namespace Exiv2 {
+namespace Internal {
+    uint64_t JxlStream::getBits(int length) {
+        uint64_t bitmask = (1 << length) -1;
+        uint64_t value = (databits >> position) & bitmask;
+        position += length; //advance position after getting bits
+        return value;
+    }
+
+    uint64_t JxlStream::readU32(int c0, int u0, int c1, int u1, int c2, int u2, int c3, int u3) {
+        int dist = getBits(2);
+        int c[] = {c0, c1, c2, c3};
+        int u[] = {u0, u1, u2, u3};
+        return c[dist] + getBits(u[dist]);
+    }
+
+    void parseJxlDimensions(JxlStream *stream, bool nosig) {
+            if (nosig) { // stream has no signature, no need to skip
+                stream->position = 0;
+            } else { // stream has signature, we need to skip
+                stream->position = 16;
+            }
+
+            int div8 = stream->getBits(1);
+            if (div8) {
+                stream->height = (1 + stream->getBits(5)) << 3; // multiply 8
+            } else {
+                stream->height = stream->readU32(1, 9, 1, 13, 1, 18, 1, 30);
+            }
+            int ratio = stream->getBits(3);
+            if ((div8) && (!ratio)) {
+                stream->width = (1 + stream->getBits(5)) << 3; // multiply 8
+            } else if (!ratio) {
+                stream->width = stream->readU32(1, 9, 1, 13, 1, 18, 1, 30);
+            } else {
+                switch (ratio) {
+                    case 1:
+                        stream->width = stream->height;
+                        break;
+                    case 2:
+                        stream->width = (stream->height * 12) / 10;
+                        break;
+                    case 3:
+                        stream->width = (stream->height * 4) / 3;
+                        break;
+                    case 4:
+                        stream->width = (stream->height * 3) / 2;
+                        break;
+                    case 5:
+                        stream->width = (stream->height * 16) / 9;
+                        break;
+                    case 6:
+                        stream->width = (stream->height * 5) / 4;
+                        break;
+                    case 7:
+                        stream->width = (stream->height * 2);
+                        break;
+                }
+            }
+    }
+}
+}
diff --git a/src/jxlimage_int.hpp b/src/jxlimage_int.hpp
new file mode 100644
index 0000000000..05c7e2d280
--- /dev/null
+++ b/src/jxlimage_int.hpp
@@ -0,0 +1,23 @@
+#ifndef JXLIMAGE_INT_HPP
+#define JXLIMAGE_INT_HPP
+
+#include <stdint.h>
+#include <vector>
+
+namespace Exiv2 {
+    namespace Internal {
+        class JxlStream {
+            public:
+                uint64_t databits;
+                int position;
+                uint64_t width;
+                uint64_t height;
+                uint64_t getBits(int);
+                uint64_t readU32(int, int, int, int, int, int, int, int);
+        }; // class JxlStream
+
+        void parseJxlDimensions(JxlStream *stream, bool nosig);
+    }  // namespace Internal
+}  // namespace Exiv2
+
+#endif  // JXLIMAGE_INT_HPP

From 9280d1aff07367693a70391cef3dba336e444011 Mon Sep 17 00:00:00 2001
From: antermin <103918092+antermin@users.noreply.github.com>
Date: Tue, 4 Apr 2023 17:01:49 +0900
Subject: [PATCH 3/3] Experimental jxlp and jxlc support

---
 include/exiv2/bmffimage.hpp |  1 +
 src/bmffimage.cpp           | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/include/exiv2/bmffimage.hpp b/include/exiv2/bmffimage.hpp
index 9db10652ea..630cb3e4d2 100644
--- a/include/exiv2/bmffimage.hpp
+++ b/include/exiv2/bmffimage.hpp
@@ -180,6 +180,7 @@ namespace Exiv2
         bool        superBox(uint32_t box);
         bool        fullBox(uint32_t box);
         std::string uuidName(Exiv2::DataBuf& uuid);
+        bool        hasJxlHeader(Exiv2::DataBuf& jxlpdata);
 
     };  // class BmffImage
 
diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
index ce36428946..7df8f2d351 100644
--- a/src/bmffimage.cpp
+++ b/src/bmffimage.cpp
@@ -30,9 +30,11 @@
 #include "error.hpp"
 #include "enforce.hpp"
 #include "futils.hpp"
+#include "helper_functions.hpp"
 #include "image.hpp"
 #include "image_int.hpp"
 #include "safe_op.hpp"
+#include "jxlimage_int.hpp"
 #include "tiffimage.hpp"
 #include "tiffimage_int.hpp"
 #include "types.hpp"
@@ -57,6 +59,8 @@
 #define TAG_mif1 0x6d696631 /**< "mif1" HEIF */
 #define TAG_crx  0x63727820 /**< "crx " Canon CR3 */
 #define TAG_jxl  0x6a786c20 /**< "jxl " JPEG XL file type */
+#define TAG_jxlc 0x6a786c63 /**< "jxlc" JPEG XL codestream */
+#define TAG_jxlp 0x6a786c70 /**< "jxlp" JPEG XL partial codestream */
 #define TAG_moov 0x6d6f6f76 /**< "moov" Movie */
 #define TAG_meta 0x6d657461 /**< "meta" Metadata */
 #define TAG_mdat 0x6d646174 /**< "mdat" Media data */
@@ -191,6 +195,12 @@ namespace Exiv2
         return result;
     }
 
+    bool BmffImage::hasJxlHeader(Exiv2::DataBuf& jxlpdata)
+    {
+        const char* JxlHeader = "\x00\x00\x00\x00\xFF\x0A";
+        return (std::memcmp(jxlpdata.pData_, JxlHeader, 6) == 0 ? true : false);
+    }
+
     long BmffImage::boxHandler(std::ostream& out /* = std::cout*/ ,
                                Exiv2::PrintStructureOption option /* = kpsNone */,
                                const long pbox_end,
@@ -509,6 +519,28 @@ namespace Exiv2
                         break;
                 }
                 break;
+            case TAG_jxlp: {
+                DataBuf sig(6); // 4 bytes padding + 2 bytes sig
+                io_->read(sig.pData_, sig.size_);
+                if (hasJxlHeader(sig)) {
+                    DataBuf streamdata(9); // Max 11 bytes - 2 bytes sig
+                    io_->read(streamdata.pData_, streamdata.size_);
+                    Internal::JxlStream jxlstream;
+                    jxlstream.databits = getUint64_t(streamdata);
+                    Internal::parseJxlDimensions(&jxlstream, true); // true: nosig
+                    pixelHeight_ = jxlstream.height;
+                    pixelWidth_ = jxlstream.width;
+                }
+            } break;
+            case TAG_jxlc: {
+                DataBuf streamdata(11);
+                io_->read(streamdata.pData_, streamdata.size_);
+                Internal::JxlStream jxlstream;
+                jxlstream.databits = getUint64_t(streamdata);
+                Internal::parseJxlDimensions(&jxlstream, false); // false: !nosig
+                pixelHeight_ = jxlstream.height;
+                pixelWidth_ = jxlstream.width;
+            } break;
 
             default: break ; /* do nothing */
         }

Places

File _service:download_files:8548627..9280d1a.patch of Package exiv2 (Revision 53449015ee945eadc5d1c7ec2b2c3919)

Places