X-Git-Url: http://git.eversberg.eu/gitweb.cgi?p=colorize.git;a=blobdiff_plain;f=src%2Fimg.c;h=b2daa9aad77c8b896db9893ae334afa02c3220a4;hp=a596c645b629785f9d4a689a8d46fcc293832f1d;hb=9b04385e7a99576413e64927e32ddcd9025795c0;hpb=b66f395c86e039f8fb249083c0429fced7724509

diff --git a/src/img.c b/src/img.c
index a596c64..b2daa9a 100755
--- a/src/img.c
+++ b/src/img.c
@@ -16,8 +16,8 @@ unsigned short *load_img(int *width, int *height, const char *filename, int inde
 	ExceptionInfo exception;
 	unsigned short *img = NULL;
 
-//	MagickCoreGenesis(NULL,MagickFalse);
-	InitializeMagick(NULL);
+	MagickCoreGenesis(NULL, MagickFalse);
+//	InitializeMagick(NULL);
 	imageinfo = CloneImageInfo(0);
 	GetExceptionInfo(&exception);
 
@@ -38,8 +38,8 @@ unsigned short *load_img(int *width, int *height, const char *filename, int inde
 		goto exit;
 	}
 
-//	ExportImagePixels(image, 0, 0, *width, *height, "RGB", ShortPixel, darrayGetPr(darray), NULL);
-	DispatchImage(image, 0, 0, *width, *height, "RGB", ShortPixel, img, NULL);
+	ExportImagePixels(image, 0, 0, *width, *height, "RGB", ShortPixel, img, NULL);
+//	DispatchImage(image, 0, 0, *width, *height, "RGB", ShortPixel, img, NULL);
 
 exit:
 	if (image)
@@ -48,8 +48,8 @@ exit:
 	if (imageinfo)
 		DestroyImageInfo(imageinfo);
 
-//	MagickCoreTerminus();
-	DestroyMagick();
+	MagickCoreTerminus();
+//	DestroyMagick();
 
 	return img;
 }
@@ -62,8 +62,8 @@ int save_img(unsigned short *img, int width, int height, int alpha, const char *
 	ImageInfo *imageinfo = NULL;
 	ExceptionInfo exception;
 
-//	MagickCoreGenesis(NULL,MagickFalse);
-	InitializeMagick(NULL);
+	MagickCoreGenesis(NULL, MagickFalse);
+//	InitializeMagick(NULL);
 	imageinfo = CloneImageInfo(0);
 	GetExceptionInfo(&exception);
 
@@ -93,8 +93,8 @@ exit:
 	if (imageinfo)
 		DestroyImageInfo(imageinfo);
 
-//	MagickCoreTerminus();
-	DestroyMagick();
+	MagickCoreTerminus();
+//	DestroyMagick();
 
 	return rc;
 }