Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Export QuickTimeVideo #2479

Merged
merged 1 commit into from
Jan 27, 2023
Merged

Export QuickTimeVideo #2479

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion include/exiv2/asfvideo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,13 @@
// included header files
#include "image.hpp"

// *****************************************************************************
// namespace extensions
namespace Exiv2 {

// *****************************************************************************
// class definitions

/*!
@brief Class to access ASF video files.
*/
Expand All @@ -56,7 +59,10 @@ class EXIV2API AsfVideo : public Image {
method to get a temporary reference.
*/
explicit AsfVideo(BasicIo::UniquePtr io);
//@}

//! @name NOT Implemented
//@{
//! Copy constructor
AsfVideo(const AsfVideo&) = delete;
//! Assignment operator
Expand All @@ -71,7 +77,7 @@ class EXIV2API AsfVideo : public Image {

//! @name Accessors
//@{
std::string mimeType() const override;
[[nodiscard]] std::string mimeType() const override;
//@}
private:
static constexpr size_t ASF_TAG_SIZE = 0x4;
Expand Down
7 changes: 7 additions & 0 deletions include/exiv2/matroskavideo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,10 @@ class EXIV2API MatroskaVideo : public Image {
method to get a temporary reference.
*/
explicit MatroskaVideo(BasicIo::UniquePtr io);
//@}

//! @name NOT Implemented
//@{
//! Copy constructor
MatroskaVideo(const MatroskaVideo&) = delete;
//! Assignment operator
Expand Down Expand Up @@ -184,6 +187,10 @@ class EXIV2API MatroskaVideo : public Image {
}; // class MatroskaVideo

// *****************************************************************************
// 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 MatroskaVideo instance and return an auto-pointer to it.
Caller owns the returned object and the auto-pointer ensures that
Expand Down
16 changes: 8 additions & 8 deletions include/exiv2/quicktimevideo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
#ifndef QUICKTIMEVIDEO_HPP
#define QUICKTIMEVIDEO_HPP
#ifndef QUICKTIMEVIDEO_HPP_
#define QUICKTIMEVIDEO_HPP_

// *****************************************************************************
#include "exiv2lib_export.h"
Expand All @@ -37,7 +37,7 @@ namespace Exiv2 {
/*!
@brief Class to access QuickTime video files.
*/
class QuickTimeVideo : public Image {
class EXIV2API QuickTimeVideo : public Image {
public:
//! @name Creators
//@{
Expand All @@ -52,7 +52,7 @@ class QuickTimeVideo : public Image {
instance after it is passed to this method. Use the Image::io()
method to get a temporary reference.
*/
QuickTimeVideo(BasicIo::UniquePtr io);
explicit QuickTimeVideo(BasicIo::UniquePtr io);
//@}

//! @name NOT Implemented
Expand All @@ -71,7 +71,7 @@ class QuickTimeVideo : public Image {

//! @name Accessors
//@{
std::string mimeType() const override;
[[nodiscard]] std::string mimeType() const override;
//@}

protected:
Expand Down Expand Up @@ -227,11 +227,11 @@ class QuickTimeVideo : public Image {
Caller owns the returned object and the auto-pointer ensures that
it will be deleted.
*/
Image::UniquePtr newQTimeInstance(BasicIo::UniquePtr io, bool create);
EXIV2API Image::UniquePtr newQTimeInstance(BasicIo::UniquePtr io, bool create);

//! Check if the file iIo is a Quick Time Video.
bool isQTimeType(BasicIo& iIo, bool advance);
EXIV2API bool isQTimeType(BasicIo& iIo, bool advance);

} // namespace Exiv2

#endif // QUICKTIMEVIDEO_HPP
#endif // QUICKTIMEVIDEO_HPP_
12 changes: 7 additions & 5 deletions include/exiv2/riffvideo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* asize_t with this program; if not, write to the Free Software
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
*/
#ifndef RIFFVIDEO_HPP
#define RIFFVIDEO_HPP
#ifndef RIFFVIDEO_HPP_
#define RIFFVIDEO_HPP_

// *****************************************************************************
#include "exiv2lib_export.h"
Expand Down Expand Up @@ -53,12 +53,14 @@ class EXIV2API RiffVideo : public Image {
method to get a temporary reference.
*/
explicit RiffVideo(BasicIo::UniquePtr io);
//@}

//! @name NOT Implemented
//@{
//! Copy constructor
RiffVideo(const RiffVideo&) = delete;
//! Assignment operator
RiffVideo& operator=(const RiffVideo&) = delete;

//@}

//! @name Manipulators
Expand Down Expand Up @@ -204,4 +206,4 @@ EXIV2API bool isRiffType(BasicIo& iIo, bool advance);

} // namespace Exiv2

#endif // RIFFVIDEO_HPP
#endif // RIFFVIDEO_HPP_