summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorMarti Maria <info@littlecms.com>2010-03-27 18:23:00 +0100
committerMarti Maria <info@littlecms.com>2010-03-27 18:23:00 +0100
commitf46fdce48e81ea0f3bd369310bdaa027b6401063 (patch)
treebe050a89beffdaf6d27d6a74102e92009a6f0ded /utils
parent46d9744fc89bafda47369be73ce6b11be29dc500 (diff)
downloadlcms2-f46fdce48e81ea0f3bd369310bdaa027b6401063.tar.gz
March-24, Additions to beta2
Diffstat (limited to 'utils')
-rw-r--r--utils/common/utils.h1
-rw-r--r--utils/tificc/tificc.c10
-rw-r--r--utils/transicc/transicc.c2
3 files changed, 10 insertions, 3 deletions
diff --git a/utils/common/utils.h b/utils/common/utils.h
index 1f4bd82..322d310 100644
--- a/utils/common/utils.h
+++ b/utils/common/utils.h
@@ -43,6 +43,7 @@
#include <string.h>
#include <stdarg.h>
#include <ctype.h>
+#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
#include <math.h>
diff --git a/utils/tificc/tificc.c b/utils/tificc/tificc.c
index cce3871..b0363c2 100644
--- a/utils/tificc/tificc.c
+++ b/utils/tificc/tificc.c
@@ -133,7 +133,10 @@ static int FromLabV4ToLabV2(int x)
// Formatter for 8bit Lab TIFF (photometric 8)
static
-unsigned char* UnrollTIFFLab8(register void* nfo, register cmsUInt16Number wIn[], register cmsUInt8Number* accum, register cmsUInt32Number Stride)
+unsigned char* UnrollTIFFLab8(struct _cmstransform_struct* CMMcargo,
+ register cmsUInt16Number wIn[],
+ register cmsUInt8Number* accum,
+ register cmsUInt32Number Stride)
{
wIn[0] = (cmsUInt16Number) FromLabV2ToLabV4((accum[0]) << 8);
wIn[1] = (cmsUInt16Number) FromLabV2ToLabV4(((accum[1] > 127) ? (accum[1] - 128) : (accum[1] + 128)) << 8);
@@ -143,7 +146,10 @@ unsigned char* UnrollTIFFLab8(register void* nfo, register cmsUInt16Number wIn[]
}
static
-unsigned char* PackTIFFLab8(register void* nfo, register cmsUInt16Number wOut[], register cmsUInt8Number* output, register cmsUInt32Number Stride)
+unsigned char* PackTIFFLab8(struct _cmstransform_struct* CMMcargo,
+ register cmsUInt16Number wOut[],
+ register cmsUInt8Number* output,
+ register cmsUInt32Number Stride)
{
int a, b;
diff --git a/utils/transicc/transicc.c b/utils/transicc/transicc.c
index 730bc94..8f0d849 100644
--- a/utils/transicc/transicc.c
+++ b/utils/transicc/transicc.c
@@ -26,7 +26,7 @@
#include "utils.h"
-#ifdef _CMS_IS_WINDOWS
+#ifdef CMS_IS_WINDOWS_
#include <io.h>
#endif