diff options
author | George Hazan <ghazan@miranda.im> | 2017-09-27 17:11:31 +0300 |
---|---|---|
committer | George Hazan <ghazan@miranda.im> | 2017-09-27 17:11:39 +0300 |
commit | ab812542f118f463e4ab508d4b7c982c53d55f4c (patch) | |
tree | 2c62c674b60795231d5eabebbd572b287f585939 /plugins/AdvaImg/src | |
parent | add897d789e8e30884e2a4b355122666a9189abb (diff) |
fix for issues described in #922 (Move development to VS2017)
Diffstat (limited to 'plugins/AdvaImg/src')
-rw-r--r-- | plugins/AdvaImg/src/Metadata/FreeImageTag.h | 13 | ||||
-rw-r--r-- | plugins/AdvaImg/src/Metadata/TagLib.cpp | 9 |
2 files changed, 10 insertions, 12 deletions
diff --git a/plugins/AdvaImg/src/Metadata/FreeImageTag.h b/plugins/AdvaImg/src/Metadata/FreeImageTag.h index beb8bc84b2..23073e4d8d 100644 --- a/plugins/AdvaImg/src/Metadata/FreeImageTag.h +++ b/plugins/AdvaImg/src/Metadata/FreeImageTag.h @@ -382,13 +382,6 @@ private: TABLEMAP _table_map; private: - /** - Constructor (private)<br> - This is where the tag info tables are initialized. - @see addMetadataModel - */ - TagLib(); - /// Assignement operator (disabled) void operator=(TagLib&); @@ -404,6 +397,12 @@ private: BOOL addMetadataModel(MDMODEL md_model, TagInfo *tag_table); public: + /** + Constructor (private)<br> + This is where the tag info tables are initialized. + @see addMetadataModel + */ + TagLib(); /// Destructor ~TagLib(); diff --git a/plugins/AdvaImg/src/Metadata/TagLib.cpp b/plugins/AdvaImg/src/Metadata/TagLib.cpp index 580ad6faac..fb6da996c0 100644 --- a/plugins/AdvaImg/src/Metadata/TagLib.cpp +++ b/plugins/AdvaImg/src/Metadata/TagLib.cpp @@ -1509,10 +1509,10 @@ TagLib::~TagLib() { } -TagLib& -TagLib::instance() { - static TagLib s; - return s; +static TagLib g_hInstance; + +TagLib& TagLib::instance() { + return g_hInstance; } const TagInfo* @@ -1615,4 +1615,3 @@ TagLib::getFreeImageModel(MDMODEL model) { return FIMD_NODATA; } - |