Skip to content

Commit a86bc38

Browse files
nehebneheb
committed
reference conversions
There's no nullptr here. Signed-off-by: Rosen Penev <[email protected]>
1 parent 48f848f commit a86bc38

File tree

8 files changed

+29
-29
lines changed

8 files changed

+29
-29
lines changed

‎include/exiv2/photoshop.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,16 @@ struct EXIV2API Photoshop {
4747
/// @return 0 if successful;<BR>
4848
/// 3 if no data for psTag was found in pPsData;<BR>
4949
/// -2 if the pPsData buffer does not contain valid data.
50-
static int locateIrb(const byte* pPsData, size_t sizePsData, uint16_t psTag, const byte** record, uint32_t* sizeHdr,
51-
uint32_t* sizeData);
50+
static int locateIrb(const byte* pPsData, size_t sizePsData, uint16_t psTag, const byte** record, uint32_t& sizeHdr,
51+
uint32_t& sizeData);
5252

5353
/// @brief Forwards to locateIrb() with \em psTag = \em iptc_
54-
static int locateIptcIrb(const byte* pPsData, size_t sizePsData, const byte** record, uint32_t* sizeHdr,
55-
uint32_t* sizeData);
54+
static int locateIptcIrb(const byte* pPsData, size_t sizePsData, const byte** record, uint32_t& sizeHdr,
55+
uint32_t& sizeData);
5656

5757
/// @brief Forwards to locatePreviewIrb() with \em psTag = \em preview_
58-
static int locatePreviewIrb(const byte* pPsData, size_t sizePsData, const byte** record, uint32_t* sizeHdr,
59-
uint32_t* sizeData);
58+
static int locatePreviewIrb(const byte* pPsData, size_t sizePsData, const byte** record, uint32_t& sizeHdr,
59+
uint32_t& sizeData);
6060

6161
/// @brief Set the new IPTC IRB, keeps existing IRBs but removes the IPTC block if there is no new IPTC data to write.
6262
/// @param pPsData Existing IRB buffer

‎samples/largeiptc-test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ int main(int argc, char* const argv[]) {
5252
const Exiv2::byte* record;
5353
uint32_t sizeHdr = 0;
5454
uint32_t sizeData = 0;
55-
Exiv2::Photoshop::locateIptcIrb(irb.data(), irb.size(), &record, &sizeHdr, &sizeData);
55+
Exiv2::Photoshop::locateIptcIrb(irb.data(), irb.size(), &record, sizeHdr, sizeData);
5656
Exiv2::DataBuf rawIptc = Exiv2::IptcParser::encode(iptcData);
5757
std::cout << "Comparing IPTC and IRB size... ";
5858
if (static_cast<uint32_t>(rawIptc.size()) != sizeData) {

‎src/jpgimage.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ void JpegBase::readMetadata() {
264264
uint32_t sizeHdr = 0;
265265
const byte* pCur = &psBlob[0];
266266
const byte* pEnd = pCur + psBlob.size();
267-
while (pCur < pEnd && 0 == Photoshop::locateIptcIrb(pCur, pEnd - pCur, &record, &sizeHdr, &sizeIptc)) {
267+
while (pCur < pEnd && 0 == Photoshop::locateIptcIrb(pCur, pEnd - pCur, &record, sizeHdr, sizeIptc)) {
268268
#ifdef EXIV2_DEBUG_MESSAGES
269269
std::cerr << "Found IPTC IRB, size = " << sizeIptc << "\n";
270270
#endif

‎src/photoshop.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ bool Photoshop::valid(const byte* pPsData, size_t sizePsData) {
2222
const byte* pCur = pPsData;
2323
const byte* pEnd = pPsData + sizePsData;
2424
int ret = 0;
25-
while (pCur < pEnd && 0 == (ret = Photoshop::locateIptcIrb(pCur, (pEnd - pCur), &record, &sizeHdr, &sizeIptc))) {
25+
while (pCur < pEnd && 0 == (ret = Photoshop::locateIptcIrb(pCur, (pEnd - pCur), &record, sizeHdr, sizeIptc))) {
2626
pCur = record + sizeHdr + sizeIptc + (sizeIptc & 1);
2727
}
2828
return ret >= 0;
@@ -31,8 +31,8 @@ bool Photoshop::valid(const byte* pPsData, size_t sizePsData) {
3131
// Todo: Generalised from JpegBase::locateIptcData without really understanding
3232
// the format (in particular the header). So it remains to be confirmed
3333
// if this also makes sense for psTag != Photoshop::iptc
34-
int Photoshop::locateIrb(const byte* pPsData, size_t sizePsData, uint16_t psTag, const byte** record, uint32_t* sizeHdr,
35-
uint32_t* sizeData) {
34+
int Photoshop::locateIrb(const byte* pPsData, size_t sizePsData, uint16_t psTag, const byte** record, uint32_t& sizeHdr,
35+
uint32_t& sizeData) {
3636
if (sizePsData < 12) {
3737
return 3;
3838
}
@@ -81,8 +81,8 @@ int Photoshop::locateIrb(const byte* pPsData, size_t sizePsData, uint16_t psTag,
8181
#ifdef EXIV2_DEBUG_MESSAGES
8282
std::cerr << "ok\n";
8383
#endif
84-
*sizeData = dataSize;
85-
*sizeHdr = psSize + 10;
84+
sizeData = dataSize;
85+
sizeHdr = psSize + 10;
8686
*record = hrd;
8787
return 0;
8888
}
@@ -102,13 +102,13 @@ int Photoshop::locateIrb(const byte* pPsData, size_t sizePsData, uint16_t psTag,
102102
return 3;
103103
}
104104

105-
int Photoshop::locateIptcIrb(const byte* pPsData, size_t sizePsData, const byte** record, uint32_t* sizeHdr,
106-
uint32_t* sizeData) {
105+
int Photoshop::locateIptcIrb(const byte* pPsData, size_t sizePsData, const byte** record, uint32_t& sizeHdr,
106+
uint32_t& sizeData) {
107107
return locateIrb(pPsData, sizePsData, iptc_, record, sizeHdr, sizeData);
108108
}
109109

110-
int Photoshop::locatePreviewIrb(const byte* pPsData, size_t sizePsData, const byte** record, uint32_t* sizeHdr,
111-
uint32_t* sizeData) {
110+
int Photoshop::locatePreviewIrb(const byte* pPsData, size_t sizePsData, const byte** record, uint32_t& sizeHdr,
111+
uint32_t& sizeData) {
112112
return locateIrb(pPsData, sizePsData, preview_, record, sizeHdr, sizeData);
113113
}
114114

@@ -124,7 +124,7 @@ DataBuf Photoshop::setIptcIrb(const byte* pPsData, size_t sizePsData, const Iptc
124124
uint32_t sizeIptc = 0;
125125
uint32_t sizeHdr = 0;
126126
DataBuf rc;
127-
if (0 > Photoshop::locateIptcIrb(pPsData, sizePsData, &record, &sizeHdr, &sizeIptc)) {
127+
if (0 > Photoshop::locateIptcIrb(pPsData, sizePsData, &record, sizeHdr, sizeIptc)) {
128128
return rc;
129129
}
130130

@@ -155,7 +155,7 @@ DataBuf Photoshop::setIptcIrb(const byte* pPsData, size_t sizePsData, const Iptc
155155
size_t pos = sizeFront;
156156
auto nextSizeData = Safe::add<long>(static_cast<long>(sizePsData), -static_cast<long>(pos));
157157
enforce(nextSizeData >= 0, ErrorCode::kerCorruptedMetadata);
158-
while (0 == Photoshop::locateIptcIrb(pPsData + pos, nextSizeData, &record, &sizeHdr, &sizeIptc)) {
158+
while (0 == Photoshop::locateIptcIrb(pPsData + pos, nextSizeData, &record, sizeHdr, sizeIptc)) {
159159
const auto newPos = static_cast<size_t>(record - pPsData);
160160
if (newPos > pos) { // Copy data up to the IPTC IRB
161161
append(psBlob, pPsData + pos, newPos - pos);

‎src/pngchunk_int.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ void PngChunk::parseChunkContent(Image* pImage, const byte* key, size_t keySize,
235235

236236
const byte* pEnd = psData.c_data(psData.size() - 1);
237237
const byte* pCur = psData.c_data();
238-
while (pCur < pEnd && 0 == Photoshop::locateIptcIrb(pCur, pEnd - pCur, &record, &sizeHdr, &sizeIptc)) {
238+
while (pCur < pEnd && 0 == Photoshop::locateIptcIrb(pCur, pEnd - pCur, &record, sizeHdr, sizeIptc)) {
239239
if (sizeIptc) {
240240
#ifdef EXIV2_DEBUG_MESSAGES
241241
std::cerr << "Found IPTC IRB, size = " << sizeIptc << "\n";

‎src/preview.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ DataBuf LoaderNative::getData() const {
419419
const byte* record;
420420
uint32_t sizeHdr = 0;
421421
uint32_t sizeData = 0;
422-
if (Photoshop::locatePreviewIrb(psData.c_data(), psData.size(), &record, &sizeHdr, &sizeData) != 0) {
422+
if (Photoshop::locatePreviewIrb(psData.c_data(), psData.size(), &record, sizeHdr, sizeData) != 0) {
423423
#ifndef SUPPRESS_WARNINGS
424424
EXV_WARNING << "Missing preview IRB in Photoshop EPS preview.\n";
425425
#endif

‎src/tiffvisitor_int.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ void TiffDecoder::decodeIptc(const TiffEntryBase* object) {
330330
byte const* record = nullptr;
331331
uint32_t sizeHdr = 0;
332332
uint32_t sizeData = 0;
333-
if (0 != Photoshop::locateIptcIrb(pData, size, &record, &sizeHdr, &sizeData)) {
333+
if (0 != Photoshop::locateIptcIrb(pData, size, &record, sizeHdr, sizeData)) {
334334
return;
335335
}
336336
if (0 == IptcParser::decode(iptcData_, record + sizeHdr, sizeData)) {

‎unitTests/test_Photoshop.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ TEST(Photoshop_locateIrb, returnsMinus2withInvalidPhotoshopIRB) {
4141
uint32_t sizeHdr = 0;
4242
uint32_t sizeData = 0;
4343
ASSERT_EQ(-2, Photoshop::locateIrb(reinterpret_cast<const byte*>(data.c_str()), data.size(), Photoshop::iptc_,
44-
&record, &sizeHdr, &sizeData));
44+
&record, sizeHdr, sizeData));
4545
}
4646

4747
TEST(Photoshop_locateIrb, returnsMinus2WithMarkerNotStartingWith8BIM) {
@@ -50,7 +50,7 @@ TEST(Photoshop_locateIrb, returnsMinus2WithMarkerNotStartingWith8BIM) {
5050
uint32_t sizeHdr = 0;
5151
uint32_t sizeData = 0;
5252
ASSERT_EQ(-2, Photoshop::locateIrb(reinterpret_cast<const byte*>(data.c_str()), data.size(), Photoshop::iptc_,
53-
&record, &sizeHdr, &sizeData));
53+
&record, sizeHdr, sizeData));
5454
}
5555

5656
TEST(Photoshop_locateIrb, returns3withNotLongEnoughData) {
@@ -59,7 +59,7 @@ TEST(Photoshop_locateIrb, returns3withNotLongEnoughData) {
5959
uint32_t sizeHdr = 0;
6060
uint32_t sizeData = 0;
6161
ASSERT_EQ(3, Photoshop::locateIrb(reinterpret_cast<const byte*>(data.c_str()), data.size(), Photoshop::iptc_, &record,
62-
&sizeHdr, &sizeData));
62+
sizeHdr, sizeData));
6363
}
6464

6565
TEST(Photoshop_locateIrb, returns0withGoodIptcIrb) {
@@ -75,7 +75,7 @@ TEST(Photoshop_locateIrb, returns0withGoodIptcIrb) {
7575
uint32_t sizeHdr = 0;
7676
uint32_t sizeData = 0;
7777

78-
ASSERT_EQ(0, Photoshop::locateIrb(data.data(), data.size(), Photoshop::iptc_, &record, &sizeHdr, &sizeData));
78+
ASSERT_EQ(0, Photoshop::locateIrb(data.data(), data.size(), Photoshop::iptc_, &record, sizeHdr, sizeData));
7979
ASSERT_EQ(12, sizeHdr);
8080
ASSERT_EQ(27, sizeData);
8181
}
@@ -93,7 +93,7 @@ TEST(Photoshop_locateIptcIrb, returns0withGoodIptcIrb) {
9393
uint32_t sizeHdr = 0;
9494
uint32_t sizeData = 0;
9595

96-
ASSERT_EQ(0, Photoshop::locateIptcIrb(data.data(), data.size(), &record, &sizeHdr, &sizeData));
96+
ASSERT_EQ(0, Photoshop::locateIptcIrb(data.data(), data.size(), &record, sizeHdr, sizeData));
9797
ASSERT_EQ(12, sizeHdr);
9898
ASSERT_EQ(27, sizeData);
9999
}
@@ -111,7 +111,7 @@ TEST(Photoshop_locateIptcIrb, returns3withoutIptcMarker) {
111111
uint32_t sizeHdr = 0;
112112
uint32_t sizeData = 0;
113113

114-
ASSERT_EQ(3, Photoshop::locateIptcIrb(data.data(), data.size(), &record, &sizeHdr, &sizeData));
114+
ASSERT_EQ(3, Photoshop::locateIptcIrb(data.data(), data.size(), &record, sizeHdr, sizeData));
115115
}
116116

117117
TEST(Photoshop_locatePreviewIrb, returns0withGoodPreviewIrb) {
@@ -127,7 +127,7 @@ TEST(Photoshop_locatePreviewIrb, returns0withGoodPreviewIrb) {
127127
uint32_t sizeHdr = 0;
128128
uint32_t sizeData = 0;
129129

130-
ASSERT_EQ(0, Photoshop::locatePreviewIrb(data.data(), data.size(), &record, &sizeHdr, &sizeData));
130+
ASSERT_EQ(0, Photoshop::locatePreviewIrb(data.data(), data.size(), &record, sizeHdr, sizeData));
131131
ASSERT_EQ(12, sizeHdr);
132132
ASSERT_EQ(27, sizeData);
133133
}

0 commit comments

Comments
 (0)