gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-23 06:38:05 +01:00
Code Issues Projects Releases Wiki Activity

wrlib: do not initialize/release ImageMagick unnecessarily

Browse Source 
Instead of calling 'MagickWandGenesis' every time an image is loaded, only
call it the first time, and similarly do not call 'MagickWandTerminus' if
the library has not been used before.

Signed-off-by: Christophe CURIS <christophe.curis@free.fr>
This commit is contained in:
Christophe CURIS
2014-05-08 20:16:04 +02:00
committed by Carlos R. Mafra
parent ebe7673bf6
commit f1a36b4c07
1 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
wrlib/load_magick.c
View File

@@ -28,6 +28,9 @@
#include "imgformat.h"
static int RInitMagickIfNeeded(void);
RImage *RLoadMagick(const char *file_name)
{
RImage *image = NULL;
@@ -38,7 +41,10 @@ RImage *RLoadMagick(const char *file_name)
MagickBooleanType hasAlfa;
PixelWand *bg_wand = NULL;
MagickWandGenesis();
if (RInitMagickIfNeeded()) {
RErrorCode = RERR_BADFORMAT;
return NULL;
}
/* Create a wand */
m_wand = NewMagickWand();
@@ -87,7 +93,31 @@ bye:
return image;
}
/* Track the state of the library in memory */
static enum {
MW_NotReady,
MW_Ready
} magick_state;
/*
* Initialise MagickWand, but only if it was not already done
*
* Return ok(0) when MagickWand is usable and fail(!0) if not usable
*/
static int RInitMagickIfNeeded(void)
{
if (magick_state == MW_NotReady) {
MagickWandGenesis();
magick_state = MW_Ready;
}
return 0;
}
void RReleaseMagick(void)
{
if (magick_state == MW_Ready) {
MagickWandTerminus();
magick_state = MW_NotReady;
}
}