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

533: Applied patch 4_new_function_Photoshop_valid (Michael Ulbrich, Volker Grabsch)

Browse Source
This commit is contained in:
Andreas Huggel 2009-06-28 15:44:41 +00:00
parent 95baab13ed
commit bc9d685210
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/jpgimage.cpp
View File

@ -87,6 +87,23 @@ namespace Exiv2 {
const char Photoshop::bimId_[] = "8BIM";
const uint16_t Photoshop::iptc_ = 0x0404;
bool Photoshop::valid(const byte* pPsData,
long sizePsData)
{
const byte *record = 0;
uint32_t sizeIptc = 0;
uint32_t sizeHdr = 0;
const byte* pCur = pPsData;
const byte* pEnd = pPsData + sizePsData;
int ret = 0;
while (pCur < pEnd
&& 0 == (ret = Photoshop::locateIptcIrb(pCur, static_cast<long>(pEnd - pCur),
&record, &sizeHdr, &sizeIptc))) {
pCur = record + sizeHdr + sizeIptc + (sizeIptc & 1);
}
return ret >= 0;
}
// Todo: Generalised from JpegBase::locateIptcData without really understanding
// the format (in particular the header). So it remains to be confirmed
// if this also makes sense for psTag != Photoshop::iptc
@ -121,8 +138,8 @@ namespace Exiv2 {
position += psSize;
if (position + 4 > sizePsData) {
#ifndef SUPPRESS_WARNINGS
std::cerr << "Error: "
<< "Invalid Photoshop IRB\n";
std::cerr << "Warning: "
<< "Invalid or extended Photoshop IRB\n";
#endif
return -2;
}
@ -130,9 +147,9 @@ namespace Exiv2 {
position += 4;
if (dataSize > static_cast<uint32_t>(sizePsData - position)) {
#ifndef SUPPRESS_WARNINGS
std::cerr << "Error: "
std::cerr << "Warning: "
<< "Invalid Photoshop IRB data size "
<< dataSize << "\n";
<< dataSize << " or extended Photoshop IRB\n";
#endif
return -2;
}

10
src/jpgimage.hpp
View File

@ -63,6 +63,16 @@ namespace Exiv2 {
static const char bimId_[]; //!< %Photoshop marker
static const uint16_t iptc_; //!< %Photoshop IPTC marker
/*!
@brief Validates all IRBs
@param pPsData Existing IRB buffer
@param sizePsData Size of the IRB buffer, may be 0
@return true if all IRBs are valid;<BR>
false otherwise
*/
static bool valid(const byte* pPsData,
long sizePsData);
/*!
@brief Locates the data for a %Photoshop tag in a %Photoshop formated memory
buffer. Operates on raw data to simplify reuse.