clang-tidy: do not use using namespace

Found with google-build-using-namespace

Signed-off-by: Rosen Penev <rosenp@gmail.com>
main
Rosen Penev 3 years ago
parent 8810b0b630
commit d190baac6c

@ -17,7 +17,6 @@
// ***************************************************************************** // *****************************************************************************
// class member definitions // class member definitions
namespace Exiv2 { namespace Exiv2 {
using namespace Internal;
Cr2Image::Cr2Image(BasicIo::UniquePtr io, bool /*create*/) : Cr2Image::Cr2Image(BasicIo::UniquePtr io, bool /*create*/) :
Image(ImageType::cr2, mdExif | mdIptc | mdXmp, std::move(io)) { Image(ImageType::cr2, mdExif | mdIptc | mdXmp, std::move(io)) {
@ -87,7 +86,7 @@ void Cr2Image::writeMetadata() {
if (isCr2Type(*io_, false)) { if (isCr2Type(*io_, false)) {
pData = io_->mmap(true); pData = io_->mmap(true);
size = io_->size(); size = io_->size();
Cr2Header cr2Header; Internal::Cr2Header cr2Header;
if (0 == cr2Header.read(pData, 16)) { if (0 == cr2Header.read(pData, 16)) {
bo = cr2Header.byteOrder(); bo = cr2Header.byteOrder();
} }
@ -101,9 +100,9 @@ void Cr2Image::writeMetadata() {
} // Cr2Image::writeMetadata } // Cr2Image::writeMetadata
ByteOrder Cr2Parser::decode(ExifData& exifData, IptcData& iptcData, XmpData& xmpData, const byte* pData, size_t size) { ByteOrder Cr2Parser::decode(ExifData& exifData, IptcData& iptcData, XmpData& xmpData, const byte* pData, size_t size) {
Cr2Header cr2Header; Internal::Cr2Header cr2Header;
return TiffParserWorker::decode(exifData, iptcData, xmpData, pData, size, Tag::root, TiffMapping::findDecoder, return Internal::TiffParserWorker::decode(exifData, iptcData, xmpData, pData, size, Internal::Tag::root,
&cr2Header); Internal::TiffMapping::findDecoder, &cr2Header);
} }
WriteMethod Cr2Parser::encode(BasicIo& io, const byte* pData, size_t size, ByteOrder byteOrder, WriteMethod Cr2Parser::encode(BasicIo& io, const byte* pData, size_t size, ByteOrder byteOrder,
@ -113,20 +112,20 @@ WriteMethod Cr2Parser::encode(BasicIo& io, const byte* pData, size_t size, ByteO
// Delete IFDs which do not occur in TIFF images // Delete IFDs which do not occur in TIFF images
static constexpr auto filteredIfds = std::array{ static constexpr auto filteredIfds = std::array{
panaRawId, Internal::panaRawId,
}; };
for (auto&& filteredIfd : filteredIfds) { for (auto&& filteredIfd : filteredIfds) {
#ifdef EXIV2_DEBUG_MESSAGES #ifdef EXIV2_DEBUG_MESSAGES
std::cerr << "Warning: Exif IFD " << filteredIfd << " not encoded\n"; std::cerr << "Warning: Exif IFD " << filteredIfd << " not encoded\n";
#endif #endif
ed.erase(std::remove_if(ed.begin(), ed.end(), FindExifdatum(filteredIfd)), ed.end()); ed.erase(std::remove_if(ed.begin(), ed.end(), Internal::FindExifdatum(filteredIfd)), ed.end());
} }
Cr2Header header(byteOrder); auto header = Internal::Cr2Header(byteOrder);
OffsetWriter offsetWriter; Internal::OffsetWriter offsetWriter;
offsetWriter.setOrigin(OffsetWriter::cr2RawIfdOffset, Cr2Header::offset2addr(), byteOrder); offsetWriter.setOrigin(Internal::OffsetWriter::cr2RawIfdOffset, Internal::Cr2Header::offset2addr(), byteOrder);
return TiffParserWorker::encode(io, pData, size, ed, iptcData, xmpData, Tag::root, TiffMapping::findEncoder, &header, return Internal::TiffParserWorker::encode(io, pData, size, ed, iptcData, xmpData, Internal::Tag::root,
&offsetWriter); Internal::TiffMapping::findEncoder, &header, &offsetWriter);
} }
// ************************************************************************* // *************************************************************************
@ -146,7 +145,7 @@ bool isCr2Type(BasicIo& iIo, bool advance) {
if (iIo.error() || iIo.eof()) { if (iIo.error() || iIo.eof()) {
return false; return false;
} }
Cr2Header header; Internal::Cr2Header header;
bool rc = header.read(buf, len); bool rc = header.read(buf, len);
if (!advance || !rc) { if (!advance || !rc) {
iIo.seek(-len, BasicIo::cur); iIo.seek(-len, BasicIo::cur);

@ -18,7 +18,6 @@
// ***************************************************************************** // *****************************************************************************
// class member definitions // class member definitions
namespace Exiv2 { namespace Exiv2 {
using namespace Internal;
CrwImage::CrwImage(BasicIo::UniquePtr io, bool /*create*/) : Image(ImageType::crw, mdExif | mdComment, std::move(io)) { CrwImage::CrwImage(BasicIo::UniquePtr io, bool /*create*/) : Image(ImageType::crw, mdExif | mdComment, std::move(io)) {
} // CrwImage::CrwImage } // CrwImage::CrwImage
@ -102,12 +101,12 @@ void CrwImage::writeMetadata() {
void CrwParser::decode(CrwImage* pCrwImage, const byte* pData, size_t size) { void CrwParser::decode(CrwImage* pCrwImage, const byte* pData, size_t size) {
// Parse the image, starting with a CIFF header component // Parse the image, starting with a CIFF header component
CiffHeader header; Internal::CiffHeader header;
header.read(pData, size); header.read(pData, size);
header.decode(*pCrwImage); header.decode(*pCrwImage);
// a hack to get absolute offset of preview image inside CRW structure // a hack to get absolute offset of preview image inside CRW structure
CiffComponent* preview = header.findComponent(0x2007, 0x0000); auto preview = header.findComponent(0x2007, 0x0000);
if (preview) { if (preview) {
(pCrwImage->exifData())["Exif.Image2.JPEGInterchangeFormat"] = uint32_t(preview->pData() - pData); (pCrwImage->exifData())["Exif.Image2.JPEGInterchangeFormat"] = uint32_t(preview->pData() - pData);
(pCrwImage->exifData())["Exif.Image2.JPEGInterchangeFormatLength"] = static_cast<uint32_t>(preview->size()); (pCrwImage->exifData())["Exif.Image2.JPEGInterchangeFormatLength"] = static_cast<uint32_t>(preview->size());
@ -116,14 +115,14 @@ void CrwParser::decode(CrwImage* pCrwImage, const byte* pData, size_t size) {
void CrwParser::encode(Blob& blob, const byte* pData, size_t size, const CrwImage* pCrwImage) { void CrwParser::encode(Blob& blob, const byte* pData, size_t size, const CrwImage* pCrwImage) {
// Parse image, starting with a CIFF header component // Parse image, starting with a CIFF header component
CiffHeader header; Internal::CiffHeader header;
if (size != 0) { if (size != 0) {
header.read(pData, size); header.read(pData, size);
} }
// Encode Exif tags from image into the CRW parse tree and write the // Encode Exif tags from image into the CRW parse tree and write the
// structure to the binary image blob // structure to the binary image blob
CrwMap::encode(&header, *pCrwImage); Internal::CrwMap::encode(&header, *pCrwImage);
header.write(blob); header.write(blob);
} }
@ -147,7 +146,7 @@ bool isCrwType(BasicIo& iIo, bool advance) {
if (!(('I' == tmpBuf[0] && 'I' == tmpBuf[1]) || ('M' == tmpBuf[0] && 'M' == tmpBuf[1]))) { if (!(('I' == tmpBuf[0] && 'I' == tmpBuf[1]) || ('M' == tmpBuf[0] && 'M' == tmpBuf[1]))) {
result = false; result = false;
} }
if (result && std::memcmp(tmpBuf + 6, CiffHeader::signature(), 8) != 0) { if (result && std::memcmp(tmpBuf + 6, Internal::CiffHeader::signature(), 8) != 0) {
result = false; result = false;
} }
if (!advance || !result) if (!advance || !result)

Loading…
Cancel
Save