Always dlclose when possible

This commit is contained in:
Linus Dierheimer
2022-04-14 11:43:06 +02:00
parent 31bdd25a26
commit 373e041e5e
3 changed files with 10 additions and 11 deletions
+5 -1
View File
@@ -23,7 +23,11 @@ FFLogoImageResult ffLogoPrintImageIM6(FFinstance* instance, FFLogoType type)
FF_LIBRARY_LOAD_SYMBOL_ADRESS(imageMagick, ffResizeImage, ResizeImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR);
FF_LIBRARY_LOAD_SYMBOL_ADRESS(imageMagick, ffWriteImage, WriteImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR);
return ffLogoPrintImageImpl(instance, imageMagick, logoResize, logoWrite, type);
FFLogoImageResult result = ffLogoPrintImageImpl(instance, imageMagick, logoResize, logoWrite, type);
dlclose(imageMagick);
return result;
}
#endif
+5 -1
View File
@@ -22,7 +22,11 @@ FFLogoImageResult ffLogoPrintImageIM7(FFinstance* instance, FFLogoType type)
FF_LIBRARY_LOAD_SYMBOL_ADRESS(imageMagick, ffResizeImage, ResizeImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR);
FF_LIBRARY_LOAD_SYMBOL_ADRESS(imageMagick, ffWriteImage, WriteImage, FF_LOGO_IMAGE_RESULT_INIT_ERROR);
return ffLogoPrintImageImpl(instance, imageMagick, logoResize, logoWrite, type);
FFLogoImageResult result = ffLogoPrintImageImpl(instance, imageMagick, logoResize, logoWrite, type);
dlclose(imageMagick);
return result;
}
#endif
-9
View File
@@ -107,16 +107,12 @@ FFLogoImageResult ffLogoPrintImageImpl(FFinstance* instance, void* imageMagick,
ExceptionInfo* exceptionInfo = ffAcquireExceptionInfo();
if(exceptionInfo == NULL)
{
dlclose(imageMagick);
return FF_LOGO_IMAGE_RESULT_RUN_ERROR;
}
ImageInfo* imageInfoIn = ffAcquireImageInfo();
if(imageInfoIn == NULL)
{
ffDestroyExceptionInfo(exceptionInfo);
dlclose(imageMagick);
return FF_LOGO_IMAGE_RESULT_RUN_ERROR;
}
@@ -128,7 +124,6 @@ FFLogoImageResult ffLogoPrintImageImpl(FFinstance* instance, void* imageMagick,
if(originalImage == NULL)
{
ffDestroyExceptionInfo(exceptionInfo);
dlclose(imageMagick);
return FF_LOGO_IMAGE_RESULT_RUN_ERROR;
}
@@ -143,7 +138,6 @@ FFLogoImageResult ffLogoPrintImageImpl(FFinstance* instance, void* imageMagick,
{
ffDestroyImage(originalImage);
ffDestroyExceptionInfo(exceptionInfo);
dlclose(imageMagick);
return FF_LOGO_IMAGE_RESULT_RUN_ERROR;
}
@@ -152,7 +146,6 @@ FFLogoImageResult ffLogoPrintImageImpl(FFinstance* instance, void* imageMagick,
if(resizedImage == NULL)
{
ffDestroyExceptionInfo(exceptionInfo);
dlclose(imageMagick);
return FF_LOGO_IMAGE_RESULT_RUN_ERROR;
}
@@ -161,7 +154,6 @@ FFLogoImageResult ffLogoPrintImageImpl(FFinstance* instance, void* imageMagick,
{
ffDestroyImage(resizedImage);
ffDestroyExceptionInfo(exceptionInfo);
dlclose(imageMagick);
return FF_LOGO_IMAGE_RESULT_RUN_ERROR;
}
@@ -174,7 +166,6 @@ FFLogoImageResult ffLogoPrintImageImpl(FFinstance* instance, void* imageMagick,
ffDestroyImageInfo(imageInfoOut);
ffDestroyImage(resizedImage);
ffDestroyExceptionInfo(exceptionInfo);
dlclose(imageMagick);
if(!printSuccessful)
return FF_LOGO_IMAGE_RESULT_RUN_ERROR;