moparisthebest/Simba
1
0
Fork 0
mirror of https://github.com/moparisthebest/Simba synced 2025-02-17 07:40:11 -05:00
Code Issues Releases Wiki Activity

CTS 3: Rebase work on cts-rework branch.

Browse Source
This commit is contained in:
Merlijn Wajer 2011-07-07 12:25:17 +02:00
parent f91c9ffb0e
commit 7d8b2773b9
2 changed files with 50 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Projects/MMLBenchmark/project1.lpr
View File

@ -65,7 +65,7 @@ begin
col := 16777215; tol := 30;
for c := 0 to 2 do // benchmark all CTS'es
for c := 0 to 3 do // benchmark all CTS'es
begin
MMLClient.MFinder.SetToleranceSpeed(c);
t2 := gettickcount;

87
Units/MMLCore/finder.pas
View File

@ -128,6 +128,12 @@ type
end;
PCTS2Info = ^TCTS2Info;
TCTS3Info = record
L, A, B: extended;
Tol: Integer; { Squared }
end;
PCTS3Info = ^TCTS3Info;
TCTSCompareFunction = function (ctsInfo: Pointer; C2: PRGB32): boolean;
@ -418,6 +424,23 @@ begin
and (abs(l - i.L) <= i.Tol);
end;
function ColorSame_cts3(ctsInfo: Pointer; C2: PRGB32): boolean;
var
i: TCTS3Info;
X, Y, Z, L, A, B: Extended;
begin
i := PCTS3Info(ctsInfo)^;
RGBToXYZ(C2^.R, C2^.G, C2^.B, X, Y, Z); // inline this
XYZToCIELab(X, Y, Z, L, A, B);
L := L - i.L;
A := A - i.A;
B := B - i.B;
Result := (L*L + A*A + B*B) < i.Tol;
end;
{ }
function Create_CTSInfo(cts: integer; Color, Tol: Integer;
@ -425,31 +448,41 @@ function Create_CTSInfo(cts: integer; Color, Tol: Integer;
var
R, G, B: Integer;
H, S, L: Integer;
X, Y, Z: Extended;
begin
case cts of
0:
begin
Result := AllocMem(SizeOf(TCTS0Info));
ColorToRGB(Color, PCTS0Info(Result)^.R, PCTS0Info(Result)^.G,
PCTS0Info(Result)^.B);
PCTS0Info(Result)^.Tol := Tol;
Result := AllocMem(SizeOf(TCTS0Info));
ColorToRGB(Color, PCTS0Info(Result)^.R, PCTS0Info(Result)^.G,
PCTS0Info(Result)^.B);
PCTS0Info(Result)^.Tol := Tol;
end;
1:
begin
Result := AllocMem(SizeOf(TCTS1Info));
ColorToRGB(Color, PCTS1Info(Result)^.R, PCTS1Info(Result)^.G,
PCTS1Info(Result)^.B);
PCTS1Info(Result)^.Tol := Tol*Tol;
Result := AllocMem(SizeOf(TCTS1Info));
ColorToRGB(Color, PCTS1Info(Result)^.R, PCTS1Info(Result)^.G,
PCTS1Info(Result)^.B);
PCTS1Info(Result)^.Tol := Tol*Tol;
end;
2:
begin
Result := AllocMem(SizeOf(TCTS2Info));
ColorToRGB(Color, R, G, B);
RGBToHSL(R, G, B, PCTS2Info(Result)^.H, PCTS2Info(Result)^.S,
PCTS2Info(Result)^.L);
PCTS2Info(Result)^.hueMod := Tol * hueMod;
PCTS2Info(Result)^.satMod := Tol * satMod;
PCTS2Info(Result)^.Tol := Tol;
Result := AllocMem(SizeOf(TCTS2Info));
ColorToRGB(Color, R, G, B);
RGBToHSL(R, G, B, PCTS2Info(Result)^.H, PCTS2Info(Result)^.S,
PCTS2Info(Result)^.L);
PCTS2Info(Result)^.hueMod := Tol * hueMod;
PCTS2Info(Result)^.satMod := Tol * satMod;
PCTS2Info(Result)^.Tol := Tol;
end;
3:
begin
Result := AllocMem(SizeOf(TCTS3Info));
ColorToRGB(Color, R, G, B);
RGBToXYZ(R, G, B, X, Y, Z);
XYZToCIELab(X, Y, Z, PCTS3Info(Result)^.L, PCTS3Info(Result)^.A,
PCTS3Info(Result)^.B);
PCTS3Info(Result)^.Tol := Tol*Tol;
end;
end;
end;
@ -469,6 +502,7 @@ begin
0: Result := @ColorSame_cts0;
1: Result := @ColorSame_cts1;
2: Result := @ColorSame_cts2;
3: Result := @ColorSame_cts3;
end;
end;
@ -1143,29 +1177,6 @@ var
compare: TCTSCompareFunction;
ctsinfo: Pointer;
{ procedure cts3;
begin
RGBToXYZ(clR, clG, clB, X, Y, Z);
XYZToCieLab(X, Y, Z, L1, A1, B1);
for yy := ys to ye do
begin
for xx := xs to xe do
begin
RGBToXYZ(Ptr^.R, Ptr^.G, Ptr^.B, X, Y, Z);
XYZtoCIELab(X, Y, Z, L2, A2, B2);
if Sqrt(sqr(L1 - L2) + sqr(A1 - A2) +
sqr(B1 - B2)) <= Tol then
begin
ClientTPA[c].x := xx;
ClientTPA[c].y := yy;
Inc(c);
end;
Inc(Ptr)
end;
Inc(Ptr, PtrInc);
end;
end; }
begin
Result := false;
DefaultOperations(xs,ys,xe,ye);