apply clang-format

src/bmp.imageio/bmpinput.cpp

@@ -6,6 +6,7 @@
 
 #include <OpenImageIO/filesystem.h>
 #include <OpenImageIO/imageio.h>
+#include <OpenImageIO/memory.h>
 
 #include "bmp_pvt.h"
 
@@ -30,6 +31,8 @@ class BmpInput final : public ImageInput {
     bool close(void) override;
     bool read_native_scanline(int subimage, int miplevel, int y, int z,
                               void* data) override;
+    size_t datasize() const override;
+    size_t footprint() const override;
 
 private:
     int64_t m_padded_scanline_size;
@@ -553,4 +556,25 @@ BmpInput::color_table_is_all_gray(void)
     return true;
 }
 
+
+
+size_t
+BmpInput::datasize() const
+{
+    size_t size = ImageInput::datasize();
+    size += m_filename.capacity();
+    size += vector_bytes(m_colortable);
+    size += vector_bytes(fscanline);
+    size += vector_bytes(m_uncompressed);
+    return size;
+}
+
+
+
+size_t
+BmpInput::footprint() const
+{
+    return sizeof(BmpInput) + datasize();
+}
+
 OIIO_PLUGIN_NAMESPACE_END

src/include/OpenImageIO/imagecache.h

@@ -257,6 +257,8 @@ class OIIO_API ImageCache {
     ///           all files referenced by calls to the ImageCache. (The
     ///           array is of `ustring` or `char*`.)
     ///
+    /// - `int64 stat:cache_footprint` :
+    ///           Total bytes used by image cache.
     /// - `int64 stat:cache_memory_used` :
     ///           Total bytes used by tile cache.
     ///

src/include/OpenImageIO/imageio.h

@@ -1783,6 +1783,14 @@ class OIIO_API ImageInput {
     /// `ImageInput*`.
     typedef ImageInput* (*Creator)();
 
+    /// Return the total heap memory allocated by the ImageInput and its
+    /// members.
+    virtual size_t datasize() const;
+
+    /// Return the total memory used by the ImageInput, including this
+    /// object itself and any heap memory allocated data.
+    virtual size_t footprint() const;
+
 protected:
     ImageSpec m_spec;  // format spec of the current open subimage/MIPlevel
                        // BEWARE using m_spec directly -- not thread-safe

src/libOpenImageIO/formatspec.cpp

@@ -13,9 +13,9 @@
 #include <OpenImageIO/fmath.h>
 #include <OpenImageIO/imagebuf.h>
 #include <OpenImageIO/imageio.h>
+#include <OpenImageIO/memory.h>
 #include <OpenImageIO/strutil.h>
 #include <OpenImageIO/typedesc.h>
-#include <OpenImageIO/memory.h>
 
 #include "exif.h"
 #include "imageio_pvt.h"

src/libOpenImageIO/imageinput.cpp

@@ -48,6 +48,18 @@ class ImageInput::Impl {
     // The "local" proxy that we will create to use if the user didn't
     // supply a proxy for us to use.
     std::unique_ptr<Filesystem::IOProxy> m_io_local;
+
+    size_t datasize() const
+    {
+        /// Note: IOPRoxy and inherited classes do not implement datasize() and
+        /// footprint() yet. We might consider it for a more accurate tracking
+        /// of the memory.
+        size_t size = (m_io ? sizeof(Filesystem::IOProxy) : 0);
+        size += (m_io_local ? sizeof(Filesystem::IOProxy) : 0);
+        return size;
+    }
+
+    size_t footprint() const { return sizeof(ImageInput::Impl) + datasize(); }
 };
 
 
@@ -1337,4 +1349,22 @@ ImageInput::check_open(const ImageSpec& spec, ROI range, uint64_t /*flags*/)
     return true;  // all is ok
 }
 
+
+
+size_t
+ImageInput::datasize() const
+{
+    size_t size = m_spec.datasize();
+    size += (m_impl ? m_impl->footprint() : 0);
+    return size;
+}
+
+
+
+size_t
+ImageInput::footprint() const
+{
+    return sizeof(ImageInput) + datasize();
+}
+
 OIIO_NAMESPACE_END