Skip to content

Commit 1f05448

Browse files
committed
clang-tidy: default member init
Signed-off-by: Rosen Penev <[email protected]>
1 parent 0d971e9 commit 1f05448

File tree

7 files changed

+26
-26
lines changed

7 files changed

+26
-26
lines changed

src/cr2header_int.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "cr2header_int.hpp"
44

55
namespace Exiv2::Internal {
6-
Cr2Header::Cr2Header(ByteOrder byteOrder) : TiffHeaderBase(42, 16, byteOrder, 0x00000010), offset2_(0x00000000) {
6+
Cr2Header::Cr2Header(ByteOrder byteOrder) : TiffHeaderBase(42, 16, byteOrder, 0x00000010) {
77
}
88

99
bool Cr2Header::read(const byte* pData, size_t size) {

src/cr2header_int.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class Cr2Header : public TiffHeaderBase {
4949

5050
private:
5151
// DATA
52-
uint32_t offset2_; //!< Bytes 12-15 from the header
52+
uint32_t offset2_{0x00000000}; //!< Bytes 12-15 from the header
5353
static constexpr auto cr2sig_ = "CR\2\0"; //!< Signature for CR2 type TIFF
5454
}; // class Cr2Header
5555

src/makernote_int.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ size_t FujiMnHeader::sizeOfSignature() {
274274
return sizeof(signature_);
275275
}
276276

277-
FujiMnHeader::FujiMnHeader() : start_(0) {
277+
FujiMnHeader::FujiMnHeader() {
278278
read(signature_, sizeOfSignature(), byteOrder_);
279279
}
280280

@@ -316,7 +316,7 @@ size_t Nikon2MnHeader::sizeOfSignature() {
316316
return sizeof(signature_);
317317
}
318318

319-
Nikon2MnHeader::Nikon2MnHeader() : start_(0) {
319+
Nikon2MnHeader::Nikon2MnHeader() {
320320
read(signature_, sizeOfSignature(), invalidByteOrder);
321321
}
322322

@@ -351,7 +351,7 @@ size_t Nikon3MnHeader::sizeOfSignature() {
351351
return sizeof(signature_);
352352
}
353353

354-
Nikon3MnHeader::Nikon3MnHeader() : byteOrder_(invalidByteOrder), start_(sizeOfSignature()) {
354+
Nikon3MnHeader::Nikon3MnHeader() : start_(sizeOfSignature()) {
355355
buf_.alloc(sizeOfSignature());
356356
std::copy_n(signature_, buf_.size(), buf_.data());
357357
}
@@ -406,7 +406,7 @@ size_t PanasonicMnHeader::sizeOfSignature() {
406406
return sizeof(signature_);
407407
}
408408

409-
PanasonicMnHeader::PanasonicMnHeader() : start_(0) {
409+
PanasonicMnHeader::PanasonicMnHeader() {
410410
read(signature_, sizeOfSignature(), invalidByteOrder);
411411
}
412412

@@ -527,7 +527,7 @@ size_t SigmaMnHeader::sizeOfSignature() {
527527
return sizeof(signature1_);
528528
}
529529

530-
SigmaMnHeader::SigmaMnHeader() : start_(0) {
530+
SigmaMnHeader::SigmaMnHeader() {
531531
read(signature1_, sizeOfSignature(), invalidByteOrder);
532532
}
533533

@@ -561,7 +561,7 @@ size_t SonyMnHeader::sizeOfSignature() {
561561
return sizeof(signature_);
562562
}
563563

564-
SonyMnHeader::SonyMnHeader() : start_(0) {
564+
SonyMnHeader::SonyMnHeader() {
565565
read(signature_, sizeOfSignature(), invalidByteOrder);
566566
}
567567

@@ -596,7 +596,7 @@ size_t Casio2MnHeader::sizeOfSignature() {
596596
return sizeof(signature_);
597597
}
598598

599-
Casio2MnHeader::Casio2MnHeader() : start_(0) {
599+
Casio2MnHeader::Casio2MnHeader() {
600600
read(signature_, sizeOfSignature(), invalidByteOrder);
601601
}
602602

src/makernote_int.hpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ class FujiMnHeader : public MnHeader {
250250
DataBuf header_; //!< Data buffer for the makernote header
251251
static const byte signature_[]; //!< Fujifilm makernote header signature
252252
static const ByteOrder byteOrder_; //!< Byteorder for makernote (always II)
253-
uint32_t start_; //!< Start of the mn IFD rel. to mn start
253+
uint32_t start_{0}; //!< Start of the mn IFD rel. to mn start
254254

255255
}; // class FujiMnHeader
256256

@@ -279,7 +279,7 @@ class Nikon2MnHeader : public MnHeader {
279279

280280
private:
281281
DataBuf buf_; //!< Raw header data
282-
size_t start_; //!< Start of the mn IFD rel. to mn start
282+
size_t start_{0}; //!< Start of the mn IFD rel. to mn start
283283
static const byte signature_[]; //!< Nikon 2 makernote header signature
284284

285285
}; // class Nikon2MnHeader
@@ -311,10 +311,10 @@ class Nikon3MnHeader : public MnHeader {
311311
static size_t sizeOfSignature();
312312

313313
private:
314-
DataBuf buf_; //!< Raw header data
315-
ByteOrder byteOrder_; //!< Byteorder for makernote
316-
size_t start_; //!< Start of the mn IFD rel. to mn start
317-
static const byte signature_[]; //!< Nikon 3 makernote header signature
314+
DataBuf buf_; //!< Raw header data
315+
ByteOrder byteOrder_{invalidByteOrder}; //!< Byteorder for makernote
316+
size_t start_; //!< Start of the mn IFD rel. to mn start
317+
static const byte signature_[]; //!< Nikon 3 makernote header signature
318318

319319
}; // class Nikon3MnHeader
320320

@@ -343,7 +343,7 @@ class PanasonicMnHeader : public MnHeader {
343343

344344
private:
345345
DataBuf buf_; //!< Raw header data
346-
size_t start_; //!< Start of the mn IFD rel. to mn start
346+
size_t start_{0}; //!< Start of the mn IFD rel. to mn start
347347
static const byte signature_[]; //!< Panasonic makernote header signature
348348

349349
}; // class PanasonicMnHeader
@@ -453,7 +453,7 @@ class SigmaMnHeader : public MnHeader {
453453

454454
private:
455455
DataBuf buf_; //!< Raw header data
456-
size_t start_; //!< Start of the mn IFD rel. to mn start
456+
size_t start_{0}; //!< Start of the mn IFD rel. to mn start
457457
static const byte signature1_[]; //!< Sigma makernote header signature 1
458458
static const byte signature2_[]; //!< Sigma makernote header signature 2
459459

@@ -484,7 +484,7 @@ class SonyMnHeader : public MnHeader {
484484

485485
private:
486486
DataBuf buf_; //!< Raw header data
487-
size_t start_; //!< Start of the mn IFD rel. to mn start
487+
size_t start_{0}; //!< Start of the mn IFD rel. to mn start
488488
static const byte signature_[]; //!< Sony makernote header signature
489489

490490
}; // class SonyMnHeader
@@ -515,7 +515,7 @@ class Casio2MnHeader : public MnHeader {
515515

516516
private:
517517
DataBuf buf_; //!< Raw header data
518-
size_t start_; //!< Start of the mn IFD rel. to mn start
518+
size_t start_{0}; //!< Start of the mn IFD rel. to mn start
519519
static const byte signature_[]; //!< Casio makernote header signature
520520
static const ByteOrder byteOrder_; //!< Byteorder for makernote (always big endian)
521521

src/orfimage_int.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "orfimage_int.hpp"
44

55
namespace Exiv2::Internal {
6-
OrfHeader::OrfHeader(ByteOrder byteOrder) : TiffHeaderBase(0x4f52, 8, byteOrder, 0x00000008), sig_(0x4f52) {
6+
OrfHeader::OrfHeader(ByteOrder byteOrder) : TiffHeaderBase(0x4f52, 8, byteOrder, 0x00000008) {
77
}
88

99
bool OrfHeader::read(const byte* pData, size_t size) {

src/orfimage_int.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@ class OrfHeader : public TiffHeaderBase {
3737
//@}
3838
private:
3939
// DATA
40-
uint16_t sig_; //<! The actual magic number
41-
}; // class OrfHeader
40+
uint16_t sig_{0x4f52}; //<! The actual magic number
41+
}; // class OrfHeader
4242

4343
} // namespace Exiv2::Internal
4444

src/tiffimage_int.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -371,15 +371,15 @@ class OffsetWriter {
371371
//! Data structure for the offset list.
372372
struct OffsetData {
373373
//! Default constructor
374-
OffsetData() : origin_(0), byteOrder_(littleEndian) {
374+
OffsetData() {
375375
}
376376
//! Constructor
377377
OffsetData(uint32_t origin, ByteOrder byteOrder) : origin_(origin), byteOrder_(byteOrder) {
378378
}
379379
// DATA
380-
uint32_t origin_; //!< Origin address
381-
uint32_t target_{}; //!< Target address
382-
ByteOrder byteOrder_; //!< Byte order to use to encode target address
380+
uint32_t origin_{0}; //!< Origin address
381+
uint32_t target_{}; //!< Target address
382+
ByteOrder byteOrder_{littleEndian}; //!< Byte order to use to encode target address
383383
};
384384
//! Type of the list containing an identifier and an address pair.
385385
using OffsetList = std::map<OffsetId, OffsetData>;

0 commit comments

Comments
 (0)