paweld/lazarus-ccr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fpspreadsheet: Improved pcx image format detection (suggested by Bart). Improved emf size calculation (patch by Bart).

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@9134 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz 2024-01-10 12:13:53 +00:00
parent 60c28e792c
commit 26d64bdb4b
1 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
components/fpspreadsheet/source/common/fpsimages.pas
View File

@ -174,11 +174,11 @@ function GetEMFSize(AStream: TStream; out AWidth, AHeight: DWord;
// https://msdn.microsoft.com/de-de/library/windows/desktop/dd162607%28v=vs.85%29.aspx // https://msdn.microsoft.com/de-de/library/windows/desktop/dd162607%28v=vs.85%29.aspx
type type
TEnhMetaHeader = packed record TEnhMetaHeader = packed record
iType: DWord; iType: DWord; // Must be 1 for a emf
nSize: DWord; nSize: DWord;
rclBounds: TRect; rclBounds: TRect; // Bounds of image in pixels ...
rclFrame: TRect; rclFrame: TRect; // ... and in 1/100th millimeters
dSignature: DWord; // must be $464D4520 dSignature: DWord; // Must be $464D4520
nVersion: DWord; nVersion: DWord;
nBytes: DWord; nBytes: DWord;
nRecords: DWord; nRecords: DWord;
@ -187,8 +187,8 @@ type
nDescription: DWord; nDescription: DWord;
offDescription: DWord; offDescription: DWord;
nPalEntries: DWord; nPalEntries: DWord;
szlDevice: TPoint; szlDevice: TPoint; // Size of device in pixels ...
szlMillimeters: TPoint; szlMillimeters: TPoint; // ... and in millimeters
// more to follow // more to follow
end; end;
var var
@ -199,12 +199,13 @@ begin
n := AStream.Read(hdr{%H-}, SizeOf(hdr)); n := AStream.Read(hdr{%H-}, SizeOf(hdr));
if n < SizeOf(hdr) then exit; if n < SizeOf(hdr) then exit;
if hdr.dSignature <> $464D4520 then exit; if (hdr.iType <> 1) or (hdr.dSignature <> $464D4520) then exit;
AWidth := (hdr.rclFrame.Right - hdr.rclFrame.Left); // in 0.01 mm AWidth := hdr.rclBounds.Right - hdr.rclBounds.Left + 1; // in pixels
AHeight := (hdr.rclFrame.Bottom - hdr.rclFrame.Top); AHeight := hdr.rclBounds.Bottom - hdr.rclBounds.Top + 1;
dpiX := 100*25.4;
dpiY := 100*25.4; dpiX := hdr.szlDevice.X / hdr.szlMillimeters.X * 25.4;
dpiY := hdr.szlDevice.Y / hdr.szlMillimeters.Y * 25.4;
Result := true; Result := true;
end; end;
@ -367,32 +368,35 @@ function GetPCXSize(AStream: TStream; out AWidth, AHeight: DWord;
out dpiX, dpiY: Double): Boolean; out dpiX, dpiY: Double): Boolean;
type type
TPCXHeader = packed record TPCXHeader = packed record
FileID: Byte; // $0A for PCX files, $CD for SCR files FileID: Byte; // $0A for PCX files, $CD for SCR files
Version: Byte; // 0: version 2.5; 2: 2.8 with palette; 3: 2.8 w/o palette; 5: version 3 Version: Byte; // 0: version 2.5; 2: 2.8 with palette; 3: 2.8 w/o palette; 5: version 3
Encoding: Byte; // 0: uncompressed; 1: RLE encoded Encoding: Byte; // 0: uncompressed; 1: RLE encoded
BitsPerPixel: Byte; BitsPerPixel: Byte;
XMin, XMin,
YMin, YMin,
XMax, XMax,
YMax, // coordinates of the corners of the image YMax, // coordinates of the corners of the image
HRes, // horizontal resolution in dpi HRes, // horizontal resolution in dpi
VRes: Word; // vertical resolution in dpi VRes: Word; // vertical resolution in dpi
ColorMap: array[0..15*3] of byte; // color table ColorMap: array[0..16*3-1] of byte; // color table
Reserved, Reserved,
ColorPlanes: Byte; // color planes (at most 4) ColorPlanes: Byte; // color planes (at most 4)
BytesPerLine, // number of bytes of one line of one plane BytesPerLine, // number of bytes of one line of one plane
PaletteType: Word; // 1: color or b&w; 2: gray scale PaletteType: Word; // 1: color or b&w; 2: gray scale
Fill: array[0..57] of Byte; Fill: array[0..57] of Byte;
end; end;
var var
hdr: TPCXHeader; hdr: TPCXHeader;
n: Int64; n: Integer;
begin begin
Result := false; Result := false;
n := AStream.Read(hdr{%H-}, SizeOf(hdr)); n := SizeOf(hdr);
if n < SizeOf(hdr) then exit; Result := (AStream.Read(hdr{%H-}, n) = n)
if not (hdr.FileID in [$0A, $CD]) then exit; and (hdr.FileID in [$0A, $0C])
and (hdr.ColorPlanes in [1, 3, 4])
and (hdr.Version in [0, 2, 3, 5])
and (hdr.PaletteType in [1, 2]);
AWidth := hdr.XMax - hdr.XMin + 1; AWidth := hdr.XMax - hdr.XMin + 1;
AHeight := hdr.YMax - hdr.YMin + 1; AHeight := hdr.YMax - hdr.YMin + 1;