| [fd5b1fe] | 1 | *** Gfx.cc.orig Sun Dec 12 16:04:43 2004
|
|---|
| 2 | --- Gfx.cc Sun Dec 12 16:05:16 2004
|
|---|
| 3 | ***************
|
|---|
| 4 | *** 2654,2660 ****
|
|---|
| 5 | haveMask = gFalse;
|
|---|
| 6 | dict->lookup("Mask", &maskObj);
|
|---|
| 7 | if (maskObj.isArray()) {
|
|---|
| 8 | ! for (i = 0; i < maskObj.arrayGetLength(); ++i) {
|
|---|
| 9 | maskObj.arrayGet(i, &obj1);
|
|---|
| 10 | maskColors[i] = obj1.getInt();
|
|---|
| 11 | obj1.free();
|
|---|
| 12 | --- 2654,2662 ----
|
|---|
| 13 | haveMask = gFalse;
|
|---|
| 14 | dict->lookup("Mask", &maskObj);
|
|---|
| 15 | if (maskObj.isArray()) {
|
|---|
| 16 | ! for (i = 0;
|
|---|
| 17 | ! i < maskObj.arrayGetLength() && i < 2*gfxColorMaxComps;
|
|---|
| 18 | ! ++i) {
|
|---|
| 19 | maskObj.arrayGet(i, &obj1);
|
|---|
| 20 | maskColors[i] = obj1.getInt();
|
|---|
| 21 | obj1.free();
|
|---|
| 22 | *** GfxState.cc.orig Sun Dec 12 16:04:48 2004
|
|---|
| 23 | --- GfxState.cc Sun Dec 12 16:06:38 2004
|
|---|
| 24 | ***************
|
|---|
| 25 | *** 708,713 ****
|
|---|
| 26 | --- 708,718 ----
|
|---|
| 27 | }
|
|---|
| 28 | nCompsA = obj2.getInt();
|
|---|
| 29 | obj2.free();
|
|---|
| 30 | + if (nCompsA > gfxColorMaxComps) {
|
|---|
| 31 | + error(-1, "ICCBased color space with too many (%d > %d) components",
|
|---|
| 32 | + nCompsA, gfxColorMaxComps);
|
|---|
| 33 | + nCompsA = gfxColorMaxComps;
|
|---|
| 34 | + }
|
|---|
| 35 | if (dict->lookup("Alternate", &obj2)->isNull() ||
|
|---|
| 36 | !(altA = GfxColorSpace::parse(&obj2))) {
|
|---|
| 37 | switch (nCompsA) {
|
|---|
| 38 | ***************
|
|---|
| 39 | *** 1054,1060 ****
|
|---|
| 40 | }
|
|---|
| 41 | nCompsA = obj1.arrayGetLength();
|
|---|
| 42 | if (nCompsA > gfxColorMaxComps) {
|
|---|
| 43 | ! error(-1, "DeviceN color space with more than %d > %d components",
|
|---|
| 44 | nCompsA, gfxColorMaxComps);
|
|---|
| 45 | nCompsA = gfxColorMaxComps;
|
|---|
| 46 | }
|
|---|
| 47 | --- 1059,1065 ----
|
|---|
| 48 | }
|
|---|
| 49 | nCompsA = obj1.arrayGetLength();
|
|---|
| 50 | if (nCompsA > gfxColorMaxComps) {
|
|---|
| 51 | ! error(-1, "DeviceN color space with too many (%d > %d) components",
|
|---|
| 52 | nCompsA, gfxColorMaxComps);
|
|---|
| 53 | nCompsA = gfxColorMaxComps;
|
|---|
| 54 | }
|
|---|
