|
Line
Link Here
|
| 0 |
-- coders/psd.c |
0 |
++ coders/psd.c |
|
Lines 664-669
Link Here
|
| 664 |
} |
664 |
} |
| 665 |
(void) ReadBlob(image,6,psd_info.reserved); |
665 |
(void) ReadBlob(image,6,psd_info.reserved); |
| 666 |
psd_info.channels=ReadBlobMSBShort(image); |
666 |
psd_info.channels=ReadBlobMSBShort(image); |
|
|
667 |
if (psd_info.channels > 24) psd_info.channels = 24; |
| 667 |
psd_info.rows=ReadBlobMSBLong(image); |
668 |
psd_info.rows=ReadBlobMSBLong(image); |
| 668 |
psd_info.columns=ReadBlobMSBLong(image); |
669 |
psd_info.columns=ReadBlobMSBLong(image); |
| 669 |
psd_info.depth=ReadBlobMSBShort(image); |
670 |
psd_info.depth=ReadBlobMSBShort(image); |
|
Lines 846-851
Link Here
|
| 846 |
layer_info[i].page.height=(ReadBlobMSBLong(image)-layer_info[i].page.y); |
847 |
layer_info[i].page.height=(ReadBlobMSBLong(image)-layer_info[i].page.y); |
| 847 |
layer_info[i].page.width=(ReadBlobMSBLong(image)-layer_info[i].page.x); |
848 |
layer_info[i].page.width=(ReadBlobMSBLong(image)-layer_info[i].page.x); |
| 848 |
layer_info[i].channels=ReadBlobMSBShort(image); |
849 |
layer_info[i].channels=ReadBlobMSBShort(image); |
|
|
850 |
if (layer_info[i].channels > 24) layer_info[i].channels = 24; |
| 849 |
if (image->debug != MagickFalse) |
851 |
if (image->debug != MagickFalse) |
| 850 |
(void) LogMagickEvent(CoderEvent,GetMagickModule()," offset(%ld,%ld), size(%ld,%ld), channels=%d", |
852 |
(void) LogMagickEvent(CoderEvent,GetMagickModule()," offset(%ld,%ld), size(%ld,%ld), channels=%d", |
| 851 |
layer_info[i].page.x, layer_info[i].page.y, |
853 |
layer_info[i].page.x, layer_info[i].page.y, |
