Consolidated changes

2 files changed, 11 insertions, 7 deletions

diff --git a/utils/linkicc/linkicc.c b/utils/linkicc/linkicc.c
index b532ecb..b9b7bfb 100644
--- a/utils/linkicc/linkicc.c
+++ b/utils/linkicc/linkicc.c
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
      
     // Create the color transform. Specify 0 for the format is safe as the transform 
     // is intended to be used only for the devicelink.
-    hTransform = cmsCreateMultiprofileTransform(Profiles, nargs, 0, 0, Intent, dwFlags);
+    hTransform = cmsCreateMultiprofileTransform(Profiles, nargs, 0, 0, Intent, dwFlags|cmsFLAGS_NOOPTIMIZE);
     if (hTransform == NULL) {
         FatalError("Transform creation failed");
         goto Cleanup;
diff --git a/utils/psicc/psicc.c b/utils/psicc/psicc.c
index b5a5b81..3716177 100644
--- a/utils/psicc/psicc.c
+++ b/utils/psicc/psicc.c
@@ -140,13 +140,17 @@ void GenerateCSA(void)
 	n = cmsGetPostScriptCSA(0, hProfile, Intent, 0, NULL, 0);
 	if (n == 0) return;
 
-	Buffer = (char*) malloc(n + 1);
-	cmsGetPostScriptCSA(0, hProfile, Intent, 0, Buffer, n);
-	Buffer[n] = 0;
+    Buffer = (char*) malloc(n + 1);
+    if (Buffer != NULL) {
+
+        cmsGetPostScriptCSA(0, hProfile, Intent, 0, Buffer, n);
+        Buffer[n] = 0;
+
+        fprintf(OutFile, "%s", Buffer);	
+
+        free(Buffer);
+    }
 
-	fprintf(OutFile, "%s", Buffer);	
-	
-	free(Buffer);
 	cmsCloseProfile(hProfile);
 }