From d190baac6cbfec367a3eca18b9c1dcbd2a784d6c Mon Sep 17 00:00:00 2001
From: Rosen Penev <rosenp@gmail.com>
Date: Thu, 31 Mar 2022 18:06:26 -0700
Subject: [PATCH] clang-tidy: do not use using namespace

Found with google-build-using-namespace

Signed-off-by: Rosen Penev <rosenp@gmail.com>
---
 src/cr2image.cpp | 25 ++++++++++++-------------
 src/crwimage.cpp | 11 +++++------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/src/cr2image.cpp b/src/cr2image.cpp
index 00624ad9..79814811 100644
--- a/src/cr2image.cpp
+++ b/src/cr2image.cpp
@@ -17,7 +17,6 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
-using namespace Internal;
 
 Cr2Image::Cr2Image(BasicIo::UniquePtr io, bool /*create*/) :
     Image(ImageType::cr2, mdExif | mdIptc | mdXmp, std::move(io)) {
@@ -87,7 +86,7 @@ void Cr2Image::writeMetadata() {
     if (isCr2Type(*io_, false)) {
       pData = io_->mmap(true);
       size = io_->size();
-      Cr2Header cr2Header;
+      Internal::Cr2Header cr2Header;
       if (0 == cr2Header.read(pData, 16)) {
         bo = cr2Header.byteOrder();
       }
@@ -101,9 +100,9 @@ void Cr2Image::writeMetadata() {
 }  // Cr2Image::writeMetadata
 
 ByteOrder Cr2Parser::decode(ExifData& exifData, IptcData& iptcData, XmpData& xmpData, const byte* pData, size_t size) {
-  Cr2Header cr2Header;
-  return TiffParserWorker::decode(exifData, iptcData, xmpData, pData, size, Tag::root, TiffMapping::findDecoder,
-                                  &cr2Header);
+  Internal::Cr2Header cr2Header;
+  return Internal::TiffParserWorker::decode(exifData, iptcData, xmpData, pData, size, Internal::Tag::root,
+                                            Internal::TiffMapping::findDecoder, &cr2Header);
 }
 
 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
   static constexpr auto filteredIfds = std::array{
-      panaRawId,
+      Internal::panaRawId,
   };
   for (auto&& filteredIfd : filteredIfds) {
 #ifdef EXIV2_DEBUG_MESSAGES
     std::cerr << "Warning: Exif IFD " << filteredIfd << " not encoded\n";
 #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);
-  OffsetWriter offsetWriter;
-  offsetWriter.setOrigin(OffsetWriter::cr2RawIfdOffset, Cr2Header::offset2addr(), byteOrder);
-  return TiffParserWorker::encode(io, pData, size, ed, iptcData, xmpData, Tag::root, TiffMapping::findEncoder, &header,
-                                  &offsetWriter);
+  auto header = Internal::Cr2Header(byteOrder);
+  Internal::OffsetWriter offsetWriter;
+  offsetWriter.setOrigin(Internal::OffsetWriter::cr2RawIfdOffset, Internal::Cr2Header::offset2addr(), byteOrder);
+  return Internal::TiffParserWorker::encode(io, pData, size, ed, iptcData, xmpData, Internal::Tag::root,
+                                            Internal::TiffMapping::findEncoder, &header, &offsetWriter);
 }
 
 // *************************************************************************
@@ -146,7 +145,7 @@ bool isCr2Type(BasicIo& iIo, bool advance) {
   if (iIo.error() || iIo.eof()) {
     return false;
   }
-  Cr2Header header;
+  Internal::Cr2Header header;
   bool rc = header.read(buf, len);
   if (!advance || !rc) {
     iIo.seek(-len, BasicIo::cur);
diff --git a/src/crwimage.cpp b/src/crwimage.cpp
index 84bc9442..ff217c7a 100644
--- a/src/crwimage.cpp
+++ b/src/crwimage.cpp
@@ -18,7 +18,6 @@
 // *****************************************************************************
 // class member definitions
 namespace Exiv2 {
-using namespace Internal;
 
 CrwImage::CrwImage(BasicIo::UniquePtr io, bool /*create*/) : Image(ImageType::crw, mdExif | mdComment, std::move(io)) {
 }  // CrwImage::CrwImage
@@ -102,12 +101,12 @@ void CrwImage::writeMetadata() {
 
 void CrwParser::decode(CrwImage* pCrwImage, const byte* pData, size_t size) {
   // Parse the image, starting with a CIFF header component
-  CiffHeader header;
+  Internal::CiffHeader header;
   header.read(pData, size);
   header.decode(*pCrwImage);
 
   // 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) {
     (pCrwImage->exifData())["Exif.Image2.JPEGInterchangeFormat"] = uint32_t(preview->pData() - pData);
     (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) {
   // Parse image, starting with a CIFF header component
-  CiffHeader header;
+  Internal::CiffHeader header;
   if (size != 0) {
     header.read(pData, size);
   }
 
   // Encode Exif tags from image into the CRW parse tree and write the
   // structure to the binary image blob
-  CrwMap::encode(&header, *pCrwImage);
+  Internal::CrwMap::encode(&header, *pCrwImage);
   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]))) {
     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;
   }
   if (!advance || !result)