fix(video) clang-format quicktimevideo

include/exiv2/quicktimevideo.hpp

@@ -34,11 +34,10 @@ namespace Exiv2 {
 // *****************************************************************************
 // class definitions
 
-    /*!
+/*!
   @brief Class to access QuickTime video files.
  */
-    class QuickTimeVideo:public Image
+class QuickTimeVideo : public Image {
-    {
  public:
   //! @name Creators
   //@{
@@ -81,7 +80,7 @@ namespace Exiv2 {
     @param buf Data buffer which cotains tag ID.
     @param size Size of the data block used to store Tag Information.
    */
-        void tagDecoder(Exiv2::DataBuf & buf, unsigned long size);
+  void tagDecoder(Exiv2::DataBuf& buf, uint64_t size);
 
  private:
   /*!
@@ -89,37 +88,37 @@ namespace Exiv2 {
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void fileTypeDecoder(unsigned long size);
+  void fileTypeDecoder(uint64_t size);
   /*!
     @brief Interpret Media Header Tag, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void mediaHeaderDecoder(unsigned long size);
+  void mediaHeaderDecoder(uint64_t size);
   /*!
     @brief Interpret Video Header Tag, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void videoHeaderDecoder(unsigned long size);
+  void videoHeaderDecoder(uint64_t size);
   /*!
     @brief Interpret Movie Header Tag, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void movieHeaderDecoder(unsigned long size);
+  void movieHeaderDecoder(uint64_t size);
   /*!
     @brief Interpret Track Header Tag, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void trackHeaderDecoder(unsigned long size);
+  void trackHeaderDecoder(uint64_t size);
   /*!
     @brief Interpret Handler Tag, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void handlerDecoder(unsigned long size);
+  void handlerDecoder(uint64_t size);
   /*!
     @brief Interpret Tag which contain other sub-tags,
         and save it in the respective XMP container.
@@ -130,7 +129,7 @@ namespace Exiv2 {
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void sampleDesc(unsigned long size);
+  void sampleDesc(uint64_t size);
   /*!
     @brief Interpret Image Description Tag, and save it
         in the respective XMP container.
@@ -141,37 +140,37 @@ namespace Exiv2 {
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void userDataDecoder(unsigned long size);
+  void userDataDecoder(uint64_t size);
   /*!
     @brief Interpret Preview Tag, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void previewTagDecoder(unsigned long size);
+  void previewTagDecoder(uint64_t size);
   /*!
     @brief Interpret Meta Keys Tags, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void keysTagDecoder(unsigned long size);
+  void keysTagDecoder(uint64_t size);
   /*!
     @brief Interpret Track Aperture Tags, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void trackApertureTagDecoder(unsigned long size);
+  void trackApertureTagDecoder(uint64_t size);
   /*!
     @brief Interpret Nikon Tag, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void NikonTagsDecoder(unsigned long size);
+  void NikonTagsDecoder(uint64_t size);
   /*!
     @brief Interpret Tags from Different Camera make, and save it
         in the respective XMP container.
     @param size Size of the data block used to store Tag Information.
    */
-        void CameraTagsDecoder(unsigned long size);
+  void CameraTagsDecoder(uint64_t size);
   /*!
     @brief Interpret Audio Description Tag, and save it
         in the respective XMP container.
@@ -192,7 +191,7 @@ namespace Exiv2 {
         be skipped and not decoded.
     @param size Size of the data block that is to skipped.
    */
-        void discard(unsigned long size);
+  void discard(uint64_t size);
   /*!
     @brief Calculates Aspect Ratio of a video, and stores it in the
         respective XMP container.
@@ -218,22 +217,22 @@ namespace Exiv2 {
   //! Variable to store height and width of a video frame.
   uint64_t height_, width_;
 
-    }; //QuickTimeVideo End
+};  // QuickTimeVideo End
 
 // *****************************************************************************
 // template, inline and free functions
 
-    // These could be static private functions on Image subclasses but then
+// These could be static private functions on Image subclasses but then
-    // ImageFactory needs to be made a friend.
+// ImageFactory needs to be made a friend.
-    /*!
+/*!
   @brief Create a new QuicktimeVideo instance and return an auto-pointer to it.
       Caller owns the returned object and the auto-pointer ensures that
       it will be deleted.
  */
-    Image::UniquePtr newQTimeInstance(BasicIo::UniquePtr io, bool create);
+Image::UniquePtr newQTimeInstance(BasicIo::UniquePtr io, bool create);
 
-    //! Check if the file iIo is a Quick Time Video.
+//! Check if the file iIo is a Quick Time Video.
-    bool isQTimeType(BasicIo& iIo, bool advance);
+bool isQTimeType(BasicIo& iIo, bool advance);
 
 }  // namespace Exiv2
 

src/image.cpp

@@ -29,6 +29,7 @@
 #include "orfimage.hpp"
 #include "pgfimage.hpp"
 #include "psdimage.hpp"
+#include "quicktimevideo.hpp"
 #include "rafimage.hpp"
 #include "rw2image.hpp"
 #include "tags_int.hpp"
@@ -36,7 +37,6 @@
 #include "tiffimage.hpp"
 #include "webpimage.hpp"
 #include "xmpsidecar.hpp"
-#include "quicktimevideo.hpp"
 
 // + standard includes
 #include <array>
@@ -99,7 +99,7 @@ constexpr auto registry = std::array{
     Registry{ImageType::jp2, newJp2Instance, isJp2Type, amReadWrite, amReadWrite, amReadWrite, amNone},
     // needs to be before bmff because some ftyp files are handled as qt and
     // the rest should fall through to bmff
-    Registry{ ImageType::qtime,newQTimeInstance,isQTimeType,amRead,amNone, amRead, amNone},
+    Registry{ImageType::qtime, newQTimeInstance, isQTimeType, amRead, amNone, amRead, amNone},
 #ifdef EXV_ENABLE_BMFF
     Registry{ImageType::bmff, newBmffInstance, isBmffType, amRead, amRead, amRead, amNone},
 #endif  // EXV_ENABLE_BMFF