Update .clang-format file & apply clang-format to whole project

2022-03-16 17:44:25 +01:00
parent 0641a5f539
commit 30bf563f4d
207 changed files with 71141 additions and 75793 deletions
@@ -3,208 +3,211 @@

 #include <exiv2/exiv2.hpp>

-#include <iostream>
 #include <cassert>
+#include <iostream>
 #include <string>

 using format_t = std::map<std::string, int>;
 using format_i = format_t::const_iterator;
-enum format_e
-{
-    wolf,
-    csv,
-    json,
-    xml
-};
+enum format_e { wolf, csv, json, xml };

-void syntax(const char* argv[],format_t& formats)
-{
-	std::cout << "Usage: " << argv[0] << " file format" << std::endl;
-	int count = 0;
-	std::cout << "formats: ";
-    for (auto&& format : formats) {
-        std::cout << (count++ ? " | " : "") << format.first;
-    }
-    std::cout << std::endl;
+void syntax(const char* argv[], format_t& formats) {
+  std::cout << "Usage: " << argv[0] << " file format" << std::endl;
+  int count = 0;
+  std::cout << "formats: ";
+  for (auto&& format : formats) {
+    std::cout << (count++ ? " | " : "") << format.first;
+  }
+  std::cout << std::endl;
 }

-size_t formatInit(Exiv2::ExifData& exifData)
-{
-    return std::distance(exifData.begin(), exifData.end());
+size_t formatInit(Exiv2::ExifData& exifData) {
+  return std::distance(exifData.begin(), exifData.end());
 }

 ///////////////////////////////////////////////////////////////////////
-std::string escapeCSV(Exiv2::ExifData::const_iterator  it,bool bValue)
-{
-	std::string   result ;
+std::string escapeCSV(Exiv2::ExifData::const_iterator it, bool bValue) {
+  std::string result;

-	std::ostringstream os;
-	if ( bValue ) os << it->value() ; else os << it->key() ;
+  std::ostringstream os;
+  if (bValue)
+    os << it->value();
+  else
+    os << it->key();

-	std::string s = os.str();
-    for (auto&& c : s) {
-        if (c == ',')
-            result += '\\';
-        result += c;
-    }
+  std::string s = os.str();
+  for (auto&& c : s) {
+    if (c == ',')
+      result += '\\';
+    result += c;
+  }

-    return result;
+  return result;
 }

-std::string formatCSV(Exiv2::ExifData& exifData)
-{
-	size_t count  = 0;
-	size_t length = formatInit(exifData);
-	std::ostringstream result;
+std::string formatCSV(Exiv2::ExifData& exifData) {
+  size_t count = 0;
+  size_t length = formatInit(exifData);
+  std::ostringstream result;

-	for (auto i = exifData.begin(); count++ < length; ++i) {
-		result << escapeCSV(i,false) << (count != length ? ", " : "" ) ;
-	}
-	result << std::endl;
+  for (auto i = exifData.begin(); count++ < length; ++i) {
+    result << escapeCSV(i, false) << (count != length ? ", " : "");
+  }
+  result << std::endl;

-	count = 0;
-	for (auto i = exifData.begin(); count++ < length ; ++i) {
-		result << escapeCSV(i,true) << (count != length ? ", " : "" ) ;
-	}
-	return result.str();
+  count = 0;
+  for (auto i = exifData.begin(); count++ < length; ++i) {
+    result << escapeCSV(i, true) << (count != length ? ", " : "");
+  }
+  return result.str();
 }

 ///////////////////////////////////////////////////////////////////////
-std::string formatWolf(Exiv2::ExifData& exifData)
-{
-	size_t count  = 0;
-	size_t length = formatInit(exifData);
-	std::ostringstream result;
+std::string formatWolf(Exiv2::ExifData& exifData) {
+  size_t count = 0;
+  size_t length = formatInit(exifData);
+  std::ostringstream result;

-	result << "{ " << std::endl;
-	for (auto i = exifData.begin(); count++ < length ; ++i) {
-		result << "  " << i->key()  << " -> " << i->value()  << (count != length ? "," : "" ) << std::endl ;
-	}
-	result << "}";
-	return result.str();
+  result << "{ " << std::endl;
+  for (auto i = exifData.begin(); count++ < length; ++i) {
+    result << "  " << i->key() << " -> " << i->value() << (count != length ? "," : "") << std::endl;
+  }
+  result << "}";
+  return result.str();
 }

 ///////////////////////////////////////////////////////////////////////
-std::string escapeJSON(Exiv2::ExifData::const_iterator  it,bool bValue=true)
-{
-	std::string   result ;
+std::string escapeJSON(Exiv2::ExifData::const_iterator it, bool bValue = true) {
+  std::string result;

-	std::ostringstream os;
-	if ( bValue ) os << it->value() ; else os << it->key() ;
+  std::ostringstream os;
+  if (bValue)
+    os << it->value();
+  else
+    os << it->key();

-	std::string s = os.str();
-    for (auto&& c : s) {
-        if (c == '"')
-            result += "\\\"";
-        result += c;
-    }
+  std::string s = os.str();
+  for (auto&& c : s) {
+    if (c == '"')
+      result += "\\\"";
+    result += c;
+  }

-    std::string q = "\"";
-    return q + result + q;
+  std::string q = "\"";
+  return q + result + q;
 }

-std::string formatJSON(Exiv2::ExifData& exifData)
-{
-	size_t count  = 0;
-	size_t length = formatInit(exifData);
-	std::ostringstream result;
+std::string formatJSON(Exiv2::ExifData& exifData) {
+  size_t count = 0;
+  size_t length = formatInit(exifData);
+  std::ostringstream result;

-	result << "{" << std::endl ;
-	for (auto i = exifData.begin(); count++ < length ; ++i) {
-		result << "  " << escapeJSON(i,false)  << ":" << escapeJSON(i,true) << ( count != length ? "," : "" ) << std::endl ;
-	}
-	result << "}";
-	return result.str();
+  result << "{" << std::endl;
+  for (auto i = exifData.begin(); count++ < length; ++i) {
+    result << "  " << escapeJSON(i, false) << ":" << escapeJSON(i, true) << (count != length ? "," : "") << std::endl;
+  }
+  result << "}";
+  return result.str();
 }

 ///////////////////////////////////////////////////////////////////////
-std::string escapeXML(Exiv2::ExifData::const_iterator  it,bool bValue=true)
-{
-	std::string   result ;
+std::string escapeXML(Exiv2::ExifData::const_iterator it, bool bValue = true) {
+  std::string result;

-	std::ostringstream os;
-	if ( bValue ) os << it->value() ; else os << it->key() ;
+  std::ostringstream os;
+  if (bValue)
+    os << it->value();
+  else
+    os << it->key();

-	std::string s = os.str();
-    for (auto&& c : s) {
-        if (c == '<')
-            result += "&lg;";
-        if (c == '>')
-            result += "&gt;";
-        result += c;
-    }
+  std::string s = os.str();
+  for (auto&& c : s) {
+    if (c == '<')
+      result += "&lg;";
+    if (c == '>')
+      result += "&gt;";
+    result += c;
+  }

-    return result;
+  return result;
 }

-std::string formatXML(Exiv2::ExifData& exifData)
-{
-	size_t count  = 0;
-	size_t length = formatInit(exifData);
-	std::ostringstream result;
+std::string formatXML(Exiv2::ExifData& exifData) {
+  size_t count = 0;
+  size_t length = formatInit(exifData);
+  std::ostringstream result;

-	result << "<exif>" << std::endl;
-	for (auto i = exifData.begin(); count++ < length ; ++i) {
-		std::string key   = escapeXML(i,false);
-		std::string value = escapeXML(i,true);
-		result << "  <" << key << ">" << value << "<" << key << "/>" << std::endl ;
-	}
-	result << "</exif>" << std::endl;
-	return result.str();
+  result << "<exif>" << std::endl;
+  for (auto i = exifData.begin(); count++ < length; ++i) {
+    std::string key = escapeXML(i, false);
+    std::string value = escapeXML(i, true);
+    result << "  <" << key << ">" << value << "<" << key << "/>" << std::endl;
+  }
+  result << "</exif>" << std::endl;
+  return result.str();
 }

 ///////////////////////////////////////////////////////////////////////
-int main(int argc,const char* argv[])
-{
-	Exiv2::XmpParser::initialize();
-	::atexit(Exiv2::XmpParser::terminate);
+int main(int argc, const char* argv[]) {
+  Exiv2::XmpParser::initialize();
+  ::atexit(Exiv2::XmpParser::terminate);
 #ifdef EXV_ENABLE_BMFF
-    Exiv2::enableBMFF();
+  Exiv2::enableBMFF();
 #endif

-	format_t formats;
-	formats["wolf"] = wolf;
-	formats["csv" ] = csv ;
-	formats["json"] = json;
-	formats["xml" ] = xml ;
+  format_t formats;
+  formats["wolf"] = wolf;
+  formats["csv"] = csv;
+  formats["json"] = json;
+  formats["xml"] = xml;

-	int result = 0 ;
-    if (argc != 3) {
-    	syntax(argv,formats) ;
-        result = 1;
+  int result = 0;
+  if (argc != 3) {
+    syntax(argv, formats);
+    result = 1;
+  }
+
+  const char* file = argv[1];
+  const char* format = argv[2];
+
+  if (!result && formats.find(format) == formats.end()) {
+    std::cout << "Unrecognised format " << format << std::endl;
+    syntax(argv, formats);
+    result = 2;
+  }
+
+  if (!result)
+    try {
+      auto image = Exiv2::ImageFactory::open(file);
+      image->readMetadata();
+      Exiv2::ExifData& exifData = image->exifData();
+
+      switch (formats.find(format)->second) {
+        case wolf:
+          std::cout << formatWolf(exifData) << std::endl;
+          break;
+        case csv:
+          std::cout << formatCSV(exifData) << std::endl;
+          break;
+        case json:
+          std::cout << formatJSON(exifData) << std::endl;
+          break;
+        case xml:
+          std::cout << formatXML(exifData) << std::endl;
+          break;
+
+        default:
+          std::cout << "*** error: format not implemented yet: " << format << " ***" << std::endl;
+          result = 3;
+          break;
+      }
+    } catch (Exiv2::Error& e) {
+      std::cerr << "*** error exiv2 exception '" << e << "' ***" << std::endl;
+      result = 4;
+    } catch (...) {
+      std::cerr << "*** error exception" << std::endl;
+      result = 5;
    }

-    const char* file   = argv[1];
-    const char* format = argv[2];
-
-	if ( !result && formats.find(format) == formats.end() ) {
-        std::cout << "Unrecognised format " << format << std::endl;
-        syntax(argv,formats);
-        result = 2;
-	}
-
-	if ( !result ) try {
-        auto image = Exiv2::ImageFactory::open(file);
-		image->readMetadata();
-		Exiv2::ExifData &exifData = image->exifData();
-
-		switch ( formats.find(format)->second ) {
-			case wolf : std::cout << formatWolf(exifData) << std::endl; break;
-			case csv  : std::cout << formatCSV (exifData) << std::endl; break;
-			case json : std::cout << formatJSON(exifData) << std::endl; break;
-			case xml  : std::cout << formatXML (exifData) << std::endl; break;
-
-			default   : std::cout << "*** error: format not implemented yet: " << format << " ***" << std::endl;
-			            result = 3;
-			break;
-		}
-	} catch (Exiv2::Error& e) {
-    	std::cerr << "*** error exiv2 exception '" << e << "' ***" << std::endl;
-    	result = 4;
-	} catch ( ... ) {
-    	std::cerr << "*** error exception" << std::endl;
-    	result = 5;
-	}
-
-    return result;
+  return result;
 }