|
Packit |
01d647 |
// ***************************************************************** -*- C++ -*-
|
|
Packit |
01d647 |
/*
|
|
Packit |
01d647 |
* Copyright (C) 2004-2018 Exiv2 authors
|
|
Packit |
01d647 |
* This program is part of the Exiv2 distribution.
|
|
Packit |
01d647 |
*
|
|
Packit |
01d647 |
* This program is free software; you can redistribute it and/or
|
|
Packit |
01d647 |
* modify it under the terms of the GNU General Public License
|
|
Packit |
01d647 |
* as published by the Free Software Foundation; either version 2
|
|
Packit |
01d647 |
* of the License, or (at your option) any later version.
|
|
Packit |
01d647 |
*
|
|
Packit |
01d647 |
* This program is distributed in the hope that it will be useful,
|
|
Packit |
01d647 |
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
Packit |
01d647 |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
Packit |
01d647 |
* GNU General Public License for more details.
|
|
Packit |
01d647 |
*
|
|
Packit |
01d647 |
* You should have received a copy of the GNU General Public License
|
|
Packit |
01d647 |
* along with this program; if not, write to the Free Software
|
|
Packit |
01d647 |
* Foundation, Inc., 51 Franklin Street, 5th Floor, Boston, MA 02110-1301 USA.
|
|
Packit |
01d647 |
*/
|
|
Packit |
01d647 |
/*
|
|
Packit |
01d647 |
File: jpgimage.cpp
|
|
Packit |
01d647 |
*/
|
|
Packit |
01d647 |
// *****************************************************************************
|
|
Packit |
01d647 |
// included header files
|
|
Packit |
01d647 |
#include "config.h"
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
#include "jpgimage.hpp"
|
|
Packit |
01d647 |
#include "tiffimage.hpp"
|
|
Packit |
01d647 |
#include "image_int.hpp"
|
|
Packit |
01d647 |
#include "error.hpp"
|
|
Packit |
01d647 |
#include "futils.hpp"
|
|
Packit |
01d647 |
#include "helper_functions.hpp"
|
|
Packit |
01d647 |
#include "enforce.hpp"
|
|
Packit |
01d647 |
#include "safe_op.hpp"
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
#ifdef WIN32
|
|
Packit |
01d647 |
#include <windows.h>
|
|
Packit |
01d647 |
#else
|
|
Packit |
01d647 |
#define BYTE char
|
|
Packit |
01d647 |
#define USHORT uint16_t
|
|
Packit |
01d647 |
#define ULONG uint32_t
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
#include "fff.h"
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// + standard includes
|
|
Packit |
01d647 |
#include <cstdio> // for EOF
|
|
Packit |
01d647 |
#include <cstring>
|
|
Packit |
01d647 |
#include <cassert>
|
|
Packit |
01d647 |
#include <stdexcept>
|
|
Packit |
01d647 |
#include <iostream>
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// *****************************************************************************
|
|
Packit |
01d647 |
// class member definitions
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
namespace Exiv2 {
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
const byte JpegBase::dht_ = 0xc4;
|
|
Packit |
01d647 |
const byte JpegBase::dqt_ = 0xdb;
|
|
Packit |
01d647 |
const byte JpegBase::dri_ = 0xdd;
|
|
Packit |
01d647 |
const byte JpegBase::sos_ = 0xda;
|
|
Packit |
01d647 |
const byte JpegBase::eoi_ = 0xd9;
|
|
Packit |
01d647 |
const byte JpegBase::app0_ = 0xe0;
|
|
Packit |
01d647 |
const byte JpegBase::app1_ = 0xe1;
|
|
Packit |
01d647 |
const byte JpegBase::app2_ = 0xe2;
|
|
Packit |
01d647 |
const byte JpegBase::app13_ = 0xed;
|
|
Packit |
01d647 |
const byte JpegBase::com_ = 0xfe;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Start of Frame markers, nondifferential Huffman-coding frames
|
|
Packit |
01d647 |
const byte JpegBase::sof0_ = 0xc0; // start of frame 0, baseline DCT
|
|
Packit |
01d647 |
const byte JpegBase::sof1_ = 0xc1; // start of frame 1, extended sequential DCT, Huffman coding
|
|
Packit |
01d647 |
const byte JpegBase::sof2_ = 0xc2; // start of frame 2, progressive DCT, Huffman coding
|
|
Packit |
01d647 |
const byte JpegBase::sof3_ = 0xc3; // start of frame 3, lossless sequential, Huffman coding
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Start of Frame markers, differential Huffman-coding frames
|
|
Packit |
01d647 |
const byte JpegBase::sof5_ = 0xc5; // start of frame 5, differential sequential DCT, Huffman coding
|
|
Packit |
01d647 |
const byte JpegBase::sof6_ = 0xc6; // start of frame 6, differential progressive DCT, Huffman coding
|
|
Packit |
01d647 |
const byte JpegBase::sof7_ = 0xc7; // start of frame 7, differential lossless, Huffman coding
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Start of Frame markers, nondifferential arithmetic-coding frames
|
|
Packit |
01d647 |
const byte JpegBase::sof9_ = 0xc9; // start of frame 9, extended sequential DCT, arithmetic coding
|
|
Packit |
01d647 |
const byte JpegBase::sof10_ = 0xca; // start of frame 10, progressive DCT, arithmetic coding
|
|
Packit |
01d647 |
const byte JpegBase::sof11_ = 0xcb; // start of frame 11, lossless sequential, arithmetic coding
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Start of Frame markers, differential arithmetic-coding frames
|
|
Packit |
01d647 |
const byte JpegBase::sof13_ = 0xcd; // start of frame 13, differential sequential DCT, arithmetic coding
|
|
Packit |
01d647 |
const byte JpegBase::sof14_ = 0xce; // start of frame 14, progressive DCT, arithmetic coding
|
|
Packit |
01d647 |
const byte JpegBase::sof15_ = 0xcf; // start of frame 15, differential lossless, arithmetic coding
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
const char JpegBase::exifId_[] = "Exif\0\0";
|
|
Packit |
01d647 |
const char JpegBase::jfifId_[] = "JFIF\0";
|
|
Packit |
01d647 |
const char JpegBase::xmpId_[] = "http://ns.adobe.com/xap/1.0/\0";
|
|
Packit |
01d647 |
const char JpegBase::iccId_[] = "ICC_PROFILE\0";
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
const char Photoshop::ps3Id_[] = "Photoshop 3.0\0";
|
|
Packit |
01d647 |
const char* Photoshop::irbId_[] = {"8BIM", "AgHg", "DCSR", "PHUT"};
|
|
Packit |
01d647 |
const char Photoshop::bimId_[] = "8BIM"; // deprecated
|
|
Packit |
01d647 |
const uint16_t Photoshop::iptc_ = 0x0404;
|
|
Packit |
01d647 |
const uint16_t Photoshop::preview_ = 0x040c;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
static inline bool inRange(int lo,int value, int hi)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
return lo<=value && value <= hi;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
static inline bool inRange2(int value,int lo1,int hi1, int lo2,int hi2)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
return inRange(lo1,value,hi1) || inRange(lo2,value,hi2);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
bool Photoshop::isIrb(const byte* pPsData,
|
|
Packit |
01d647 |
long sizePsData)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
if (sizePsData < 4) return false;
|
|
Packit |
01d647 |
for (size_t i = 0; i < (sizeof irbId_) / (sizeof *irbId_); i++) {
|
|
Packit |
01d647 |
assert(strlen(irbId_[i]) == 4);
|
|
Packit |
01d647 |
if (memcmp(pPsData, irbId_[i], 4) == 0) return true;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
return false;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
bool Photoshop::valid(const byte* pPsData,
|
|
Packit |
01d647 |
long sizePsData)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
const byte *record = 0;
|
|
Packit |
01d647 |
uint32_t sizeIptc = 0;
|
|
Packit |
01d647 |
uint32_t sizeHdr = 0;
|
|
Packit |
01d647 |
const byte* pCur = pPsData;
|
|
Packit |
01d647 |
const byte* pEnd = pPsData + sizePsData;
|
|
Packit |
01d647 |
int ret = 0;
|
|
Packit |
01d647 |
while (pCur < pEnd
|
|
Packit |
01d647 |
&& 0 == (ret = Photoshop::locateIptcIrb(pCur, static_cast<long>(pEnd - pCur),
|
|
Packit |
01d647 |
&record, &sizeHdr, &sizeIptc))) {
|
|
Packit |
01d647 |
pCur = record + sizeHdr + sizeIptc + (sizeIptc & 1);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
return ret >= 0;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Todo: Generalised from JpegBase::locateIptcData without really understanding
|
|
Packit |
01d647 |
// the format (in particular the header). So it remains to be confirmed
|
|
Packit |
01d647 |
// if this also makes sense for psTag != Photoshop::iptc
|
|
Packit |
01d647 |
int Photoshop::locateIrb(const byte* pPsData,
|
|
Packit |
01d647 |
long sizePsData,
|
|
Packit |
01d647 |
uint16_t psTag,
|
|
Packit |
01d647 |
const byte** record,
|
|
Packit |
01d647 |
uint32_t *const sizeHdr,
|
|
Packit |
01d647 |
uint32_t *const sizeData)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
assert(record);
|
|
Packit |
01d647 |
assert(sizeHdr);
|
|
Packit |
01d647 |
assert(sizeData);
|
|
Packit |
01d647 |
// Used for error checking
|
|
Packit |
01d647 |
long position = 0;
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "Photoshop::locateIrb: ";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
// Data should follow Photoshop format, if not exit
|
|
Packit |
01d647 |
while (position <= sizePsData - 12 && isIrb(pPsData + position, 4)) {
|
|
Packit |
01d647 |
const byte *hrd = pPsData + position;
|
|
Packit |
01d647 |
position += 4;
|
|
Packit |
01d647 |
uint16_t type = getUShort(pPsData + position, bigEndian);
|
|
Packit |
01d647 |
position += 2;
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "0x" << std::hex << type << std::dec << " ";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
// Pascal string is padded to have an even size (including size byte)
|
|
Packit |
01d647 |
byte psSize = pPsData[position] + 1;
|
|
Packit |
01d647 |
psSize += (psSize & 1);
|
|
Packit |
01d647 |
position += psSize;
|
|
Packit |
01d647 |
if (position + 4 > sizePsData) {
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "Warning: "
|
|
Packit |
01d647 |
<< "Invalid or extended Photoshop IRB\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
return -2;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
uint32_t dataSize = getULong(pPsData + position, bigEndian);
|
|
Packit |
01d647 |
position += 4;
|
|
Packit |
01d647 |
if (dataSize > static_cast<uint32_t>(sizePsData - position)) {
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "Warning: "
|
|
Packit |
01d647 |
<< "Invalid Photoshop IRB data size "
|
|
Packit |
01d647 |
<< dataSize << " or extended Photoshop IRB\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
return -2;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
#ifndef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
if ( (dataSize & 1)
|
|
Packit |
01d647 |
&& position + dataSize == static_cast<uint32_t>(sizePsData)) {
|
|
Packit |
01d647 |
std::cerr << "Warning: "
|
|
Packit |
01d647 |
<< "Photoshop IRB data is not padded to even size\n";
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
if (type == psTag) {
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "ok\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
*sizeData = dataSize;
|
|
Packit |
01d647 |
*sizeHdr = psSize + 10;
|
|
Packit |
01d647 |
*record = hrd;
|
|
Packit |
01d647 |
return 0;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Data size is also padded to be even
|
|
Packit |
01d647 |
position += dataSize + (dataSize & 1);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "pPsData doesn't start with '8BIM'\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
if (position < sizePsData) {
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "Warning: "
|
|
Packit |
01d647 |
<< "Invalid or extended Photoshop IRB\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
return -2;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
return 3;
|
|
Packit |
01d647 |
} // Photoshop::locateIrb
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
int Photoshop::locateIptcIrb(const byte* pPsData,
|
|
Packit |
01d647 |
long sizePsData,
|
|
Packit |
01d647 |
const byte** record,
|
|
Packit |
01d647 |
uint32_t *const sizeHdr,
|
|
Packit |
01d647 |
uint32_t *const sizeData)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
return locateIrb(pPsData, sizePsData, iptc_,
|
|
Packit |
01d647 |
record, sizeHdr, sizeData);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
int Photoshop::locatePreviewIrb(const byte* pPsData,
|
|
Packit |
01d647 |
long sizePsData,
|
|
Packit |
01d647 |
const byte** record,
|
|
Packit |
01d647 |
uint32_t *const sizeHdr,
|
|
Packit |
01d647 |
uint32_t *const sizeData)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
return locateIrb(pPsData, sizePsData, preview_,
|
|
Packit |
01d647 |
record, sizeHdr, sizeData);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
DataBuf Photoshop::setIptcIrb(const byte* pPsData,
|
|
Packit |
01d647 |
long sizePsData,
|
|
Packit |
01d647 |
const IptcData& iptcData)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
if (sizePsData > 0) assert(pPsData);
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "IRB block at the beginning of Photoshop::setIptcIrb\n";
|
|
Packit |
01d647 |
if (sizePsData == 0) std::cerr << " None.\n";
|
|
Packit |
01d647 |
else hexdump(std::cerr, pPsData, sizePsData);
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
const byte* record = pPsData;
|
|
Packit |
01d647 |
uint32_t sizeIptc = 0;
|
|
Packit |
01d647 |
uint32_t sizeHdr = 0;
|
|
Packit |
01d647 |
DataBuf rc;
|
|
Packit |
01d647 |
// Safe to call with zero psData.size_
|
|
Packit |
01d647 |
if (0 > Photoshop::locateIptcIrb(pPsData, sizePsData,
|
|
Packit |
01d647 |
&record, &sizeHdr, &sizeIptc)) {
|
|
Packit |
01d647 |
return rc;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
Blob psBlob;
|
|
Packit |
01d647 |
const uint32_t sizeFront = static_cast<uint32_t>(record - pPsData);
|
|
Packit |
01d647 |
// Write data before old record.
|
|
Packit |
01d647 |
if (sizePsData > 0 && sizeFront > 0) {
|
|
Packit |
01d647 |
append(psBlob, pPsData, sizeFront);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Write new iptc record if we have it
|
|
Packit |
01d647 |
DataBuf rawIptc = IptcParser::encode(iptcData);
|
|
Packit |
01d647 |
if (rawIptc.size_ > 0) {
|
|
Packit |
01d647 |
byte tmpBuf[12];
|
|
Packit |
01d647 |
std::memcpy(tmpBuf, Photoshop::irbId_[0], 4);
|
|
Packit |
01d647 |
us2Data(tmpBuf + 4, iptc_, bigEndian);
|
|
Packit |
01d647 |
tmpBuf[6] = 0;
|
|
Packit |
01d647 |
tmpBuf[7] = 0;
|
|
Packit |
01d647 |
ul2Data(tmpBuf + 8, rawIptc.size_, bigEndian);
|
|
Packit |
01d647 |
append(psBlob, tmpBuf, 12);
|
|
Packit |
01d647 |
append(psBlob, rawIptc.pData_, rawIptc.size_);
|
|
Packit |
01d647 |
// Data is padded to be even (but not included in size)
|
|
Packit |
01d647 |
if (rawIptc.size_ & 1) psBlob.push_back(0x00);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Write existing stuff after record,
|
|
Packit |
01d647 |
// skip the current and all remaining IPTC blocks
|
|
Packit |
01d647 |
long pos = sizeFront;
|
|
Packit |
01d647 |
while (0 == Photoshop::locateIptcIrb(pPsData + pos, sizePsData - pos,
|
|
Packit |
01d647 |
&record, &sizeHdr, &sizeIptc)) {
|
|
Packit |
01d647 |
const long newPos = static_cast<long>(record - pPsData);
|
|
Packit |
01d647 |
// Copy data up to the IPTC IRB
|
|
Packit |
01d647 |
if (newPos > pos) {
|
|
Packit |
01d647 |
append(psBlob, pPsData + pos, newPos - pos);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Skip the IPTC IRB
|
|
Packit |
01d647 |
pos = newPos + sizeHdr + sizeIptc + (sizeIptc & 1);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (pos < sizePsData) {
|
|
Packit |
01d647 |
append(psBlob, pPsData + pos, sizePsData - pos);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Data is rounded to be even
|
|
Packit |
01d647 |
if (psBlob.size() > 0) rc = DataBuf(&psBlob[0], static_cast<long>(psBlob.size()));
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "IRB block at the end of Photoshop::setIptcIrb\n";
|
|
Packit |
01d647 |
if (rc.size_ == 0) std::cerr << " None.\n";
|
|
Packit |
01d647 |
else hexdump(std::cerr, rc.pData_, rc.size_);
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
return rc;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
} // Photoshop::setIptcIrb
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
JpegBase::JpegBase(int type, BasicIo::AutoPtr io, bool create,
|
|
Packit |
01d647 |
const byte initData[], long dataSize)
|
|
Packit |
01d647 |
: Image(type, mdExif | mdIptc | mdXmp | mdComment, io)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
if (create) {
|
|
Packit |
01d647 |
initImage(initData, dataSize);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
int JpegBase::initImage(const byte initData[], long dataSize)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
if (io_->open() != 0) {
|
|
Packit |
01d647 |
return 4;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
IoCloser closer(*io_);
|
|
Packit |
01d647 |
if (io_->write(initData, dataSize) != dataSize) {
|
|
Packit |
01d647 |
return 4;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
return 0;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
int JpegBase::advanceToMarker() const
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
int c = -1;
|
|
Packit |
01d647 |
// Skips potential padding between markers
|
|
Packit |
01d647 |
while ((c=io_->getb()) != 0xff) {
|
|
Packit |
01d647 |
if (c == EOF)
|
|
Packit |
01d647 |
return -1;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Markers can start with any number of 0xff
|
|
Packit |
01d647 |
while ((c=io_->getb()) == 0xff) {
|
|
Packit |
01d647 |
if (c == EOF)
|
|
Packit |
01d647 |
return -2;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
return c;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
void JpegBase::readMetadata()
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
int rc = 0; // Todo: this should be the return value
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (io_->open() != 0) throw Error(kerDataSourceOpenFailed, io_->path(), strError());
|
|
Packit |
01d647 |
IoCloser closer(*io_);
|
|
Packit |
01d647 |
// Ensure that this is the correct image type
|
|
Packit |
01d647 |
if (!isThisType(*io_, true)) {
|
|
Packit |
01d647 |
if (io_->error() || io_->eof()) throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
throw Error(kerNotAJpeg);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
clearMetadata();
|
|
Packit |
01d647 |
int search = 6 ; // Exif, ICC, XMP, Comment, IPTC, SOF
|
|
Packit |
01d647 |
const long bufMinSize = 36;
|
|
Packit |
01d647 |
long bufRead = 0;
|
|
Packit |
01d647 |
DataBuf buf(bufMinSize);
|
|
Packit |
01d647 |
Blob psBlob;
|
|
Packit |
01d647 |
bool foundCompletePsData = false;
|
|
Packit |
01d647 |
bool foundExifData = false;
|
|
Packit |
01d647 |
bool foundXmpData = false;
|
|
Packit |
01d647 |
bool foundIccData = false;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Read section marker
|
|
Packit |
01d647 |
int marker = advanceToMarker();
|
|
Packit |
01d647 |
if (marker < 0) throw Error(kerNotAJpeg);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
while (marker != sos_ && marker != eoi_ && search > 0) {
|
|
Packit |
01d647 |
// Read size and signature (ok if this hits EOF)
|
|
Packit |
01d647 |
std::memset(buf.pData_, 0x0, buf.size_);
|
|
Packit |
01d647 |
bufRead = io_->read(buf.pData_, bufMinSize);
|
|
Packit |
01d647 |
if (io_->error()) throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
if (bufRead < 2) throw Error(kerNotAJpeg);
|
|
Packit |
01d647 |
uint16_t size = getUShort(buf.pData_, bigEndian);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if ( !foundExifData
|
|
Packit |
01d647 |
&& marker == app1_ && memcmp(buf.pData_ + 2, exifId_, 6) == 0) {
|
|
Packit |
01d647 |
if (size < 8) {
|
|
Packit |
01d647 |
rc = 1;
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Seek to beginning and read the Exif data
|
|
Packit |
01d647 |
io_->seek(8 - bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
DataBuf rawExif(size - 8);
|
|
Packit |
01d647 |
io_->read(rawExif.pData_, rawExif.size_);
|
|
Packit |
01d647 |
if (io_->error() || io_->eof()) throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
ByteOrder bo = ExifParser::decode(exifData_, rawExif.pData_, rawExif.size_);
|
|
Packit |
01d647 |
setByteOrder(bo);
|
|
Packit |
01d647 |
if (rawExif.size_ > 0 && byteOrder() == invalidByteOrder) {
|
|
Packit |
01d647 |
#ifndef SUPPRESS_WARNINGS
|
|
Packit |
01d647 |
EXV_WARNING << "Failed to decode Exif metadata.\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
exifData_.clear();
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
foundExifData = true;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
else if ( !foundXmpData
|
|
Packit |
01d647 |
&& marker == app1_ && memcmp(buf.pData_ + 2, xmpId_, 29) == 0) {
|
|
Packit |
01d647 |
if (size < 31) {
|
|
Packit |
01d647 |
rc = 6;
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Seek to beginning and read the XMP packet
|
|
Packit |
01d647 |
io_->seek(31 - bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
DataBuf xmpPacket(size - 31);
|
|
Packit |
01d647 |
io_->read(xmpPacket.pData_, xmpPacket.size_);
|
|
Packit |
01d647 |
if (io_->error() || io_->eof()) throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
xmpPacket_.assign(reinterpret_cast<char*>(xmpPacket.pData_), xmpPacket.size_);
|
|
Packit |
01d647 |
if (xmpPacket_.size() > 0 && XmpParser::decode(xmpData_, xmpPacket_)) {
|
|
Packit |
01d647 |
#ifndef SUPPRESS_WARNINGS
|
|
Packit |
01d647 |
EXV_WARNING << "Failed to decode XMP metadata.\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
foundXmpData = true;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
else if ( !foundCompletePsData
|
|
Packit |
01d647 |
&& marker == app13_ && memcmp(buf.pData_ + 2, Photoshop::ps3Id_, 14) == 0) {
|
|
Packit |
01d647 |
if (size < 16) {
|
|
Packit |
01d647 |
rc = 2;
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Read the rest of the APP13 segment
|
|
Packit |
01d647 |
io_->seek(16 - bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
DataBuf psData(size - 16);
|
|
Packit |
01d647 |
io_->read(psData.pData_, psData.size_);
|
|
Packit |
01d647 |
if (io_->error() || io_->eof()) throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "Found app13 segment, size = " << size << "\n";
|
|
Packit |
01d647 |
//hexdump(std::cerr, psData.pData_, psData.size_);
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
// Append to psBlob
|
|
Packit |
01d647 |
append(psBlob, psData.pData_, psData.size_);
|
|
Packit |
01d647 |
// Check whether psBlob is complete
|
|
Packit |
01d647 |
if (psBlob.size() > 0 && Photoshop::valid(&psBlob[0], (long) psBlob.size())) {
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
foundCompletePsData = true;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
else if (marker == com_ && comment_.empty())
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
if (size < 2) {
|
|
Packit |
01d647 |
rc = 3;
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// JPEGs can have multiple comments, but for now only read
|
|
Packit |
01d647 |
// the first one (most jpegs only have one anyway). Comments
|
|
Packit |
01d647 |
// are simple single byte ISO-8859-1 strings.
|
|
Packit |
01d647 |
io_->seek(2 - bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
DataBuf comment(size - 2);
|
|
Packit |
01d647 |
io_->read(comment.pData_, comment.size_);
|
|
Packit |
01d647 |
if (io_->error() || io_->eof()) throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
comment_.assign(reinterpret_cast<char*>(comment.pData_), comment.size_);
|
|
Packit |
01d647 |
while ( comment_.length()
|
|
Packit |
01d647 |
&& comment_.at(comment_.length()-1) == '\0') {
|
|
Packit |
01d647 |
comment_.erase(comment_.length()-1);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
else if ( marker == app2_ && memcmp(buf.pData_ + 2, iccId_,11)==0) {
|
|
Packit |
01d647 |
if (size < 2+14) {
|
|
Packit |
01d647 |
rc = 8;
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// ICC profile
|
|
Packit |
01d647 |
if ( ! foundIccData ) {
|
|
Packit |
01d647 |
foundIccData = true ;
|
|
Packit |
01d647 |
--search ;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
int chunk = (int) buf.pData_[2+12];
|
|
Packit |
01d647 |
int chunks = (int) buf.pData_[2+13];
|
|
Packit |
01d647 |
// ICC1v43_2010-12.pdf header is 14 bytes
|
|
Packit |
01d647 |
// header = "ICC_PROFILE\0" (12 bytes)
|
|
Packit |
01d647 |
// chunk/chunks are a single byte
|
|
Packit |
01d647 |
// Spec 7.2 Profile bytes 0-3 size
|
|
Packit |
01d647 |
uint32_t s = getULong(buf.pData_ + (2+14) , bigEndian);
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "Found ICC Profile chunk " << chunk
|
|
Packit |
01d647 |
<< " of " << chunks
|
|
Packit |
01d647 |
<< (chunk==1 ? " size: " : "" ) << (chunk==1 ? s : 0)
|
|
Packit |
01d647 |
<< std::endl ;
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
io_->seek(-bufRead, BasicIo::cur); // back up to start of buffer (after marker)
|
|
Packit |
01d647 |
io_->seek( 14+2, BasicIo::cur); // step header
|
|
Packit |
01d647 |
// read in profile
|
|
Packit |
01d647 |
// #1286 profile can be padded
|
|
Packit |
01d647 |
long icc_size = size-2-14;
|
|
Packit |
01d647 |
if (chunk==1 && chunks==1) {
|
|
Packit |
01d647 |
enforce(s <= static_cast<uint32_t>(icc_size), kerInvalidIccProfile);
|
|
Packit |
01d647 |
icc_size = s;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
DataBuf icc(icc_size);
|
|
Packit |
01d647 |
io_->read( icc.pData_,icc.size_);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if ( !iccProfileDefined() ) { // first block of profile
|
|
Packit |
01d647 |
setIccProfile(icc,chunk==chunks);
|
|
Packit |
01d647 |
} else { // extend existing profile
|
|
Packit |
01d647 |
DataBuf profile(Safe::add(iccProfile_.size_, icc.size_));
|
|
Packit |
01d647 |
if ( iccProfile_.size_ ) {
|
|
Packit |
01d647 |
::memcpy(profile.pData_,iccProfile_.pData_,iccProfile_.size_);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
::memcpy(profile.pData_+iccProfile_.size_,icc.pData_,icc.size_);
|
|
Packit |
01d647 |
setIccProfile(profile,chunk==chunks);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
else if ( pixelHeight_ == 0 && inRange2(marker,sof0_,sof3_,sof5_,sof15_) ) {
|
|
Packit |
01d647 |
// We hit a SOFn (start-of-frame) marker
|
|
Packit |
01d647 |
if (size < 8) {
|
|
Packit |
01d647 |
rc = 7;
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
pixelHeight_ = getUShort(buf.pData_ + 3, bigEndian);
|
|
Packit |
01d647 |
pixelWidth_ = getUShort(buf.pData_ + 5, bigEndian);
|
|
Packit |
01d647 |
if (pixelHeight_ != 0) --search;
|
|
Packit |
01d647 |
// Skip the remainder of the segment
|
|
Packit |
01d647 |
io_->seek(size-bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
else {
|
|
Packit |
01d647 |
if (size < 2) {
|
|
Packit |
01d647 |
rc = 4;
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Skip the remainder of the unknown segment
|
|
Packit |
01d647 |
if (io_->seek(size - bufRead, BasicIo::cur)) throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// Read the beginning of the next segment
|
|
Packit |
01d647 |
marker = advanceToMarker();
|
|
Packit |
01d647 |
if (marker < 0) {
|
|
Packit |
01d647 |
rc = 5;
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
} // while there are segments to process
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (psBlob.size() > 0) {
|
|
Packit |
01d647 |
// Find actual IPTC data within the psBlob
|
|
Packit |
01d647 |
Blob iptcBlob;
|
|
Packit |
01d647 |
const byte *record = 0;
|
|
Packit |
01d647 |
uint32_t sizeIptc = 0;
|
|
Packit |
01d647 |
uint32_t sizeHdr = 0;
|
|
Packit |
01d647 |
const byte* pCur = &psBlob[0];
|
|
Packit |
01d647 |
const byte* pEnd = pCur + psBlob.size();
|
|
Packit |
01d647 |
while ( pCur < pEnd
|
|
Packit |
01d647 |
&& 0 == Photoshop::locateIptcIrb(pCur, static_cast<long>(pEnd - pCur),
|
|
Packit |
01d647 |
&record, &sizeHdr, &sizeIptc)) {
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "Found IPTC IRB, size = " << sizeIptc << "\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
if (sizeIptc) {
|
|
Packit |
01d647 |
append(iptcBlob, record + sizeHdr, sizeIptc);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
pCur = record + sizeHdr + sizeIptc + (sizeIptc & 1);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if ( iptcBlob.size() > 0
|
|
Packit |
01d647 |
&& IptcParser::decode(iptcData_,
|
|
Packit |
01d647 |
&iptcBlob[0],
|
|
Packit |
01d647 |
static_cast<uint32_t>(iptcBlob.size()))) {
|
|
Packit |
01d647 |
#ifndef SUPPRESS_WARNINGS
|
|
Packit |
01d647 |
EXV_WARNING << "Failed to decode IPTC metadata.\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
iptcData_.clear();
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
} // psBlob.size() > 0
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (rc != 0) {
|
|
Packit |
01d647 |
#ifndef SUPPRESS_WARNINGS
|
|
Packit |
01d647 |
EXV_WARNING << "JPEG format error, rc = " << rc << "\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
} // JpegBase::readMetadata
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
#define REPORT_MARKER if ( (option == kpsBasic||option == kpsRecursive) ) \
|
|
Packit |
01d647 |
out << Internal::stringFormat("%8ld | 0xff%02x %-5s", \
|
|
Packit |
01d647 |
io_->tell()-2,marker,nm[marker].c_str())
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
void JpegBase::printStructure(std::ostream& out, PrintStructureOption option, int depth)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
if (io_->open() != 0)
|
|
Packit |
01d647 |
throw Error(kerDataSourceOpenFailed, io_->path(), strError());
|
|
Packit |
01d647 |
// Ensure that this is the correct image type
|
|
Packit |
01d647 |
if (!isThisType(*io_, false)) {
|
|
Packit |
01d647 |
if (io_->error() || io_->eof())
|
|
Packit |
01d647 |
throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
throw Error(kerNotAJpeg);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
bool bPrint = option == kpsBasic || option == kpsRecursive;
|
|
Packit |
01d647 |
Exiv2::Uint32Vector iptcDataSegs;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (bPrint || option == kpsXMP || option == kpsIccProfile || option == kpsIptcErase) {
|
|
Packit |
01d647 |
// nmonic for markers
|
|
Packit |
01d647 |
std::string nm[256];
|
|
Packit |
01d647 |
nm[0xd8] = "SOI";
|
|
Packit |
01d647 |
nm[0xd9] = "EOI";
|
|
Packit |
01d647 |
nm[0xda] = "SOS";
|
|
Packit |
01d647 |
nm[0xdb] = "DQT";
|
|
Packit |
01d647 |
nm[0xdd] = "DRI";
|
|
Packit |
01d647 |
nm[0xfe] = "COM";
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// 0xe0 .. 0xef are APPn
|
|
Packit |
01d647 |
// 0xc0 .. 0xcf are SOFn (except 4)
|
|
Packit |
01d647 |
nm[0xc4] = "DHT";
|
|
Packit |
01d647 |
for (int i = 0; i <= 15; i++) {
|
|
Packit Service |
fb147c |
char MN[16];
|
|
Packit Service |
fb147c |
/// \todo to be replaced by std::snprintf on master (only available in c++11)
|
|
Packit |
01d647 |
sprintf(MN, "APP%d", i);
|
|
Packit |
01d647 |
nm[0xe0 + i] = MN;
|
|
Packit |
01d647 |
if (i != 4) {
|
|
Packit |
01d647 |
sprintf(MN, "SOF%d", i);
|
|
Packit |
01d647 |
nm[0xc0 + i] = MN;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// which markers have a length field?
|
|
Packit |
01d647 |
bool mHasLength[256];
|
|
Packit |
01d647 |
for (int i = 0; i < 256; i++)
|
|
Packit |
01d647 |
mHasLength[i] = (i >= sof0_ && i <= sof15_) || (i >= app0_ && i <= (app0_ | 0x0F)) ||
|
|
Packit |
01d647 |
(i == dht_ || i == dqt_ || i == dri_ || i == com_ || i == sos_);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Container for the signature
|
|
Packit |
01d647 |
bool bExtXMP = false;
|
|
Packit |
01d647 |
long bufRead = 0;
|
|
Packit |
01d647 |
const long bufMinSize = 36;
|
|
Packit |
01d647 |
DataBuf buf(bufMinSize);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Read section marker
|
|
Packit |
01d647 |
int marker = advanceToMarker();
|
|
Packit |
01d647 |
if (marker < 0)
|
|
Packit |
01d647 |
throw Error(kerNotAJpeg);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
bool done = false;
|
|
Packit |
01d647 |
bool first = true;
|
|
Packit |
01d647 |
while (!done) {
|
|
Packit |
01d647 |
// print marker bytes
|
|
Packit |
01d647 |
if (first && bPrint) {
|
|
Packit |
01d647 |
out << "STRUCTURE OF JPEG FILE: " << io_->path() << std::endl;
|
|
Packit |
01d647 |
out << " address | marker | length | data" << std::endl;
|
|
Packit |
01d647 |
REPORT_MARKER;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
first = false;
|
|
Packit |
01d647 |
bool bLF = bPrint;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Read size and signature
|
|
Packit |
01d647 |
std::memset(buf.pData_, 0x0, buf.size_);
|
|
Packit |
01d647 |
bufRead = io_->read(buf.pData_, bufMinSize);
|
|
Packit |
01d647 |
if (io_->error())
|
|
Packit |
01d647 |
throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
if (bufRead < 2)
|
|
Packit |
01d647 |
throw Error(kerNotAJpeg);
|
|
Packit |
01d647 |
const uint16_t size = mHasLength[marker] ? getUShort(buf.pData_, bigEndian) : 0;
|
|
Packit |
01d647 |
if (bPrint && mHasLength[marker])
|
|
Packit |
01d647 |
out << Internal::stringFormat(" | %7d ", size);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// print signature for APPn
|
|
Packit |
01d647 |
if (marker >= app0_ && marker <= (app0_ | 0x0F)) {
|
|
Packit |
01d647 |
// http://www.adobe.com/content/dam/Adobe/en/devnet/xmp/pdfs/XMPSpecificationPart3.pdf p75
|
|
Packit |
01d647 |
const std::string signature =
|
|
Packit |
01d647 |
string_from_unterminated(reinterpret_cast<const char*>(buf.pData_ + 2), buf.size_ - 2);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// 728 rmills@rmillsmbp:~/gnu/exiv2/ttt $ exiv2 -pS test/data/exiv2-bug922.jpg
|
|
Packit |
01d647 |
// STRUCTURE OF JPEG FILE: test/data/exiv2-bug922.jpg
|
|
Packit |
01d647 |
// address | marker | length | data
|
|
Packit |
01d647 |
// 0 | 0xd8 SOI | 0
|
|
Packit |
01d647 |
// 2 | 0xe1 APP1 | 911 | Exif..MM.*.......%.........#....
|
|
Packit |
01d647 |
// 915 | 0xe1 APP1 | 870 | http://ns.adobe.com/xap/1.0/.
|
|
Packit |
01d647 |
// 1787 | 0xe1 APP1 | 65460 | http://ns.adobe.com/xmp/extensio
|
|
Packit |
01d647 |
if (option == kpsXMP && signature.find("http://ns.adobe.com/x") == 0) {
|
|
Packit |
01d647 |
// extract XMP
|
|
Packit |
01d647 |
if (size > 0) {
|
|
Packit |
01d647 |
io_->seek(-bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
std::vector<byte> xmp(size + 1);
|
|
Packit |
01d647 |
io_->read(&xmp[0], size);
|
|
Packit |
01d647 |
int start = 0;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// http://wwwimages.adobe.com/content/dam/Adobe/en/devnet/xmp/pdfs/XMPSpecificationPart3.pdf
|
|
Packit |
01d647 |
// if we find HasExtendedXMP, set the flag and ignore this block
|
|
Packit |
01d647 |
// the first extended block is a copy of the Standard block.
|
|
Packit |
01d647 |
// a robust implementation allows extended blocks to be out of sequence
|
|
Packit |
01d647 |
// we could implement out of sequence with a dictionary of sequence/offset
|
|
Packit |
01d647 |
// and dumping the XMP in a post read operation similar to kpsIptcErase
|
|
Packit |
01d647 |
// for the moment, dumping 'on the fly' is working fine
|
|
Packit |
01d647 |
if (!bExtXMP) {
|
|
Packit |
01d647 |
while (xmp.at(start)) {
|
|
Packit |
01d647 |
start++;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
start++;
|
|
Packit |
01d647 |
const std::string xmp_from_start = string_from_unterminated(
|
|
Packit |
01d647 |
reinterpret_cast<const char*>(&xmp.at(start)), size - start);
|
|
Packit |
01d647 |
if (xmp_from_start.find("HasExtendedXMP", start) != xmp_from_start.npos) {
|
|
Packit |
01d647 |
start = size; // ignore this packet, we'll get on the next time around
|
|
Packit |
01d647 |
bExtXMP = true;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
} else {
|
|
Packit |
01d647 |
start = 2 + 35 + 32 + 4 + 4; // Adobe Spec, p19
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
out.write(reinterpret_cast<const char*>(&xmp.at(start)), size - start);
|
|
Packit |
01d647 |
bufRead = size;
|
|
Packit |
01d647 |
done = !bExtXMP;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
} else if (option == kpsIccProfile && signature.compare(iccId_) == 0) {
|
|
Packit |
01d647 |
// extract ICCProfile
|
|
Packit |
01d647 |
if (size > 0) {
|
|
Packit |
01d647 |
io_->seek(-bufRead, BasicIo::cur); // back to buffer (after marker)
|
|
Packit |
01d647 |
io_->seek(14 + 2, BasicIo::cur); // step over header
|
|
Packit |
01d647 |
DataBuf icc(size - (14 + 2));
|
|
Packit |
01d647 |
io_->read(icc.pData_, icc.size_);
|
|
Packit |
01d647 |
out.write(reinterpret_cast<const char*>(icc.pData_), icc.size_);
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cout << "iccProfile size = " << icc.size_ << std::endl;
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
bufRead = size;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
} else if (option == kpsIptcErase && signature.compare("Photoshop 3.0") == 0) {
|
|
Packit |
01d647 |
// delete IPTC data segment from JPEG
|
|
Packit |
01d647 |
if (size > 0) {
|
|
Packit |
01d647 |
io_->seek(-bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
iptcDataSegs.push_back(io_->tell());
|
|
Packit |
01d647 |
iptcDataSegs.push_back(size);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
} else if (bPrint) {
|
|
Packit |
01d647 |
const size_t start = size > 0 ? 2 : 0;
|
|
Packit |
01d647 |
const size_t end = start + (size > 32 ? 32 : size);
|
|
Packit |
01d647 |
out << "| " << Internal::binaryToString(makeSlice(buf, start, end));
|
|
Packit |
01d647 |
if (signature.compare(iccId_) == 0) {
|
|
Packit |
01d647 |
// extract the chunk information from the buffer
|
|
Packit |
01d647 |
//
|
|
Packit |
01d647 |
// the buffer looks like this in this branch
|
|
Packit |
01d647 |
// ICC_PROFILE\0AB
|
|
Packit |
01d647 |
// where A & B are bytes (the variables chunk & chunks)
|
|
Packit |
01d647 |
//
|
|
Packit |
01d647 |
// We cannot extract the variables A and B from the signature string, as they are beyond the
|
|
Packit |
01d647 |
// null termination (and signature ends there).
|
|
Packit |
01d647 |
// => Read the chunk info from the DataBuf directly
|
|
Packit |
01d647 |
enforce<std::out_of_range>(buf.size_ - 2 > 14, "Buffer too small to extract chunk information.");
|
|
Packit |
01d647 |
const int chunk = buf.pData_[2 + 12];
|
|
Packit |
01d647 |
const int chunks = buf.pData_[2 + 13];
|
|
Packit |
01d647 |
out << Internal::stringFormat(" chunk %d/%d", chunk, chunks);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// for MPF: http://www.sno.phy.queensu.ca/~phil/exiftool/TagNames/MPF.html
|
|
Packit |
01d647 |
// for FLIR: http://owl.phy.queensu.ca/~phil/exiftool/TagNames/FLIR.html
|
|
Packit |
01d647 |
bool bFlir = option == kpsRecursive && marker == (app0_ + 1) && signature.compare("FLIR") == 0;
|
|
Packit |
01d647 |
bool bExif = option == kpsRecursive && marker == (app0_ + 1) && signature.compare("Exif") == 0;
|
|
Packit |
01d647 |
bool bMPF = option == kpsRecursive && marker == (app0_ + 2) && signature.compare("MPF") == 0;
|
|
Packit |
01d647 |
bool bPS = option == kpsRecursive && signature.compare("Photoshop 3.0") == 0;
|
|
Packit |
01d647 |
if (bFlir || bExif || bMPF || bPS) {
|
|
Packit |
01d647 |
// extract Exif data block which is tiff formatted
|
|
Packit |
01d647 |
if (size > 0) {
|
|
Packit |
01d647 |
out << std::endl;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// allocate storage and current file position
|
|
Packit |
01d647 |
byte* exif = new byte[size];
|
|
Packit |
01d647 |
uint32_t restore = io_->tell();
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// copy the data to memory
|
|
Packit |
01d647 |
io_->seek(-bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
io_->read(exif, size);
|
|
Packit |
01d647 |
uint32_t start = signature.compare("Exif") == 0 ? 8 : 6;
|
|
Packit |
01d647 |
uint32_t max = (uint32_t)size - 1;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// is this an fff block?
|
|
Packit |
01d647 |
if (bFlir) {
|
|
Packit |
01d647 |
start = 0;
|
|
Packit |
01d647 |
bFlir = false;
|
|
Packit |
01d647 |
while (start < max) {
|
|
Packit |
01d647 |
if (std::strcmp((const char*)(exif + start), "FFF") == 0) {
|
|
Packit |
01d647 |
bFlir = true;
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
start++;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// there is a header in FLIR, followed by a tiff block
|
|
Packit |
01d647 |
// Hunt down the tiff using brute force
|
|
Packit |
01d647 |
if (bFlir) {
|
|
Packit |
01d647 |
// FLIRFILEHEAD* pFFF = (FLIRFILEHEAD*) (exif+start) ;
|
|
Packit |
01d647 |
while (start < max) {
|
|
Packit |
01d647 |
if (exif[start] == 'I' && exif[start + 1] == 'I')
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
if (exif[start] == 'M' && exif[start + 1] == 'M')
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
start++;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (start < max)
|
|
Packit |
01d647 |
std::cout << " FFF start = " << start << std::endl;
|
|
Packit |
01d647 |
// << " index = " << pFFF->dwIndexOff << std::endl;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (bPS) {
|
|
Packit |
01d647 |
IptcData::printStructure(out, makeSlice(exif, 0, size), depth);
|
|
Packit |
01d647 |
} else {
|
|
Packit |
01d647 |
// create a copy on write memio object with the data, then print the structure
|
|
Packit |
01d647 |
BasicIo::AutoPtr p = BasicIo::AutoPtr(new MemIo(exif + start, size - start));
|
|
Packit |
01d647 |
if (start < max)
|
|
Packit |
01d647 |
printTiffStructure(*p, out, option, depth);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// restore and clean up
|
|
Packit |
01d647 |
io_->seek(restore, Exiv2::BasicIo::beg);
|
|
Packit |
01d647 |
delete[] exif;
|
|
Packit |
01d647 |
bLF = false;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// print COM marker
|
|
Packit |
01d647 |
if (bPrint && marker == com_) {
|
|
Packit |
01d647 |
// size includes 2 for the two bytes for size!
|
|
Packit |
01d647 |
const int n = (size - 2) > 32 ? 32 : size - 2;
|
|
Packit |
01d647 |
// start after the two bytes
|
|
Packit |
01d647 |
out << "| "
|
|
Packit |
01d647 |
<< Internal::binaryToString(
|
|
Packit |
01d647 |
makeSlice(buf, 2, n + 2 /* cannot overflow as n is at most size - 2 */));
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Skip the segment if the size is known
|
|
Packit |
01d647 |
if (io_->seek(size - bufRead, BasicIo::cur))
|
|
Packit |
01d647 |
throw Error(kerFailedToReadImageData);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (bLF)
|
|
Packit |
01d647 |
out << std::endl;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (marker != sos_) {
|
|
Packit |
01d647 |
// Read the beginning of the next segment
|
|
Packit |
01d647 |
marker = advanceToMarker();
|
|
Packit |
01d647 |
enforce(marker>=0, kerNoImageInInputData);
|
|
Packit |
01d647 |
REPORT_MARKER;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
done |= marker == eoi_ || marker == sos_;
|
|
Packit |
01d647 |
if (done && bPrint)
|
|
Packit |
01d647 |
out << std::endl;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (option == kpsIptcErase && iptcDataSegs.size()) {
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cout << "iptc data blocks: " << iptcDataSegs.size() << std::endl;
|
|
Packit |
01d647 |
uint32_t toggle = 0;
|
|
Packit |
01d647 |
for (Uint32Vector_i i = iptcDataSegs.begin(); i != iptcDataSegs.end(); i++) {
|
|
Packit |
01d647 |
std::cout << *i;
|
|
Packit |
01d647 |
if (toggle++ % 2)
|
|
Packit |
01d647 |
std::cout << std::endl;
|
|
Packit |
01d647 |
else
|
|
Packit |
01d647 |
std::cout << ' ';
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
uint32_t count = (uint32_t)iptcDataSegs.size();
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// figure out which blocks to copy
|
|
Packit |
01d647 |
uint64_t* pos = new uint64_t[count + 2];
|
|
Packit |
01d647 |
pos[0] = 0;
|
|
Packit |
01d647 |
// copy the data that is not iptc
|
|
Packit |
01d647 |
Uint32Vector_i it = iptcDataSegs.begin();
|
|
Packit |
01d647 |
for (uint64_t i = 0; i < count; i++) {
|
|
Packit |
01d647 |
bool bOdd = (i % 2) != 0;
|
|
Packit |
01d647 |
bool bEven = !bOdd;
|
|
Packit |
01d647 |
pos[i + 1] = bEven ? *it : pos[i] + *it;
|
|
Packit |
01d647 |
++it;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
pos[count + 1] = io_->size() - pos[count];
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
for (uint64_t i = 0; i < count + 2; i++)
|
|
Packit |
01d647 |
std::cout << pos[i] << " ";
|
|
Packit |
01d647 |
std::cout << std::endl;
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
// $ dd bs=1 skip=$((0)) count=$((13164)) if=ETH0138028.jpg of=E1.jpg
|
|
Packit |
01d647 |
// $ dd bs=1 skip=$((49304)) count=2000000 if=ETH0138028.jpg of=E2.jpg
|
|
Packit |
01d647 |
// cat E1.jpg E2.jpg > E.jpg
|
|
Packit |
01d647 |
// exiv2 -pS E.jpg
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// binary copy io_ to a temporary file
|
|
Packit |
01d647 |
BasicIo::AutoPtr tempIo(new MemIo);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
assert(tempIo.get() != 0);
|
|
Packit |
01d647 |
for (uint64_t i = 0; i < (count / 2) + 1; i++) {
|
|
Packit |
01d647 |
uint64_t start = pos[2 * i] + 2; // step JPG 2 byte marker
|
|
Packit |
01d647 |
if (start == 2)
|
|
Packit |
01d647 |
start = 0; // read the file 2 byte SOI
|
|
Packit |
01d647 |
long length = (long)(pos[2 * i + 1] - start);
|
|
Packit |
01d647 |
if (length) {
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cout << start << ":" << length << std::endl;
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
io_->seek(start, BasicIo::beg);
|
|
Packit |
01d647 |
DataBuf buf(length);
|
|
Packit |
01d647 |
io_->read(buf.pData_, buf.size_);
|
|
Packit |
01d647 |
tempIo->write(buf.pData_, buf.size_);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
delete[] pos;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
io_->seek(0, BasicIo::beg);
|
|
Packit |
01d647 |
io_->transfer(*tempIo); // may throw
|
|
Packit |
01d647 |
io_->seek(0, BasicIo::beg);
|
|
Packit |
01d647 |
readMetadata();
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
} // JpegBase::printStructure
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
void JpegBase::writeMetadata()
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
if (io_->open() != 0) {
|
|
Packit |
01d647 |
throw Error(kerDataSourceOpenFailed, io_->path(), strError());
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
IoCloser closer(*io_);
|
|
Packit |
01d647 |
BasicIo::AutoPtr tempIo(new MemIo);
|
|
Packit |
01d647 |
assert (tempIo.get() != 0);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
doWriteMetadata(*tempIo); // may throw
|
|
Packit |
01d647 |
io_->close();
|
|
Packit |
01d647 |
io_->transfer(*tempIo); // may throw
|
|
Packit |
01d647 |
} // JpegBase::writeMetadata
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
void JpegBase::doWriteMetadata(BasicIo& outIo)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
if (!io_->isopen())
|
|
Packit |
01d647 |
throw Error(kerInputDataReadFailed);
|
|
Packit |
01d647 |
if (!outIo.isopen())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Ensure that this is the correct image type
|
|
Packit |
01d647 |
if (!isThisType(*io_, true)) {
|
|
Packit |
01d647 |
if (io_->error() || io_->eof())
|
|
Packit |
01d647 |
throw Error(kerInputDataReadFailed);
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
const long bufMinSize = 36;
|
|
Packit |
01d647 |
long bufRead = 0;
|
|
Packit |
01d647 |
DataBuf buf(bufMinSize);
|
|
Packit |
01d647 |
const long seek = io_->tell();
|
|
Packit |
01d647 |
int count = 0;
|
|
Packit |
01d647 |
int search = 0;
|
|
Packit |
01d647 |
int insertPos = 0;
|
|
Packit |
01d647 |
int comPos = 0;
|
|
Packit |
01d647 |
int skipApp1Exif = -1;
|
|
Packit |
01d647 |
int skipApp1Xmp = -1;
|
|
Packit |
01d647 |
bool foundCompletePsData = false;
|
|
Packit |
01d647 |
bool foundIccData = false;
|
|
Packit |
01d647 |
std::vector<int> skipApp13Ps3;
|
|
Packit |
01d647 |
std::vector<int> skipApp2Icc;
|
|
Packit |
01d647 |
int skipCom = -1;
|
|
Packit |
01d647 |
Blob psBlob;
|
|
Packit |
01d647 |
DataBuf rawExif;
|
|
Packit |
01d647 |
xmpData().usePacket(writeXmpFromPacket());
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Write image header
|
|
Packit |
01d647 |
if (writeHeader(outIo))
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Read section marker
|
|
Packit |
01d647 |
int marker = advanceToMarker();
|
|
Packit |
01d647 |
if (marker < 0)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// First find segments of interest. Normally app0 is first and we want
|
|
Packit |
01d647 |
// to insert after it. But if app0 comes after com, app1 and app13 then
|
|
Packit |
01d647 |
// don't bother.
|
|
Packit |
01d647 |
while (marker != sos_ && marker != eoi_ && search < 6) {
|
|
Packit |
01d647 |
// Read size and signature (ok if this hits EOF)
|
|
Packit |
01d647 |
bufRead = io_->read(buf.pData_, bufMinSize);
|
|
Packit |
01d647 |
if (io_->error())
|
|
Packit |
01d647 |
throw Error(kerInputDataReadFailed);
|
|
Packit |
01d647 |
uint16_t size = getUShort(buf.pData_, bigEndian);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (marker == app0_) {
|
|
Packit |
01d647 |
if (size < 2)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
insertPos = count + 1;
|
|
Packit |
01d647 |
if (io_->seek(size - bufRead, BasicIo::cur))
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
} else if (skipApp1Exif == -1 && marker == app1_ && memcmp(buf.pData_ + 2, exifId_, 6) == 0) {
|
|
Packit |
01d647 |
if (size < 8)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
skipApp1Exif = count;
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
// Seek to beginning and read the current Exif data
|
|
Packit |
01d647 |
io_->seek(8 - bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
rawExif.alloc(size - 8);
|
|
Packit |
01d647 |
io_->read(rawExif.pData_, rawExif.size_);
|
|
Packit |
01d647 |
if (io_->error() || io_->eof())
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
} else if (skipApp1Xmp == -1 && marker == app1_ && memcmp(buf.pData_ + 2, xmpId_, 29) == 0) {
|
|
Packit |
01d647 |
if (size < 31)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
skipApp1Xmp = count;
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
if (io_->seek(size - bufRead, BasicIo::cur))
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
} else if (marker == app2_ && memcmp(buf.pData_ + 2, iccId_, 11) == 0) {
|
|
Packit |
01d647 |
if (size < 31)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
skipApp2Icc.push_back(count);
|
|
Packit |
01d647 |
if (!foundIccData) {
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
foundIccData = true;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (io_->seek(size - bufRead, BasicIo::cur))
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
} else if (!foundCompletePsData && marker == app13_ && memcmp(buf.pData_ + 2, Photoshop::ps3Id_, 14) == 0) {
|
|
Packit |
01d647 |
#ifdef EXIV2_DEBUG_MESSAGES
|
|
Packit |
01d647 |
std::cerr << "Found APP13 Photoshop PS3 segment\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
if (size < 16)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
skipApp13Ps3.push_back(count);
|
|
Packit |
01d647 |
io_->seek(16 - bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
// Load PS data now to allow reinsertion at any point
|
|
Packit |
01d647 |
DataBuf psData(size - 16);
|
|
Packit |
01d647 |
io_->read(psData.pData_, size - 16);
|
|
Packit |
01d647 |
if (io_->error() || io_->eof())
|
|
Packit |
01d647 |
throw Error(kerInputDataReadFailed);
|
|
Packit |
01d647 |
// Append to psBlob
|
|
Packit |
01d647 |
append(psBlob, psData.pData_, psData.size_);
|
|
Packit |
01d647 |
// Check whether psBlob is complete
|
|
Packit |
01d647 |
if (psBlob.size() > 0 && Photoshop::valid(&psBlob[0], (long)psBlob.size())) {
|
|
Packit |
01d647 |
foundCompletePsData = true;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
} else if (marker == com_ && skipCom == -1) {
|
|
Packit |
01d647 |
if (size < 2)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
// Jpegs can have multiple comments, but for now only handle
|
|
Packit |
01d647 |
// the first one (most jpegs only have one anyway).
|
|
Packit |
01d647 |
skipCom = count;
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
if (io_->seek(size - bufRead, BasicIo::cur))
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
} else {
|
|
Packit |
01d647 |
if (size < 2)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
if (io_->seek(size - bufRead, BasicIo::cur))
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
// As in jpeg-6b/wrjpgcom.c:
|
|
Packit |
01d647 |
// We will insert the new comment marker just before SOFn.
|
|
Packit |
01d647 |
// This (a) causes the new comment to appear after, rather than before,
|
|
Packit |
01d647 |
// existing comments; and (b) ensures that comments come after any JFIF
|
|
Packit |
01d647 |
// or JFXX markers, as required by the JFIF specification.
|
|
Packit |
01d647 |
if (comPos == 0 && inRange2(marker, sof0_, sof3_, sof5_, sof15_)) {
|
|
Packit |
01d647 |
comPos = count;
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
marker = advanceToMarker();
|
|
Packit |
01d647 |
if (marker < 0)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
++count;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (!foundCompletePsData && psBlob.size() > 0)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
search += (int)skipApp13Ps3.size() + (int)skipApp2Icc.size();
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (comPos == 0) {
|
|
Packit |
01d647 |
if (marker == eoi_)
|
|
Packit |
01d647 |
comPos = count;
|
|
Packit |
01d647 |
else
|
|
Packit |
01d647 |
comPos = insertPos;
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (exifData_.count() > 0)
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
if (writeXmpFromPacket() == false && xmpData_.count() > 0)
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
if (writeXmpFromPacket() == true && xmpPacket_.size() > 0)
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
if (foundCompletePsData || iptcData_.count() > 0)
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
if (!comment_.empty())
|
|
Packit |
01d647 |
++search;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
io_->seek(seek, BasicIo::beg);
|
|
Packit |
01d647 |
count = 0;
|
|
Packit |
01d647 |
marker = advanceToMarker();
|
|
Packit |
01d647 |
if (marker < 0)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// To simplify this a bit, new segments are inserts at either the start
|
|
Packit |
01d647 |
// or right after app0. This is standard in most jpegs, but has the
|
|
Packit |
01d647 |
// potential to change segment ordering (which is allowed).
|
|
Packit |
01d647 |
// Segments are erased if there is no assigned metadata.
|
|
Packit |
01d647 |
while (marker != sos_ && search > 0) {
|
|
Packit |
01d647 |
// Read size and signature (ok if this hits EOF)
|
|
Packit |
01d647 |
bufRead = io_->read(buf.pData_, bufMinSize);
|
|
Packit |
01d647 |
if (io_->error())
|
|
Packit |
01d647 |
throw Error(kerInputDataReadFailed);
|
|
Packit |
01d647 |
// Careful, this can be a meaningless number for empty
|
|
Packit |
01d647 |
// images with only an eoi_ marker
|
|
Packit |
01d647 |
uint16_t size = getUShort(buf.pData_, bigEndian);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (insertPos == count) {
|
|
Packit |
01d647 |
byte tmpBuf[64];
|
|
Packit |
01d647 |
// Write Exif data first so that - if there is no app0 - we
|
|
Packit |
01d647 |
// create "Exif images" according to the Exif standard.
|
|
Packit |
01d647 |
if (exifData_.count() > 0) {
|
|
Packit |
01d647 |
Blob blob;
|
|
Packit |
01d647 |
ByteOrder bo = byteOrder();
|
|
Packit |
01d647 |
if (bo == invalidByteOrder) {
|
|
Packit |
01d647 |
bo = littleEndian;
|
|
Packit |
01d647 |
setByteOrder(bo);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
WriteMethod wm = ExifParser::encode(blob, rawExif.pData_, rawExif.size_, bo, exifData_);
|
|
Packit |
01d647 |
const byte* pExifData = rawExif.pData_;
|
|
Packit |
01d647 |
uint32_t exifSize = rawExif.size_;
|
|
Packit |
01d647 |
if (wm == wmIntrusive) {
|
|
Packit |
01d647 |
pExifData = blob.size() > 0 ? &blob[0] : 0;
|
|
Packit |
01d647 |
exifSize = static_cast<uint32_t>(blob.size());
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (exifSize > 0) {
|
|
Packit |
01d647 |
// Write APP1 marker, size of APP1 field, Exif id and Exif data
|
|
Packit |
01d647 |
tmpBuf[0] = 0xff;
|
|
Packit |
01d647 |
tmpBuf[1] = app1_;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (exifSize + 8 > 0xffff)
|
|
Packit |
01d647 |
throw Error(kerTooLargeJpegSegment, "Exif");
|
|
Packit |
01d647 |
us2Data(tmpBuf + 2, static_cast<uint16_t>(exifSize + 8), bigEndian);
|
|
Packit |
01d647 |
std::memcpy(tmpBuf + 4, exifId_, 6);
|
|
Packit |
01d647 |
if (outIo.write(tmpBuf, 10) != 10)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Write new Exif data buffer
|
|
Packit |
01d647 |
if (outIo.write(pExifData, exifSize) != static_cast<long>(exifSize))
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
if (outIo.error())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (writeXmpFromPacket() == false) {
|
|
Packit |
01d647 |
if (XmpParser::encode(xmpPacket_, xmpData_,
|
|
Packit |
01d647 |
XmpParser::useCompactFormat | XmpParser::omitAllFormatting) > 1) {
|
|
Packit |
01d647 |
#ifndef SUPPRESS_WARNINGS
|
|
Packit |
01d647 |
EXV_ERROR << "Failed to encode XMP metadata.\n";
|
|
Packit |
01d647 |
#endif
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (xmpPacket_.size() > 0) {
|
|
Packit |
01d647 |
// Write APP1 marker, size of APP1 field, XMP id and XMP packet
|
|
Packit |
01d647 |
tmpBuf[0] = 0xff;
|
|
Packit |
01d647 |
tmpBuf[1] = app1_;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (xmpPacket_.size() + 31 > 0xffff)
|
|
Packit |
01d647 |
throw Error(kerTooLargeJpegSegment, "XMP");
|
|
Packit |
01d647 |
us2Data(tmpBuf + 2, static_cast<uint16_t>(xmpPacket_.size() + 31), bigEndian);
|
|
Packit |
01d647 |
std::memcpy(tmpBuf + 4, xmpId_, 29);
|
|
Packit |
01d647 |
if (outIo.write(tmpBuf, 33) != 33)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Write new XMP packet
|
|
Packit |
01d647 |
if (outIo.write(reinterpret_cast<const byte*>(xmpPacket_.data()),
|
|
Packit |
01d647 |
static_cast<long>(xmpPacket_.size())) != static_cast<long>(xmpPacket_.size()))
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
if (outIo.error())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (iccProfileDefined()) {
|
|
Packit |
01d647 |
// Write APP2 marker, size of APP2 field, and IccProfile
|
|
Packit |
01d647 |
// See comments in readMetadata() about the ICC embedding specification
|
|
Packit |
01d647 |
tmpBuf[0] = 0xff;
|
|
Packit |
01d647 |
tmpBuf[1] = app2_;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
int chunk_size = 256 * 256 - 40; // leave bytes for marker, header and padding
|
|
Packit |
01d647 |
int size = (int)iccProfile_.size_;
|
|
Packit |
01d647 |
int chunks = 1 + (size - 1) / chunk_size;
|
|
Packit |
01d647 |
if (iccProfile_.size_ > 256 * chunk_size)
|
|
Packit |
01d647 |
throw Error(kerTooLargeJpegSegment, "IccProfile");
|
|
Packit |
01d647 |
for (int chunk = 0; chunk < chunks; chunk++) {
|
|
Packit |
01d647 |
int bytes = size > chunk_size ? chunk_size : size; // bytes to write
|
|
Packit |
01d647 |
size -= bytes;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// write JPEG marker (2 bytes)
|
|
Packit |
01d647 |
if (outIo.write(tmpBuf, 2) != 2)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed); // JPEG Marker
|
|
Packit |
01d647 |
// write length (2 bytes). length includes the 2 bytes for the length
|
|
Packit |
01d647 |
us2Data(tmpBuf + 2, 2 + 14 + bytes, bigEndian);
|
|
Packit |
01d647 |
if (outIo.write(tmpBuf + 2, 2) != 2)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed); // JPEG Length
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// write the ICC_PROFILE header (14 bytes)
|
|
Packit |
01d647 |
char pad[2];
|
|
Packit |
01d647 |
pad[0] = chunk + 1;
|
|
Packit |
01d647 |
pad[1] = chunks;
|
|
Packit |
01d647 |
outIo.write((const byte*)iccId_, 12);
|
|
Packit |
01d647 |
outIo.write((const byte*)pad, 2);
|
|
Packit |
01d647 |
if (outIo.write(iccProfile_.pData_ + (chunk * chunk_size), bytes) != bytes)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
if (outIo.error())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (foundCompletePsData || iptcData_.count() > 0) {
|
|
Packit |
01d647 |
// Set the new IPTC IRB, keeps existing IRBs but removes the
|
|
Packit |
01d647 |
// IPTC block if there is no new IPTC data to write
|
|
Packit |
01d647 |
DataBuf newPsData =
|
|
Packit |
01d647 |
Photoshop::setIptcIrb(psBlob.size() > 0 ? &psBlob[0] : 0, (long)psBlob.size(), iptcData_);
|
|
Packit |
01d647 |
const long maxChunkSize = 0xffff - 16;
|
|
Packit |
01d647 |
const byte* chunkStart = newPsData.pData_;
|
|
Packit |
01d647 |
const byte* chunkEnd = chunkStart + newPsData.size_;
|
|
Packit |
01d647 |
while (chunkStart < chunkEnd) {
|
|
Packit |
01d647 |
// Determine size of next chunk
|
|
Packit |
01d647 |
long chunkSize = static_cast<long>(chunkEnd - chunkStart);
|
|
Packit |
01d647 |
if (chunkSize > maxChunkSize) {
|
|
Packit |
01d647 |
chunkSize = maxChunkSize;
|
|
Packit |
01d647 |
// Don't break at a valid IRB boundary
|
|
Packit |
01d647 |
const long writtenSize = static_cast<long>(chunkStart - newPsData.pData_);
|
|
Packit |
01d647 |
if (Photoshop::valid(newPsData.pData_, writtenSize + chunkSize)) {
|
|
Packit |
01d647 |
// Since an IRB has minimum size 12,
|
|
Packit |
01d647 |
// (chunkSize - 8) can't be also a IRB boundary
|
|
Packit |
01d647 |
chunkSize -= 8;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Write APP13 marker, chunk size, and ps3Id
|
|
Packit |
01d647 |
tmpBuf[0] = 0xff;
|
|
Packit |
01d647 |
tmpBuf[1] = app13_;
|
|
Packit |
01d647 |
us2Data(tmpBuf + 2, static_cast<uint16_t>(chunkSize + 16), bigEndian);
|
|
Packit |
01d647 |
std::memcpy(tmpBuf + 4, Photoshop::ps3Id_, 14);
|
|
Packit |
01d647 |
if (outIo.write(tmpBuf, 18) != 18)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
if (outIo.error())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Write next chunk of the Photoshop IRB data buffer
|
|
Packit |
01d647 |
if (outIo.write(chunkStart, chunkSize) != chunkSize)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
if (outIo.error())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
chunkStart += chunkSize;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (comPos == count) {
|
|
Packit |
01d647 |
if (!comment_.empty()) {
|
|
Packit |
01d647 |
byte tmpBuf[4];
|
|
Packit |
01d647 |
// Write COM marker, size of comment, and string
|
|
Packit |
01d647 |
tmpBuf[0] = 0xff;
|
|
Packit |
01d647 |
tmpBuf[1] = com_;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (comment_.length() + 3 > 0xffff)
|
|
Packit |
01d647 |
throw Error(kerTooLargeJpegSegment, "JPEG comment");
|
|
Packit |
01d647 |
us2Data(tmpBuf + 2, static_cast<uint16_t>(comment_.length() + 3), bigEndian);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (outIo.write(tmpBuf, 4) != 4)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
if (outIo.write((byte*)comment_.data(), (long)comment_.length()) != (long)comment_.length())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
if (outIo.putb(0) == EOF)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
if (outIo.error())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (marker == eoi_) {
|
|
Packit |
01d647 |
break;
|
|
Packit |
01d647 |
} else if (skipApp1Exif == count || skipApp1Xmp == count ||
|
|
Packit |
01d647 |
std::find(skipApp13Ps3.begin(), skipApp13Ps3.end(), count) != skipApp13Ps3.end() ||
|
|
Packit |
01d647 |
std::find(skipApp2Icc.begin(), skipApp2Icc.end(), count) != skipApp2Icc.end() ||
|
|
Packit |
01d647 |
skipCom == count) {
|
|
Packit |
01d647 |
--search;
|
|
Packit |
01d647 |
io_->seek(size - bufRead, BasicIo::cur);
|
|
Packit |
01d647 |
} else {
|
|
Packit |
01d647 |
if (size < 2)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
buf.alloc(size + 2);
|
|
Packit |
01d647 |
io_->seek(-bufRead - 2, BasicIo::cur);
|
|
Packit |
01d647 |
io_->read(buf.pData_, size + 2);
|
|
Packit |
01d647 |
if (io_->error() || io_->eof())
|
|
Packit |
01d647 |
throw Error(kerInputDataReadFailed);
|
|
Packit |
01d647 |
if (outIo.write(buf.pData_, size + 2) != size + 2)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
if (outIo.error())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Next marker
|
|
Packit |
01d647 |
marker = advanceToMarker();
|
|
Packit |
01d647 |
if (marker < 0)
|
|
Packit |
01d647 |
throw Error(kerNoImageInInputData);
|
|
Packit |
01d647 |
++count;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Populate the fake data, only make sense for remoteio, httpio and sshio.
|
|
Packit |
01d647 |
// it avoids allocating memory for parts of the file that contain image-date.
|
|
Packit |
01d647 |
io_->populateFakeData();
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
// Copy rest of the Io
|
|
Packit |
01d647 |
io_->seek(-2, BasicIo::cur);
|
|
Packit |
01d647 |
buf.alloc(4096);
|
|
Packit |
01d647 |
long readSize = 0;
|
|
Packit |
01d647 |
while ((readSize = io_->read(buf.pData_, buf.size_))) {
|
|
Packit |
01d647 |
if (outIo.write(buf.pData_, readSize) != readSize)
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (outIo.error())
|
|
Packit |
01d647 |
throw Error(kerImageWriteFailed);
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
} // JpegBase::doWriteMetadata
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
const byte JpegImage::soi_ = 0xd8;
|
|
Packit |
01d647 |
const byte JpegImage::blank_[] = {
|
|
Packit |
01d647 |
0xFF,0xD8,0xFF,0xDB,0x00,0x84,0x00,0x10,0x0B,0x0B,0x0B,0x0C,0x0B,0x10,0x0C,0x0C,
|
|
Packit |
01d647 |
0x10,0x17,0x0F,0x0D,0x0F,0x17,0x1B,0x14,0x10,0x10,0x14,0x1B,0x1F,0x17,0x17,0x17,
|
|
Packit |
01d647 |
0x17,0x17,0x1F,0x1E,0x17,0x1A,0x1A,0x1A,0x1A,0x17,0x1E,0x1E,0x23,0x25,0x27,0x25,
|
|
Packit |
01d647 |
0x23,0x1E,0x2F,0x2F,0x33,0x33,0x2F,0x2F,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,
|
|
Packit |
01d647 |
0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x01,0x11,0x0F,0x0F,0x11,0x13,0x11,0x15,0x12,
|
|
Packit |
01d647 |
0x12,0x15,0x14,0x11,0x14,0x11,0x14,0x1A,0x14,0x16,0x16,0x14,0x1A,0x26,0x1A,0x1A,
|
|
Packit |
01d647 |
0x1C,0x1A,0x1A,0x26,0x30,0x23,0x1E,0x1E,0x1E,0x1E,0x23,0x30,0x2B,0x2E,0x27,0x27,
|
|
Packit |
01d647 |
0x27,0x2E,0x2B,0x35,0x35,0x30,0x30,0x35,0x35,0x40,0x40,0x3F,0x40,0x40,0x40,0x40,
|
|
Packit |
01d647 |
0x40,0x40,0x40,0x40,0x40,0x40,0x40,0x40,0xFF,0xC0,0x00,0x11,0x08,0x00,0x01,0x00,
|
|
Packit |
01d647 |
0x01,0x03,0x01,0x22,0x00,0x02,0x11,0x01,0x03,0x11,0x01,0xFF,0xC4,0x00,0x4B,0x00,
|
|
Packit |
01d647 |
0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
Packit |
01d647 |
0x00,0x07,0x01,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
Packit |
01d647 |
0x00,0x00,0x00,0x00,0x10,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
Packit |
01d647 |
0x00,0x00,0x00,0x00,0x00,0x00,0x11,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
|
|
Packit |
01d647 |
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xFF,0xDA,0x00,0x0C,0x03,0x01,0x00,0x02,
|
|
Packit |
01d647 |
0x11,0x03,0x11,0x00,0x3F,0x00,0xA0,0x00,0x0F,0xFF,0xD9 };
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
JpegImage::JpegImage(BasicIo::AutoPtr io, bool create)
|
|
Packit |
01d647 |
: JpegBase(ImageType::jpeg, io, create, blank_, sizeof(blank_))
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
std::string JpegImage::mimeType() const
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
return "image/jpeg";
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
int JpegImage::writeHeader(BasicIo& outIo) const
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
// Jpeg header
|
|
Packit |
01d647 |
byte tmpBuf[2];
|
|
Packit |
01d647 |
tmpBuf[0] = 0xff;
|
|
Packit |
01d647 |
tmpBuf[1] = soi_;
|
|
Packit |
01d647 |
if (outIo.write(tmpBuf, 2) != 2) return 4;
|
|
Packit |
01d647 |
if (outIo.error()) return 4;
|
|
Packit |
01d647 |
return 0;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
bool JpegImage::isThisType(BasicIo& iIo, bool advance) const
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
return isJpegType(iIo, advance);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
Image::AutoPtr newJpegInstance(BasicIo::AutoPtr io, bool create)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
Image::AutoPtr image(new JpegImage(io, create));
|
|
Packit |
01d647 |
if (!image->good()) {
|
|
Packit |
01d647 |
image.reset();
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
return image;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
bool isJpegType(BasicIo& iIo, bool advance)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
bool result = true;
|
|
Packit |
01d647 |
byte tmpBuf[2];
|
|
Packit |
01d647 |
iIo.read(tmpBuf, 2);
|
|
Packit |
01d647 |
if (iIo.error() || iIo.eof()) return false;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if (0xff != tmpBuf[0] || JpegImage::soi_ != tmpBuf[1]) {
|
|
Packit |
01d647 |
result = false;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (!advance || !result ) iIo.seek(-2, BasicIo::cur);
|
|
Packit |
01d647 |
return result;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
const char ExvImage::exiv2Id_[] = "Exiv2";
|
|
Packit |
01d647 |
const byte ExvImage::blank_[] = { 0xff,0x01,'E','x','i','v','2',0xff,0xd9 };
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
ExvImage::ExvImage(BasicIo::AutoPtr io, bool create)
|
|
Packit |
01d647 |
: JpegBase(ImageType::exv, io, create, blank_, sizeof(blank_))
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
std::string ExvImage::mimeType() const
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
return "image/x-exv";
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
int ExvImage::writeHeader(BasicIo& outIo) const
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
// Exv header
|
|
Packit |
01d647 |
byte tmpBuf[7];
|
|
Packit |
01d647 |
tmpBuf[0] = 0xff;
|
|
Packit |
01d647 |
tmpBuf[1] = 0x01;
|
|
Packit |
01d647 |
std::memcpy(tmpBuf + 2, exiv2Id_, 5);
|
|
Packit |
01d647 |
if (outIo.write(tmpBuf, 7) != 7) return 4;
|
|
Packit |
01d647 |
if (outIo.error()) return 4;
|
|
Packit |
01d647 |
return 0;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
bool ExvImage::isThisType(BasicIo& iIo, bool advance) const
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
return isExvType(iIo, advance);
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
Image::AutoPtr newExvInstance(BasicIo::AutoPtr io, bool create)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
Image::AutoPtr image;
|
|
Packit |
01d647 |
image = Image::AutoPtr(new ExvImage(io, create));
|
|
Packit |
01d647 |
if (!image->good()) image.reset();
|
|
Packit |
01d647 |
return image;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
bool isExvType(BasicIo& iIo, bool advance)
|
|
Packit |
01d647 |
{
|
|
Packit |
01d647 |
bool result = true;
|
|
Packit |
01d647 |
byte tmpBuf[7];
|
|
Packit |
01d647 |
iIo.read(tmpBuf, 7);
|
|
Packit |
01d647 |
if (iIo.error() || iIo.eof()) return false;
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
if ( 0xff != tmpBuf[0] || 0x01 != tmpBuf[1]
|
|
Packit |
01d647 |
|| memcmp(tmpBuf + 2, ExvImage::exiv2Id_, 5) != 0) {
|
|
Packit |
01d647 |
result = false;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
if (!advance || !result) iIo.seek(-7, BasicIo::cur);
|
|
Packit |
01d647 |
return result;
|
|
Packit |
01d647 |
}
|
|
Packit |
01d647 |
|
|
Packit |
01d647 |
} // namespace Exiv2
|