diff --git a/DataStorage/Database/Connection/ConnectionAbstract.h b/DataStorage/Database/Connection/ConnectionAbstract.h index e2e6630..ed16409 100755 --- a/DataStorage/Database/Connection/ConnectionAbstract.h +++ b/DataStorage/Database/Connection/ConnectionAbstract.h @@ -17,8 +17,10 @@ #include "../DatabaseType.h" #include "../DatabaseStatus.h" -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { struct ConnectionAbstract { void* con = NULL; diff --git a/DataStorage/Database/Connection/ConnectionFactory.h b/DataStorage/Database/Connection/ConnectionFactory.h index 741cd28..119ee1b 100755 --- a/DataStorage/Database/Connection/ConnectionFactory.h +++ b/DataStorage/Database/Connection/ConnectionFactory.h @@ -21,8 +21,10 @@ #include "PostgresqlConnection.h" #include "SQLiteConnection.h" -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { ConnectionAbstract *create_connection(DbConnectionConfig dbdata) { switch (dbdata.db) { diff --git a/DataStorage/Database/Connection/DbConnectionConfig.h b/DataStorage/Database/Connection/DbConnectionConfig.h index b404467..15096c4 100755 --- a/DataStorage/Database/Connection/DbConnectionConfig.h +++ b/DataStorage/Database/Connection/DbConnectionConfig.h @@ -15,8 +15,10 @@ #include "../DatabaseType.h" -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { typedef struct { DatabaseType db = DatabaseType::UNDEFINED; diff --git a/DataStorage/Database/Connection/MysqlConnection.h b/DataStorage/Database/Connection/MysqlConnection.h index e166f49..06d4217 100755 --- a/DataStorage/Database/Connection/MysqlConnection.h +++ b/DataStorage/Database/Connection/MysqlConnection.h @@ -20,8 +20,10 @@ #include "../DatabaseType.h" #include "../DatabaseStatus.h" -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { struct MysqlConnection : ConnectionAbstract { MysqlConnection(DbConnectionConfig dbdata) { diff --git a/DataStorage/Database/Connection/PostgresqlConnection.h b/DataStorage/Database/Connection/PostgresqlConnection.h index 84d2a74..0664a98 100755 --- a/DataStorage/Database/Connection/PostgresqlConnection.h +++ b/DataStorage/Database/Connection/PostgresqlConnection.h @@ -20,8 +20,10 @@ #include "../DatabaseType.h" #include "../DatabaseStatus.h" -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { struct PostgresqlConnection : ConnectionAbstract { PostgresqlConnection(DbConnectionConfig dbdata) { diff --git a/DataStorage/Database/Connection/SQLiteConnection.h b/DataStorage/Database/Connection/SQLiteConnection.h index 7ffcdb6..d660bfc 100755 --- a/DataStorage/Database/Connection/SQLiteConnection.h +++ b/DataStorage/Database/Connection/SQLiteConnection.h @@ -20,8 +20,10 @@ #include "../DatabaseType.h" #include "../DatabaseStatus.h" -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { struct SQLiteConnection : ConnectionAbstract { SQLiteConnection(DbConnectionConfig dbdata) { diff --git a/DataStorage/Database/DatabaseStatus.h b/DataStorage/Database/DatabaseStatus.h index cf64440..9893cc6 100755 --- a/DataStorage/Database/DatabaseStatus.h +++ b/DataStorage/Database/DatabaseStatus.h @@ -10,8 +10,10 @@ #ifndef DATASTORAGE_DATABASE_STATUS_H #define DATASTORAGE_DATABASE_STATUS_H -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { typedef enum { OK = 0, MISSING_DATABASE = 1, diff --git a/DataStorage/Database/DatabaseType.h b/DataStorage/Database/DatabaseType.h index 270d9f2..f5010f0 100755 --- a/DataStorage/Database/DatabaseType.h +++ b/DataStorage/Database/DatabaseType.h @@ -12,8 +12,10 @@ #include -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { typedef enum { MYSQL = 1, SQLITE = 2, diff --git a/DataStorage/Database/Schema/DbField.h b/DataStorage/Database/Schema/DbField.h index 6566c78..3155bfd 100755 --- a/DataStorage/Database/Schema/DbField.h +++ b/DataStorage/Database/Schema/DbField.h @@ -13,8 +13,10 @@ #include #include -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { typedef struct { char *name; char *type; diff --git a/DataStorage/Database/Schema/DbSchema.h b/DataStorage/Database/Schema/DbSchema.h index b4a369b..363e9a7 100755 --- a/DataStorage/Database/Schema/DbSchema.h +++ b/DataStorage/Database/Schema/DbSchema.h @@ -15,8 +15,10 @@ #include "DbField.h" -namespace DataStorage { - namespace Database { +namespace DataStorage +{ + namespace Database + { typedef struct { char *name; DbField *fields; diff --git a/Hash/MeowHash.h b/Hash/MeowHash.h index 180d046..58b910d 100755 --- a/Hash/MeowHash.h +++ b/Hash/MeowHash.h @@ -199,8 +199,10 @@ pxor(r2, r3) #endif -namespace Hash { - namespace Meow { +namespace Hash +{ + namespace Meow + { #if MEOW_DUMP struct meow_dump { diff --git a/Image/BillDetection.h b/Image/BillDetection.h index 94b47de..4d1e204 100755 --- a/Image/BillDetection.h +++ b/Image/BillDetection.h @@ -14,8 +14,10 @@ #include #include -namespace Image { - namespace BillDetection { +namespace Image +{ + namespace BillDetection + { cv::Mat highlightBill(cv::Mat in) { cv::Mat gray; diff --git a/Image/Diff.h b/Image/Diff.h index fc7a4f8..71516b2 100644 --- a/Image/Diff.h +++ b/Image/Diff.h @@ -15,8 +15,10 @@ #include "../Utils/MathUtils.h" -namespace Image { - namespace ImageUtils { +namespace Image +{ + namespace ImageUtils + { cv::Mat find_diff (cv::Mat in1, cv::Mat in2) { cv::Mat diff; diff --git a/Image/ImageUtils.h b/Image/ImageUtils.h index cd1c723..e7df1b2 100755 --- a/Image/ImageUtils.h +++ b/Image/ImageUtils.h @@ -13,8 +13,10 @@ #include #include -namespace Image { - namespace ImageUtils { +namespace Image +{ + namespace ImageUtils + { inline float lightnessFromRgb(int r, int g, int b) { diff --git a/Image/Kernel.h b/Image/Kernel.h index d8cb247..47d89e2 100755 --- a/Image/Kernel.h +++ b/Image/Kernel.h @@ -16,7 +16,8 @@ #include "ImageUtils.h" #include "../Utils/MathUtils.h" -namespace Image { +namespace Image +{ const float KERNEL_RIDGE_1[3][3] = { {0.0, -1.0, 0.0}, {-1.0, 4.0, -1.0}, @@ -61,7 +62,8 @@ namespace Image { {-1.0 / 256.0, -4.0 / 256.0, -6.0 / 256.0, -4.0 / 256.0, -1.0 / 256.0}, }; - namespace Kernel { + namespace Kernel + { inline cv::Mat convolve(cv::Mat in, const float kernel[][3]) { diff --git a/Image/Skew.h b/Image/Skew.h index 693806f..1834d6e 100755 --- a/Image/Skew.h +++ b/Image/Skew.h @@ -16,8 +16,10 @@ #include "../Utils/MathUtils.h" -namespace Image { - namespace Skew { +namespace Image +{ + namespace Skew + { cv::Mat deskewHoughLines(cv::Mat in, int maxDegree = 45) { cv::Size dim = in.size(); diff --git a/Image/Thresholding.h b/Image/Thresholding.h index e550323..172710b 100755 --- a/Image/Thresholding.h +++ b/Image/Thresholding.h @@ -16,8 +16,10 @@ #include "ImageUtils.h" #include "../Utils/MathUtils.h" -namespace Image { - namespace Thresholding { +namespace Image +{ + namespace Thresholding + { cv::Mat integralThresholding(cv::Mat in) { cv::Size dim = in.size(); diff --git a/Threads/Job.h b/Threads/Job.h index c9a610b..c53bd2b 100644 --- a/Threads/Job.h +++ b/Threads/Job.h @@ -8,7 +8,8 @@ #include #endif -namespace Threads { +namespace Threads +{ #ifdef _WIN32 typedef DWORD WINAPI(*JobFunc)(void *); #else diff --git a/Threads/Thread.h b/Threads/Thread.h index 65c47fa..581590e 100644 --- a/Threads/Thread.h +++ b/Threads/Thread.h @@ -15,7 +15,8 @@ #include "Job.h" #include "ThreadPool.h" -namespace Threads { +namespace Threads +{ Job *pool_work_create(JobFunc func, void *arg) { Job *work; diff --git a/Threads/ThreadPool.h b/Threads/ThreadPool.h index f6771bc..697f5c2 100644 --- a/Threads/ThreadPool.h +++ b/Threads/ThreadPool.h @@ -14,7 +14,8 @@ #include "OSWrapper.h" #include "Job.h" -namespace Threads { +namespace Threads +{ typedef struct { Job *work_first; Job *work_last; diff --git a/Utils/ApplicationUtils.h b/Utils/ApplicationUtils.h index a364645..89cf942 100755 --- a/Utils/ApplicationUtils.h +++ b/Utils/ApplicationUtils.h @@ -16,8 +16,10 @@ #include "OSWrapper.h" -namespace Utils { - namespace ApplicationUtils { +namespace Utils +{ + namespace ApplicationUtils + { inline char *cwd() { diff --git a/Utils/ArrayUtils.h b/Utils/ArrayUtils.h index a6b109a..aea8d85 100755 --- a/Utils/ArrayUtils.h +++ b/Utils/ArrayUtils.h @@ -16,8 +16,10 @@ #include "StringUtils.h" -namespace Utils { - namespace ArrayUtils { +namespace Utils +{ + namespace ArrayUtils + { inline char* get_arg(const char *id, char **argv, int length) { diff --git a/Utils/FileUtils.h b/Utils/FileUtils.h index 5f268eb..be6d703 100755 --- a/Utils/FileUtils.h +++ b/Utils/FileUtils.h @@ -23,8 +23,10 @@ #include "OSWrapper.h" -namespace Utils { - namespace FileUtils { +namespace Utils +{ + namespace FileUtils + { inline bool file_exists (const char *filename) { diff --git a/Utils/Parser/Json.h b/Utils/Parser/Json.h index 6516d1e..c43fdbb 100755 --- a/Utils/Parser/Json.h +++ b/Utils/Parser/Json.h @@ -2793,7 +2793,8 @@ JSON_HEDLEY_DIAGNOSTIC_POP // it allows using the detected idiom to retrieve the return type // of such an expression #define NLOHMANN_CAN_CALL_STD_FUNC_IMPL(std_name) \ - namespace detail { \ + namespace detail + { \ using std::std_name; \ \ template \ diff --git a/Utils/Rng/StringUtils.h b/Utils/Rng/StringUtils.h index 61f3791..3209e2b 100755 --- a/Utils/Rng/StringUtils.h +++ b/Utils/Rng/StringUtils.h @@ -14,9 +14,12 @@ #include #include -namespace Utils { - namespace Rng { - namespace StringUtils { +namespace Utils +{ + namespace Rng + { + namespace StringUtils + { inline char* generate_string( size_t min = 10, size_t max = 10, diff --git a/Utils/StringUtils.h b/Utils/StringUtils.h index 63e6e1b..f9ec481 100755 --- a/Utils/StringUtils.h +++ b/Utils/StringUtils.h @@ -17,8 +17,10 @@ #include "MathUtils.h" #include "ArraySort.h" -namespace Utils { - namespace StringUtils { +namespace Utils +{ + namespace StringUtils + { inline char *search_replace(const char *haystack, const char *needle, const char *replace) { @@ -251,7 +253,7 @@ namespace Utils { } diffValues = diffValuesT; - int *diffMasksT = (int *) realloc(diffMasks, diffIndex * sizeof(int)); + int *diffMasksT = (int *) realloc(diffMasks, diffIndex * sizeof(int)); if (!diffMasksT) { free(diffMasks); } diff --git a/Utils/WebUtils.h b/Utils/WebUtils.h index 8483e45..690d47e 100755 --- a/Utils/WebUtils.h +++ b/Utils/WebUtils.h @@ -17,8 +17,10 @@ #include "FileUtils.h" -namespace Utils { - namespace WebUtils { +namespace Utils +{ + namespace WebUtils + { static bool CURL_SETUP = false; inline