third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into TestVideoData

Browse Source
This commit is contained in:
Mohamed Ali Chebbi 2023-02-06 09:23:43 +01:00 committed by GitHub
commit 3847a09359
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 10 additions and 346 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/actions.hpp
View File

@ -128,7 +128,6 @@ class TaskFactory {
//! %Print the Exif (or other metadata) of a file to stdout
class Print : public Task {
public:
~Print() override = default;
int run(const std::string& path) override;
Task::UniquePtr clone() const override;
@ -174,7 +173,6 @@ class Print : public Task {
/// @brief %Rename a file to its metadata creation timestamp, in the specified format.
class Rename : public Task {
public:
~Rename() override = default;
int run(const std::string& path) override;
Task::UniquePtr clone() const override;
}; // class Rename
@ -182,7 +180,6 @@ class Rename : public Task {
//! %Adjust the Exif (or other metadata) timestamps
class Adjust : public Task {
public:
~Adjust() override = default;
int run(const std::string& path) override;
Task::UniquePtr clone() const override;
@ -199,7 +196,6 @@ class Adjust : public Task {
/// @brief %Erase the entire exif data or only the thumbnail section.
class Erase : public Task {
public:
~Erase() override = default;
int run(const std::string& path) override;
Task::UniquePtr clone() const override;
@ -228,7 +224,6 @@ class Erase : public Task {
/// @brief %Extract the entire exif data or only the thumbnail section.
class Extract : public Task {
public:
~Extract() override = default;
int run(const std::string& path) override;
Task::UniquePtr clone() const override;
@ -258,7 +253,6 @@ class Extract : public Task {
/// @brief %Insert the Exif data from corresponding *.exv files.
class Insert : public Task {
public:
~Insert() override = default;
int run(const std::string& path) override;
Task::UniquePtr clone() const override;
@ -285,8 +279,6 @@ class Insert : public Task {
/// @brief %Modify the Exif data according to the commands in the modification table.
class Modify : public Task {
public:
Modify() = default;
~Modify() override = default;
int run(const std::string& path) override;
Task::UniquePtr clone() const override;
//! Apply modification commands to the \em pImage, return 0 if successful.
@ -306,7 +298,6 @@ class Modify : public Task {
/// @brief %Copy ISO settings from any of the Nikon makernotes to the regular Exif tag, Exif.Photo.ISOSpeedRatings.
class FixIso : public Task {
public:
~FixIso() override = default;
int run(const std::string& path) override;
Task::UniquePtr clone() const override;
@ -319,7 +310,6 @@ class FixIso : public Task {
/// Decodes the comment using the auto-detected or specified character encoding and writes it back in UCS-2.
class FixCom : public Task {
public:
~FixCom() override = default;
int run(const std::string& path) override;
Task::UniquePtr clone() const override;

8
include/exiv2/asfvideo.hpp
View File

@ -37,14 +37,6 @@ class EXIV2API AsfVideo : public Image {
explicit AsfVideo(BasicIo::UniquePtr io);
//@}
//! @name NOT Implemented
//@{
//! Copy constructor
AsfVideo(const AsfVideo&) = delete;
//! Assignment operator
AsfVideo& operator=(const AsfVideo&) = delete;
//@}
//! @name Manipulators
//@{
void readMetadata() override;

14
include/exiv2/basicio.hpp
View File

@ -924,13 +924,6 @@ class EXIV2API HttpIo : public RemoteIo {
*/
explicit HttpIo(const std::string& url, size_t blockSize = 1024);
~HttpIo() override = default;
// NOT IMPLEMENTED
//! Copy constructor
HttpIo(const HttpIo&) = delete;
//! Assignment operator
HttpIo& operator=(const HttpIo&) = delete;
private:
// Pimpl idiom
class HttpImpl;
@ -969,13 +962,6 @@ class EXIV2API CurlIo : public RemoteIo {
*/
size_t write(BasicIo& src) override;
~CurlIo() override = default;
// NOT IMPLEMENTED
//! Copy constructor
CurlIo(const CurlIo&) = delete;
//! Assignment operator
CurlIo& operator=(const CurlIo&) = delete;
protected:
// Pimpl idiom
class CurlImpl;

9
include/exiv2/bmpimage.hpp
View File

@ -26,15 +26,6 @@ namespace Exiv2 {
*/
class EXIV2API BmpImage : public Image {
public:
~BmpImage() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
BmpImage(const BmpImage&) = delete;
//! Assignment operator
BmpImage& operator=(const BmpImage&) = delete;
//@}
//! @name Creators
//@{
/*!

10
include/exiv2/cr2image.hpp
View File

@ -70,16 +70,6 @@ class EXIV2API Cr2Image : public Image {
[[nodiscard]] uint32_t pixelWidth() const override;
[[nodiscard]] uint32_t pixelHeight() const override;
//@}
~Cr2Image() override = default;
//! @name NOT implemented
//@{
//! Copy constructor
Cr2Image(const Cr2Image&) = delete;
//! Assignment operator
Cr2Image& operator=(const Cr2Image&) = delete;
//@}
}; // class Cr2Image
/*!

10
include/exiv2/crwimage.hpp
View File

@ -72,16 +72,6 @@ class EXIV2API CrwImage : public Image {
[[nodiscard]] uint32_t pixelWidth() const override;
[[nodiscard]] uint32_t pixelHeight() const override;
//@}
~CrwImage() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
CrwImage(const CrwImage&) = delete;
//! Assignment operator
CrwImage& operator=(const CrwImage&) = delete;
//@}
}; // class CrwImage
/*!

6
include/exiv2/datasets.hpp
View File

@ -132,12 +132,6 @@ class EXIV2API IptcDataSets {
static constexpr uint16_t Preview = 202;
//@}
~IptcDataSets() = delete;
//! Prevent copy-construction: not implemented.
IptcDataSets(const IptcDataSets&) = delete;
//! Prevent assignment: not implemented.
IptcDataSets& operator=(const IptcDataSets&) = delete;
/*!
@brief Return the name of the dataset.
@param number The dataset number

10
include/exiv2/epsimage.hpp
View File

@ -72,16 +72,6 @@ class EXIV2API EpsImage : public Image {
//@{
[[nodiscard]] std::string mimeType() const override;
//@}
~EpsImage() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
EpsImage(const EpsImage&) = delete;
//! Assignment operator
EpsImage& operator=(const EpsImage&) = delete;
//@}
}; // class EpsImage
// *****************************************************************************

9
include/exiv2/gifimage.hpp
View File

@ -21,15 +21,6 @@ namespace Exiv2 {
*/
class EXIV2API GifImage : public Image {
public:
~GifImage() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
GifImage(const GifImage&) = delete;
//! Assignment operator
GifImage& operator=(const GifImage&) = delete;
//@}
//! @name Creators
//@{
/*!

9
include/exiv2/image.hpp
View File

@ -657,15 +657,6 @@ class EXIV2API ImageFactory {
false if the data does not match
*/
static bool checkType(ImageType type, BasicIo& io, bool advance);
//! @name Creators
//@{
~ImageFactory() = delete;
//! Prevent copy construction: not implemented.
ImageFactory(const ImageFactory&) = delete;
ImageFactory& operator=(const ImageFactory&) = delete;
//@}
}; // class ImageFactory
// *****************************************************************************

8
include/exiv2/jp2image.hpp
View File

@ -64,14 +64,6 @@ class EXIV2API Jp2Image : public Image {
[[nodiscard]] std::string mimeType() const override;
//@}
~Jp2Image() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
Jp2Image(const Jp2Image&) = delete;
//! Assignment operator
Jp2Image& operator=(const Jp2Image&) = delete;
private:
/*!
@brief Provides the main implementation of writeMetadata() by

23
include/exiv2/jpgimage.hpp
View File

@ -27,15 +27,6 @@ class EXIV2API JpegBase : public Image {
void printStructure(std::ostream& out, PrintStructureOption option, size_t depth) override;
//@}
~JpegBase() override = default;
//! @name NOT implemented
//@{
//! Copy constructor
JpegBase(const JpegBase&) = delete;
//! Assignment operator
JpegBase& operator=(const JpegBase&) = delete;
//@}
protected:
//! @name Creators
//@{
@ -164,13 +155,6 @@ class EXIV2API JpegImage : public JpegBase {
[[nodiscard]] std::string mimeType() const override;
//@}
~JpegImage() override = default;
// NOT Implemented
//! Copy constructor
JpegImage(const JpegImage&) = delete;
//! Assignment operator
JpegImage& operator=(const JpegImage&) = delete;
protected:
//! @name Accessors
//@{
@ -223,13 +207,6 @@ class EXIV2API ExvImage : public JpegBase {
[[nodiscard]] std::string mimeType() const override;
//@}
~ExvImage() override = default;
// NOT Implemented
//! Copy constructor
ExvImage(const ExvImage&) = delete;
//! Assignment operator
ExvImage& operator=(const ExvImage&) = delete;
protected:
//! @name Accessors
//@{

8
include/exiv2/matroskavideo.hpp
View File

@ -118,14 +118,6 @@ class EXIV2API MatroskaVideo : public Image {
explicit MatroskaVideo(BasicIo::UniquePtr io);
//@}
//! @name NOT Implemented
//@{
//! Copy constructor
MatroskaVideo(const MatroskaVideo&) = delete;
//! Assignment operator
MatroskaVideo& operator=(const MatroskaVideo&) = delete;
//@}
//! @name Manipulators
//@{
void readMetadata() override;

9
include/exiv2/mrwimage.hpp
View File

@ -21,15 +21,6 @@ namespace Exiv2 {
*/
class EXIV2API MrwImage : public Image {
public:
~MrwImage() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
MrwImage(const MrwImage&) = delete;
//! Assignment operator
MrwImage& operator=(const MrwImage&) = delete;
//@}
//! @name Creators
//@{
/*!

9
include/exiv2/orfimage.hpp
View File

@ -21,15 +21,6 @@ namespace Exiv2 {
*/
class EXIV2API OrfImage : public TiffImage {
public:
~OrfImage() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
OrfImage(const OrfImage&) = delete;
//! Assignment operator
OrfImage& operator=(const OrfImage&) = delete;
//@}
//! @name Creators
//@{
/*!

8
include/exiv2/pgfimage.hpp
View File

@ -54,14 +54,6 @@ class EXIV2API PgfImage : public Image {
}
//@}
~PgfImage() override = default;
//! @name NOT implemented
//@{
//! Copy constructor
PgfImage(const PgfImage&) = delete;
//! Assignment operator
PgfImage& operator=(const PgfImage&) = delete;
private:
bool bSwap_; // true for bigEndian hardware, else false
/*!

8
include/exiv2/pngimage.hpp
View File

@ -60,14 +60,6 @@ class EXIV2API PngImage : public Image {
[[nodiscard]] std::string mimeType() const override;
//@}
~PngImage() override = default;
//! @name NOT implemented
//@{
//! Copy constructor
PngImage(const PngImage&) = delete;
//! Assignment operator
PngImage& operator=(const PngImage&) = delete;
private:
/*!
@brief Provides the main implementation of writeMetadata() by

6
include/exiv2/properties.hpp
View File

@ -72,12 +72,6 @@ class EXIV2API XmpProperties {
static const XmpNsInfo* lookupNsRegistryUnsafe(const XmpNsInfo::Prefix& prefix);
public:
~XmpProperties() = delete;
//! Prevent copy-construction: not implemented.
XmpProperties(const XmpProperties&) = delete;
//! Prevent assignment: not implemented.
XmpProperties& operator=(const XmpProperties&) = delete;
/*!
@brief Return the title (label) of the property.
@param key The property key

9
include/exiv2/psdimage.hpp
View File

@ -20,15 +20,6 @@ namespace Exiv2 {
*/
class EXIV2API PsdImage : public Image {
public:
~PsdImage() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
PsdImage(const PsdImage&) = delete;
//! Assignment operator
PsdImage& operator=(const PsdImage&) = delete;
//@}
//! @name Creators
//@{
/*!

8
include/exiv2/quicktimevideo.hpp
View File

@ -55,14 +55,6 @@ class EXIV2API QuickTimeVideo : public Image {
explicit QuickTimeVideo(BasicIo::UniquePtr io);
//@}
//! @name NOT Implemented
//@{
//! Copy constructor
QuickTimeVideo(const QuickTimeVideo&) = delete;
//! Assignment operator
QuickTimeVideo& operator=(const QuickTimeVideo&) = delete;
//@}
//! @name Manipulators
//@{
void readMetadata() override;

10
include/exiv2/rafimage.hpp
View File

@ -73,16 +73,6 @@ class EXIV2API RafImage : public Image {
[[nodiscard]] uint32_t pixelWidth() const override;
[[nodiscard]] uint32_t pixelHeight() const override;
//@}
~RafImage() override = default;
//! @name NOT implemented
//@{
//! Copy constructor
RafImage(const RafImage&) = delete;
//! Assignment operator
RafImage& operator=(const RafImage&) = delete;
//@}
}; // class RafImage
// *****************************************************************************

9
include/exiv2/riffvideo.hpp
View File

@ -31,15 +31,6 @@ class EXIV2API RiffVideo : public Image {
explicit RiffVideo(BasicIo::UniquePtr io);
//@}
//! @name NOT Implemented
//@{
//! Copy constructor
RiffVideo(const RiffVideo&) = delete;
//! Assignment operator
RiffVideo& operator=(const RiffVideo&) = delete;
//@}
//! @name Manipulators
//@{
void readMetadata() override;

10
include/exiv2/rw2image.hpp
View File

@ -71,16 +71,6 @@ class EXIV2API Rw2Image : public Image {
[[nodiscard]] uint32_t pixelWidth() const override;
[[nodiscard]] uint32_t pixelHeight() const override;
//@}
~Rw2Image() override = default;
//! @name NOT implemented
//@{
//! Copy constructor
Rw2Image(const Rw2Image&) = delete;
//! Assignment operator
Rw2Image& operator=(const Rw2Image&) = delete;
//@}
}; // class Rw2Image
/*!

6
include/exiv2/tags.hpp
View File

@ -236,12 +236,6 @@ struct EXIV2API TagInfo {
//! Access to Exif group and tag lists and misc. tag reference methods, implemented as a static class.
class EXIV2API ExifTags {
public:
~ExifTags() = delete;
//! Prevent copy-construction: not implemented.
ExifTags(const ExifTags&) = delete;
//! Prevent assignment: not implemented.
ExifTags& operator=(const ExifTags&) = delete;
//! Return read-only list of built-in groups
static const GroupInfo* groupList();
//! Return read-only list of built-in \em groupName tags.

9
include/exiv2/tgaimage.hpp
View File

@ -20,15 +20,6 @@ namespace Exiv2 {
*/
class EXIV2API TgaImage : public Image {
public:
~TgaImage() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
TgaImage(const TgaImage&) = delete;
//! Assignment operator
TgaImage& operator=(const TgaImage&) = delete;
//@}
//! @name Creators
//@{
/*!

9
include/exiv2/tiffimage.hpp
View File

@ -68,15 +68,6 @@ class EXIV2API TiffImage : public Image {
uint32_t pixelHeight() const override;
//@}
~TiffImage() override = default;
//! @name NOT Implemented
//@{
//! Copy constructor
TiffImage(const TiffImage&) = delete;
//! Assignment operator
TiffImage& operator=(const TiffImage&) = delete;
//@}
private:
//! @name Accessors
//@{

6
include/exiv2/types.hpp
View File

@ -117,12 +117,6 @@ using Blob = std::vector<byte>;
//! Type information lookup functions. Implemented as a static class.
class EXIV2API TypeInfo {
public:
//! Prevent copy-construction: not implemented.
TypeInfo(const TypeInfo&) = delete;
//! Prevent assignment: not implemented.
TypeInfo& operator=(const TypeInfo&) = delete;
~TypeInfo() = delete;
//! Return the name of the type, 0 if unknown.
static const char* typeName(TypeId typeId);
//! Return the type id for a type name

19
include/exiv2/value.hpp
View File

@ -253,8 +253,6 @@ class EXIV2API DataValue : public Value {
DataValue(const byte* buf, size_t len, ByteOrder byteOrder = invalidByteOrder, TypeId typeId = undefined);
~DataValue() override = default;
//! @name Manipulators
//@{
int read(const byte* buf, size_t len, ByteOrder byteOrder = invalidByteOrder) override;
@ -395,8 +393,6 @@ class EXIV2API StringValue : public StringValueBase {
StringValue();
//! Constructor
explicit StringValue(const std::string& buf);
//! Virtual destructor.
~StringValue() override = default;
//@}
//! @name Accessors
@ -429,8 +425,6 @@ class EXIV2API AsciiValue : public StringValueBase {
AsciiValue();
//! Constructor
explicit AsciiValue(const std::string& buf);
//! Virtual destructor.
~AsciiValue() override = default;
//@}
//! @name Manipulators
@ -487,12 +481,6 @@ class EXIV2API CommentValue : public StringValueBase {
//! Charset information lookup functions. Implemented as a static class.
class EXIV2API CharsetInfo {
public:
//! Prevent copy-construction: not implemented.
CharsetInfo(const CharsetInfo&) = delete;
//! Prevent assignment: not implemented.
CharsetInfo& operator=(const CharsetInfo&) = delete;
~CharsetInfo() = delete;
//! Return the name for a charset id
static const char* name(CharsetId charsetId);
//! Return the code for a charset id
@ -515,8 +503,6 @@ class EXIV2API CommentValue : public StringValueBase {
CommentValue();
//! Constructor, uses read(const std::string& comment)
explicit CommentValue(const std::string& comment);
//! Virtual destructor.
~CommentValue() override = default;
//@}
//! @name Manipulators
@ -933,8 +919,6 @@ class EXIV2API DateValue : public Value {
DateValue();
//! Constructor
DateValue(int32_t year, int32_t month, int32_t day);
//! Virtual destructor.
~DateValue() override = default;
//@}
//! Simple Date helper structure
@ -1026,9 +1010,6 @@ class EXIV2API TimeValue : public Value {
TimeValue();
//! Constructor
TimeValue(int32_t hour, int32_t minute, int32_t second = 0, int32_t tzHour = 0, int32_t tzMinute = 0);
//! Virtual destructor.
~TimeValue() override = default;
//@}
//! Simple Time helper structure

7
include/exiv2/webpimage.hpp
View File

@ -54,13 +54,6 @@ class EXIV2API WebPImage : public Image {
[[nodiscard]] std::string mimeType() const override;
//@}
~WebPImage() override = default;
//! Copy constructor
WebPImage(const WebPImage&) = delete;
//! Assignment operator
WebPImage& operator=(const WebPImage&) = delete;
//@}
private:
void doWriteMetadata(BasicIo& outIo);

10
include/exiv2/xmpsidecar.hpp
View File

@ -54,17 +54,7 @@ class EXIV2API XmpSidecar : public Image {
[[nodiscard]] std::string mimeType() const override;
//@}
//! @name NOT Implemented
//@{
~XmpSidecar() override = default;
//! Copy constructor
XmpSidecar(const XmpSidecar&) = delete;
//! Assignment operator
XmpSidecar& operator=(const XmpSidecar&) = delete;
//@}
Exiv2::Dictionary dates_;
}; // class XmpSidecar
// *****************************************************************************

9
src/basicio.cpp
View File

@ -911,8 +911,7 @@ void XPathIo::ReadDataUri(const std::string& path) {
}
#else
XPathIo::XPathIo(const std::string& orgPath) : FileIo(XPathIo::writeDataToFile(orgPath)) {
tempFilePath_ = path();
XPathIo::XPathIo(const std::string& orgPath) : FileIo(XPathIo::writeDataToFile(orgPath)), tempFilePath_(path()) {
}
XPathIo::~XPathIo() {
@ -1384,8 +1383,6 @@ class HttpIo::HttpImpl : public Impl {
HttpImpl(const std::string& url, size_t blockSize);
Exiv2::Uri hostInfo_; //!< the host information extracted from the path
~HttpImpl() override = default;
// METHODS
/*!
@brief Get the length (in bytes) of the remote file.
@ -1416,10 +1413,6 @@ class HttpIo::HttpImpl : public Impl {
@throw Error if it fails.
*/
void writeRemote(const byte* data, size_t size, size_t from, size_t to) override;
// NOT IMPLEMENTED
HttpImpl(const HttpImpl&) = delete; //!< Copy constructor
HttpImpl& operator=(const HttpImpl&) = delete; //!< Assignment
};
HttpIo::HttpImpl::HttpImpl(const std::string& url, size_t blockSize) : Impl(url, blockSize) {

3
src/bmffimage.cpp
View File

@ -181,6 +181,9 @@ class BrotliDecoderWrapper {
BrotliDecoderDestroyInstance(decoder_);
}
BrotliDecoderWrapper(const BrotliDecoderWrapper&) = delete;
BrotliDecoderWrapper& operator=(const BrotliDecoderWrapper&) = delete;
BrotliDecoderState* get() const {
return decoder_;
}

2
src/cr2header_int.hpp
View File

@ -27,8 +27,6 @@ class Cr2Header : public TiffHeaderBase {
//@{
//! Default constructor
explicit Cr2Header(ByteOrder byteOrder = littleEndian);
//! Destructor.
~Cr2Header() override = default;
//@}
//! @name Manipulators

7
src/crwimage_int.hpp
View File

@ -527,13 +527,6 @@ struct CrwMapping {
*/
class CrwMap {
public:
~CrwMap() = delete;
//! @name Not implemented
//@{
CrwMap(const CrwMap&) = delete;
CrwMap& operator=(const CrwMap&) = delete;
//@}
/*!
@brief Decode image metadata from a CRW entry, convert and add it
to the image metadata. This function converts only one CRW

2
src/exif.cpp
View File

@ -97,7 +97,6 @@ class TiffThumbnail : public Thumbnail {
public:
//! Shortcut for a %TiffThumbnail auto pointer.
using UniquePtr = std::unique_ptr<TiffThumbnail>;
~TiffThumbnail() override = default;
//! @name Accessors
//@{
@ -113,7 +112,6 @@ class JpegThumbnail : public Thumbnail {
public:
//! Shortcut for a %JpegThumbnail auto pointer.
using UniquePtr = std::unique_ptr<JpegThumbnail>;
~JpegThumbnail() override = default;
//! @name Accessors
//@{

24
src/makernote_int.hpp
View File

@ -139,8 +139,6 @@ class OlympusMnHeader : public MnHeader {
//@{
//! Default constructor
OlympusMnHeader();
//! Virtual destructor.
~OlympusMnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -168,8 +166,6 @@ class Olympus2MnHeader : public MnHeader {
//@{
//! Default constructor
Olympus2MnHeader();
//! Virtual destructor.
~Olympus2MnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -198,8 +194,6 @@ class OMSystemMnHeader : public MnHeader {
//@{
//! Default constructor
OMSystemMnHeader();
//! Virtual destructor.
~OMSystemMnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -228,8 +222,6 @@ class FujiMnHeader : public MnHeader {
//@{
//! Default constructor
FujiMnHeader();
//! Virtual destructor.
~FujiMnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -262,8 +254,6 @@ class Nikon2MnHeader : public MnHeader {
//@{
//! Default constructor
Nikon2MnHeader();
//! Virtual destructor.
~Nikon2MnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -292,8 +282,6 @@ class Nikon3MnHeader : public MnHeader {
//@{
//! Default constructor
Nikon3MnHeader();
//! Virtual destructor.
~Nikon3MnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -326,8 +314,6 @@ class PanasonicMnHeader : public MnHeader {
//@{
//! Default constructor
PanasonicMnHeader();
//! Virtual destructor.
~PanasonicMnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -356,8 +342,6 @@ class PentaxDngMnHeader : public MnHeader {
//@{
//! Default constructor
PentaxDngMnHeader();
//! Virtual destructor.
~PentaxDngMnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -386,8 +370,6 @@ class PentaxMnHeader : public MnHeader {
//@{
//! Default constructor
PentaxMnHeader();
//! Virtual destructor.
~PentaxMnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -436,8 +418,6 @@ class SigmaMnHeader : public MnHeader {
//@{
//! Default constructor
SigmaMnHeader();
//! Virtual destructor.
~SigmaMnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -467,8 +447,6 @@ class SonyMnHeader : public MnHeader {
//@{
//! Default constructor
SonyMnHeader();
//! Virtual destructor.
~SonyMnHeader() override = default;
//@}
//! @name Manipulators
//@{
@ -497,8 +475,6 @@ class Casio2MnHeader : public MnHeader {
//@{
//! Default constructor
Casio2MnHeader();
//! Virtual destructor.
~Casio2MnHeader() override = default;
//@}
//! @name Manipulators
//@{

2
src/orfimage_int.hpp
View File

@ -22,8 +22,6 @@ class OrfHeader : public TiffHeaderBase {
//@{
//! Default constructor
explicit OrfHeader(ByteOrder byteOrder = littleEndian);
//! Destructor.
~OrfHeader() override = default;
//@}
//! @name Manipulators

7
src/preview.cpp
View File

@ -52,6 +52,9 @@ class Loader {
//! Virtual destructor.
virtual ~Loader() = default;
Loader(const Loader&) = delete;
Loader& operator=(const Loader&) = delete;
//! Loader auto pointer
using UniquePtr = std::unique_ptr<Loader>;
@ -206,10 +209,6 @@ class LoaderTiff : public Loader {
public:
//! Constructor
LoaderTiff(PreviewId id, const Image& image, int parIdx);
~LoaderTiff() override = default;
LoaderTiff(const LoaderTiff&) = delete;
LoaderTiff& operator=(const LoaderTiff&) = delete;
//! Get properties of a preview image with given params
[[nodiscard]] PreviewProperties getProperties() const override;

2
src/rw2image_int.hpp
View File

@ -22,8 +22,6 @@ class Rw2Header : public TiffHeaderBase {
//@{
//! Default constructor
Rw2Header();
//! Destructor.
~Rw2Header() override = default;
//@}
//! @name Accessors

3
src/tiffcomposite_int.cpp
View File

@ -93,9 +93,6 @@ TiffBinaryArray::TiffBinaryArray(uint16_t tag, IfdId group, const ArraySet* arra
}
TiffBinaryElement::TiffBinaryElement(uint16_t tag, IfdId group) : TiffEntryBase(tag, group) {
elDef_.idx_ = 0;
elDef_.tiffType_ = ttUndefined;
elDef_.count_ = 0;
}
TiffDirectory::~TiffDirectory() {

2
src/tiffcomposite_int.hpp
View File

@ -1491,7 +1491,7 @@ class TiffBinaryElement : public TiffEntryBase {
private:
// DATA
ArrayDef elDef_; //!< The array element definition
ArrayDef elDef_{0, ttUndefined, 0}; //!< The array element definition
ByteOrder elByteOrder_{invalidByteOrder}; //!< Byte order to read/write the element
}; // class TiffBinaryElement

2
src/tiffimage_int.hpp
View File

@ -117,8 +117,6 @@ class TiffHeader : public TiffHeaderBase {
//@{
//! Default constructor
explicit TiffHeader(ByteOrder byteOrder = littleEndian, uint32_t offset = 0x00000008, bool hasImageTags = true);
//! Destructor
~TiffHeader() override = default;
//@}
//@{
//! @name Accessors

5
src/tiffvisitor_int.cpp
View File

@ -449,10 +449,9 @@ TiffEncoder::TiffEncoder(ExifData exifData, const IptcData& iptcData, const XmpD
pRoot_(pRoot),
isNewImage_(isNewImage),
pPrimaryGroups_(pPrimaryGroups),
byteOrder_(pHeader->byteOrder()),
origByteOrder_(byteOrder_),
findEncoderFct_(findEncoderFct) {
byteOrder_ = pHeader->byteOrder();
origByteOrder_ = byteOrder_;
encodeIptc();
encodeXmp();