SampledFunction::SampledFunction(Object *funcObj, Dict *dict) {
Stream *str;
- int nSamples, sampleBits;
+ int sampleBits;
double sampleMul;
Object obj1, obj2;
Guint buf, bitMask;
obj2.free();
}
obj1.free();
+ idxMul[0] = n;
+ for (i = 1; i < m; ++i) {
+ idxMul[i] = idxMul[i-1] * sampleSize[i-1];
+ }
//----- BitsPerSample
if (!dict->lookup("BitsPerSample", &obj1)->isInt()) {
}
}
obj1.free();
+ for (i = 0; i < m; ++i) {
+ inputMul[i] = (encode[i][1] - encode[i][0]) /
+ (domain[i][1] - domain[i][0]);
+ }
//----- Decode
if (dict->lookup("Decode", &obj1)->isArray() &&
nSamples = n;
for (i = 0; i < m; ++i)
nSamples *= sampleSize[i];
- samples = (double *)gmalloc(nSamples * sizeof(double));
+ samples = (double *)gmallocn(nSamples, sizeof(double));
buf = 0;
bits = 0;
bitMask = (1 << sampleBits) - 1;
}
SampledFunction::SampledFunction(SampledFunction *func) {
- int nSamples, i;
-
memcpy(this, func, sizeof(SampledFunction));
-
- nSamples = n;
- for (i = 0; i < m; ++i) {
- nSamples *= sampleSize[i];
- }
- samples = (double *)gmalloc(nSamples * sizeof(double));
+ samples = (double *)gmallocn(nSamples, sizeof(double));
memcpy(samples, func->samples, nSamples * sizeof(double));
}
void SampledFunction::transform(double *in, double *out) {
double x;
- int e[2][funcMaxInputs];
- double efrac[funcMaxInputs];
- double s0[1 << funcMaxInputs], s1[1 << funcMaxInputs];
- int i, j, k, idx;
+ int e[funcMaxInputs][2];
+ double efrac0[funcMaxInputs];
+ double efrac1[funcMaxInputs];
+ double s[1 << funcMaxInputs];
+ int i, j, k, idx, t;
// map input values into sample array
for (i = 0; i < m; ++i) {
- x = ((in[i] - domain[i][0]) / (domain[i][1] - domain[i][0])) *
- (encode[i][1] - encode[i][0]) + encode[i][0];
+ x = (in[i] - domain[i][0]) * inputMul[i] + encode[i][0];
if (x < 0) {
x = 0;
} else if (x > sampleSize[i] - 1) {
x = sampleSize[i] - 1;
}
- e[0][i] = (int)floor(x);
- e[1][i] = (int)ceil(x);
- efrac[i] = x - e[0][i];
+ e[i][0] = (int)x;
+ if ((e[i][1] = e[i][0] + 1) >= sampleSize[i]) {
+ // this happens if in[i] = domain[i][1]
+ e[i][1] = e[i][0];
+ }
+ efrac1[i] = x - e[i][0];
+ efrac0[i] = 1 - efrac1[i];
}
// for each output, do m-linear interpolation
// pull 2^m values out of the sample array
for (j = 0; j < (1<<m); ++j) {
- idx = 0;
- for (k = m - 1; k >= 0; --k) {
- idx = idx * sampleSize[k] + e[(j >> k) & 1][k];
+ idx = i;
+ for (k = 0, t = j; k < m; ++k, t >>= 1) {
+ idx += idxMul[k] * (e[k][t & 1]);
}
- idx = idx * n + i;
- s0[j] = samples[idx];
+ s[j] = samples[idx];
}
// do m sets of interpolations
- for (j = 0; j < m; ++j) {
- for (k = 0; k < (1 << (m - j)); k += 2) {
- s1[k >> 1] = (1 - efrac[j]) * s0[k] + efrac[j] * s0[k+1];
+ for (j = 0, t = (1<<m); j < m; ++j, t >>= 1) {
+ for (k = 0; k < t; k += 2) {
+ s[k >> 1] = efrac0[j] * s[k] + efrac1[j] * s[k+1];
}
- memcpy(s0, s1, (1 << (m - j - 1)) * sizeof(double));
}
// map output value to range
- out[i] = s0[0] * (decode[i][1] - decode[i][0]) + decode[i][0];
+ out[i] = s[0] * (decode[i][1] - decode[i][0]) + decode[i][0];
if (out[i] < range[i][0]) {
out[i] = range[i][0];
} else if (out[i] > range[i][1]) {
goto err1;
}
k = obj1.arrayGetLength();
- funcs = (Function **)gmalloc(k * sizeof(Function *));
- bounds = (double *)gmalloc((k + 1) * sizeof(double));
- encode = (double *)gmalloc(2 * k * sizeof(double));
+ funcs = (Function **)gmallocn(k, sizeof(Function *));
+ bounds = (double *)gmallocn(k + 1, sizeof(double));
+ encode = (double *)gmallocn(2 * k, sizeof(double));
for (i = 0; i < k; ++i) {
funcs[i] = NULL;
}
int i;
k = func->k;
- funcs = (Function **)gmalloc(k * sizeof(Function *));
+ funcs = (Function **)gmallocn(k, sizeof(Function *));
for (i = 0; i < k; ++i) {
funcs[i] = func->funcs[i]->copy();
}
- bounds = (double *)gmalloc((k + 1) * sizeof(double));
+ bounds = (double *)gmallocn(k + 1, sizeof(double));
memcpy(bounds, func->bounds, (k + 1) * sizeof(double));
- encode = (double *)gmalloc(2 * k * sizeof(double));
+ encode = (double *)gmallocn(2 * k, sizeof(double));
memcpy(encode, func->encode, 2 * k * sizeof(double));
ok = gTrue;
}
void PSStack::copy(int n) {
int i;
+ if (sp + n > psStackSize) {
+ error(-1, "Stack underflow in PostScript function");
+ return;
+ }
if (!checkOverflow(n)) {
return;
}
- for (i = sp + n - 1; i <= sp; ++i) {
+ for (i = sp + n - 1; i >= sp; --i) {
stack[i - n] = stack[i];
}
sp -= n;
str = funcObj->getStream();
//----- parse the function
+ codeString = new GString();
str->reset();
if (!(tok = getToken(str)) || tok->cmp("{")) {
error(-1, "Expected '{' at start of PostScript function");
PostScriptFunction::PostScriptFunction(PostScriptFunction *func) {
memcpy(this, func, sizeof(PostScriptFunction));
- code = (PSObject *)gmalloc(codeSize * sizeof(PSObject));
+ code = (PSObject *)gmallocn(codeSize, sizeof(PSObject));
memcpy(code, func->code, codeSize * sizeof(PSObject));
+ codeString = func->codeString->copy();
}
PostScriptFunction::~PostScriptFunction() {
gfree(code);
+ delete codeString;
}
void PostScriptFunction::transform(double *in, double *out) {
s = new GString();
do {
c = str->getChar();
+ if (c != EOF) {
+ codeString->append(c);
+ }
} while (c != EOF && isspace(c));
if (c == '{' || c == '}') {
s->append((char)c);
break;
}
str->getChar();
+ codeString->append(c);
}
} else {
while (1) {
break;
}
str->getChar();
+ codeString->append(c);
}
}
return s;
void PostScriptFunction::resizeCode(int newSize) {
if (newSize >= codeSize) {
codeSize += 64;
- code = (PSObject *)grealloc(code, codeSize * sizeof(PSObject));
+ code = (PSObject *)greallocn(code, codeSize, sizeof(PSObject));
}
}