Skip to content

Commit 8504a73

Browse files
committed
some non const reference removals
Signed-off-by: Rosen Penev <[email protected]>
1 parent b6b2be5 commit 8504a73

File tree

4 files changed

+12
-10
lines changed

4 files changed

+12
-10
lines changed

src/tiffimage_int.cpp

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2055,9 +2055,10 @@ ByteOrder TiffParserWorker::decode(ExifData& exifData, IptcData& iptcData, XmpDa
20552055

20562056
} // TiffParserWorker::decode
20572057

2058-
WriteMethod TiffParserWorker::encode(BasicIo& io, const byte* pData, size_t size, ExifData& exifData,
2059-
IptcData& iptcData, XmpData& xmpData, uint32_t root, FindEncoderFct findEncoderFct,
2060-
TiffHeaderBase* pHeader, OffsetWriter* pOffsetWriter) {
2058+
WriteMethod TiffParserWorker::encode(BasicIo& io, const byte* pData, size_t size, const ExifData& exifData,
2059+
const IptcData& iptcData, const XmpData& xmpData, uint32_t root,
2060+
FindEncoderFct findEncoderFct, TiffHeaderBase* pHeader,
2061+
OffsetWriter* pOffsetWriter) {
20612062
/*
20622063
1) parse the binary image, if one is provided, and
20632064
2) attempt updating the parsed tree in-place ("non-intrusive writing")

src/tiffimage_int.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ class TiffParserWorker {
221221
writing"). If there is a parsed tree, it is only used to access the
222222
image data in this case.
223223
*/
224-
static WriteMethod encode(BasicIo& io, const byte* pData, size_t size, ExifData& exifData, IptcData& iptcData,
225-
XmpData& xmpData, uint32_t root, FindEncoderFct findEncoderFct, TiffHeaderBase* pHeader,
226-
OffsetWriter* pOffsetWriter);
224+
static WriteMethod encode(BasicIo& io, const byte* pData, size_t size, const ExifData& exifData,
225+
const IptcData& iptcData, const XmpData& xmpData, uint32_t root,
226+
FindEncoderFct findEncoderFct, TiffHeaderBase* pHeader, OffsetWriter* pOffsetWriter);
227227

228228
private:
229229
/*!

src/tiffvisitor_int.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,10 +444,10 @@ void TiffDecoder::visitBinaryElement(TiffBinaryElement* object) {
444444
decodeTiffEntry(object);
445445
}
446446

447-
TiffEncoder::TiffEncoder(ExifData& exifData, IptcData& iptcData, XmpData& xmpData, TiffComponent* pRoot,
447+
TiffEncoder::TiffEncoder(ExifData exifData, const IptcData& iptcData, const XmpData& xmpData, TiffComponent* pRoot,
448448
bool isNewImage, PrimaryGroups pPrimaryGroups, const TiffHeaderBase* pHeader,
449449
FindEncoderFct findEncoderFct) :
450-
exifData_(exifData),
450+
exifData_(std::move(exifData)),
451451
iptcData_(iptcData),
452452
xmpData_(xmpData),
453453
pHeader_(pHeader),

src/tiffvisitor_int.hpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -349,8 +349,9 @@ class TiffEncoder : public TiffVisitor {
349349
to, the image with the metadata to encode and a function to
350350
find special encoders.
351351
*/
352-
TiffEncoder(ExifData& exifData, IptcData& iptcData, XmpData& xmpData, TiffComponent* pRoot, bool isNewImage,
353-
PrimaryGroups pPrimaryGroups, const TiffHeaderBase* pHeader, FindEncoderFct findEncoderFct);
352+
TiffEncoder(ExifData exifData, const IptcData& iptcData, const XmpData& xmpData, TiffComponent* pRoot,
353+
bool isNewImage, PrimaryGroups pPrimaryGroups, const TiffHeaderBase* pHeader,
354+
FindEncoderFct findEncoderFct);
354355
TiffEncoder(const TiffEncoder&) = delete;
355356
TiffEncoder& operator=(const TiffEncoder&) = delete;
356357
//! Virtual destructor

0 commit comments

Comments
 (0)