Skip to content

Commit e7d97f8

Browse files
Ver.2.1.0
Update sample images Updated Image32 version
1 parent e45ca99 commit e7d97f8

22 files changed

+207
-119
lines changed

Ext/SVGIconImageList/Image32/source/Img32.SVG.Core.pas

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ interface
5555
function GetValue(relSize: double; assumeRelValBelow: Double): double;
5656
function GetValueXY(const relSize: TRectD; assumeRelValBelow: Double): double;
5757
function IsValid: Boolean;
58+
function IsRelativeValue(assumeRelValBelow: double): Boolean;
59+
{$IFDEF INLINE} inline; {$ENDIF}
5860
function HasFontUnits: Boolean;
5961
function HasAngleUnits: Boolean;
6062
end;
@@ -88,10 +90,10 @@ interface
8890
UTF8Char = Char;
8991
PUTF8Char = PChar;
9092
{$ELSE}
91-
{$IF COMPILERVERSION < 31}
92-
UTF8Char = AnsiChar;
93-
PUTF8Char = PAnsiChar;
94-
{$IFEND}
93+
{$IF COMPILERVERSION < 31}
94+
UTF8Char = AnsiChar;
95+
PUTF8Char = PAnsiChar;
96+
{$IFEND}
9597
{$ENDIF}
9698

9799
TAnsi = {$IFDEF RECORD_METHODS} record {$ELSE} object {$ENDIF}
@@ -1228,12 +1230,15 @@ function MakeDashArray(const dblArray: TArrayOfDouble; scale: double): TArrayOfI
12281230
Result[i] := Ceil(dblArray[i] * scale);
12291231
dist := Result[i] + dist;
12301232
end;
1233+
12311234
if dist = 0 then
1232-
Result := nil
1233-
else if len = 1 then
12341235
begin
1235-
SetLength(Result, 2);
1236-
Result[1] := Result[0];
1236+
Result := nil;
1237+
end
1238+
else if Odd(len) then
1239+
begin
1240+
SetLength(Result, len *2);
1241+
Move(Result[0], Result[len], len * SizeOf(integer));
12371242
end;
12381243
end;
12391244
//------------------------------------------------------------------------------
@@ -2337,7 +2342,7 @@ function TValue.GetValue(relSize: double; assumeRelValBelow: Double): double;
23372342
begin
23382343
if not IsValid or (rawVal = 0) then
23392344
Result := 0
2340-
else if (unitType = utNumber) and (Abs(rawVal) <= assumeRelValBelow) then
2345+
else if IsRelativeValue(assumeRelValBelow) then
23412346
Result := rawVal * relSize
23422347
else
23432348
Result := ConvertValue(self, relSize);
@@ -2351,6 +2356,12 @@ function TValue.GetValueXY(const relSize: TRectD; assumeRelValBelow: Double): do
23512356
end;
23522357
//------------------------------------------------------------------------------
23532358

2359+
function TValue.IsRelativeValue(assumeRelValBelow: double): Boolean;
2360+
begin
2361+
Result := (unitType = utNumber) and (Abs(rawVal) <= assumeRelValBelow);
2362+
end;
2363+
//------------------------------------------------------------------------------
2364+
23542365
function TValue.IsValid: Boolean;
23552366
begin
23562367
Result := (unitType <> utUnknown) and Img32.Vector.IsValid(rawVal);

Ext/SVGIconImageList/Image32/source/Img32.SVG.HashConsts.inc

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ const
44
harithmetic = $978C7D6F; // arithmetic
55
hAtop = $7655315D; // Atop
66
hauto_045_start_045_reverse = $EE4545A2; // auto-start-reverse
7+
hBackgroundAlpha = $DA55EB83; // BackgroundAlpha
8+
hBackgroundImage = $0313D8C9; // BackgroundImage
79
hBaseline = $C7461648; // Baseline
810
hbaseline_045_shift = $56FA5107; // baseline-shift
911
hBevel = $BF36E150; // Bevel
@@ -74,10 +76,10 @@ const
7476
hIn2 = $FBFE02B1; // In2
7577
hIntercept = $7CBB607F; // Intercept
7678
hItalic = $F07E7786; // Italic
77-
hk1 = $33176D43; // k1
78-
hk2 = $DD11C139; // k2
79-
hk3 = $CF4B25AC; // k3
80-
hk4 = $77CCF6AD; // k4
79+
hK1 = $33176D43; // K1
80+
hK2 = $DD11C139; // K2
81+
hK3 = $CF4B25AC; // K3
82+
hK4 = $77CCF6AD; // K4
8183
hkernelUnitLength = $3B25E980; // kernelUnitLength
8284
hletter_045_spacing = $5130BCF5; // letter-spacing
8385
hLighten = $85E826DE; // Lighten

0 commit comments

Comments
 (0)