More accurate refcounting and deinitialization

Author: agruzdev

Source/FreeImage/FreeImage.cpp

@@ -50,7 +50,9 @@ DllMain(HANDLE hModule, uint32_t ul_reason_for_call, LPVOID lpReserved) {
 			break;
 
 		case DLL_PROCESS_DETACH :
-			FreeImage_DeInitialise();
+			if (lpReserved == nullptr) {
+				FreeImage_DeInitialise();
+			}
 			break;
 
 		case DLL_THREAD_ATTACH :

Source/FreeImage/Plugin.cpp

@@ -587,7 +587,7 @@ PluginsRegistrySingleton& PluginsRegistrySingleton::Instance()
 bool PluginsRegistrySingleton::AddRef()
 {
 	bool firstRef = false;
-	if (mRefCounter++ == 0) {
+	if ((mRefCounter < std::numeric_limits<uint32_t>::max()) && (mRefCounter++ == 0)) {
 		mInstance.reset(new PluginsRegistry());
 		firstRef = true;
 	}
@@ -597,7 +597,7 @@ bool PluginsRegistrySingleton::AddRef()
 bool PluginsRegistrySingleton::DecRef()
 {
 	bool lastRef = false;
-	if (--mRefCounter == 0) {
+	if ((mRefCounter > 0) && (--mRefCounter == 0)) {
 		mInstance.reset();
 		lastRef = true;
 	}

TestAPI/MainTestSuite.cpp

@@ -135,11 +135,6 @@ int main(int argc, char *argv[]) {
 	testHeaderOnly();
 #endif
 
-
-#if defined(FREEIMAGE_LIB) || !defined(WIN32)
-	FreeImage_DeInitialise();
-#endif
-
 	// other tests
 	testConvertToFloat();
 	testConvertToColor();
@@ -148,6 +143,10 @@ int main(int argc, char *argv[]) {
 	testTmoLinear();
 	testHistogram();
 
+#if defined(FREEIMAGE_LIB) || !defined(WIN32)
+	FreeImage_DeInitialise();
+#endif
+
 	return 0;
 }