mirror-github-bspeice/apophysis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
zueuk 2008-12-18 16:12:00 +00:00
parent d644e38ff8
commit 433a001f72
3 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
2.10/Source/ControlPoint.pas
View File

@ -473,7 +473,6 @@ end;
if xf.noPlot then if xf.noPlot then
pPoint^.x := MaxDouble // hack pPoint^.x := MaxDouble // hack
else begin else begin
//pPoint^.x := p.x; pPoint^.y := p.y; pPoint^.c := p.c;
pPoint^ := p; pPoint^ := p;
end; end;
Inc(pPoint); Inc(pPoint);
@ -1435,6 +1434,7 @@ begin
Result.spatial_oversample := Round(c0 * cp1.spatial_oversample + c1 * cp2.spatial_oversample); Result.spatial_oversample := Round(c0 * cp1.spatial_oversample + c1 * cp2.spatial_oversample);
Result.center[0] := c0 * cp1.center[0] + c1 * cp2.center[0]; Result.center[0] := c0 * cp1.center[0] + c1 * cp2.center[0];
Result.center[1] := c0 * cp1.center[1] + c1 * cp2.center[1]; Result.center[1] := c0 * cp1.center[1] + c1 * cp2.center[1];
Result.FAngle := c0 * cp1.FAngle + c1 * cp2.FAngle;
Result.pixels_per_unit := c0 * cp1.pixels_per_unit + c1 * cp2.pixels_per_unit; Result.pixels_per_unit := c0 * cp1.pixels_per_unit + c1 * cp2.pixels_per_unit;
// Result.background[0] := c0 * cp1.background[0] + c1 * cp2.background[0]; // Result.background[0] := c0 * cp1.background[0] + c1 * cp2.background[0];
// Result.background[1] := c0 * cp1.background[1] + c1 * cp2.background[1]; // Result.background[1] := c0 * cp1.background[1] + c1 * cp2.background[1];
@ -1938,7 +1938,10 @@ end;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
function TControlPoint.GetRelativeGammaThreshold: double; function TControlPoint.GetRelativeGammaThreshold: double;
begin begin
Result := gamma_threshold / Fbrightness; if Fbrightness <> 0 then
Result := gamma_threshold / Fbrightness
else
Result := gamma_threshold;
end; end;
procedure TControlPoint.SetRelativeGammaThreshold(gtr: double); procedure TControlPoint.SetRelativeGammaThreshold(gtr: double);

3
2.10/Source/FormRender.pas
View File

@ -419,7 +419,8 @@ begin
begin begin
MaxMemory := StrToIntDef(cbMaxMemory.text, 0); MaxMemory := StrToIntDef(cbMaxMemory.text, 0);
if MaxMemory * 1024*1024 < ImageWidth * (int64(ImageHeight) * 4 + oversample) then begin if MaxMemory * 1024*1024 < ImageWidth * (int64(ImageHeight) * 4 + oversample) then begin
Application.MessageBox('Invalid maximum memory value', 'Apophysis', 16); // Must be enough memory to hold the final image (RGBA)
Application.MessageBox('Maximum memory value is too small', 'Apophysis', 16);
exit; exit;
end; end;
end; end;

18
2.10/Source/RenderST.pas
View File

@ -51,24 +51,6 @@ begin
useFinalXform := fcp.FinalXformEnabled and fcp.HasFinalXform; useFinalXform := fcp.FinalXformEnabled and fcp.HasFinalXform;
fcp.Prepare; fcp.Prepare;
{
for i := 0 to n - 1 do begin
fcp.xform[i].Prepare;
totValue := totValue + fcp.xform[i].density;
end;
LoopValue := 0;
for i := 0 to PROP_TABLE_SIZE-1 do begin
propsum := 0;
j := -1;
repeat
inc(j);
propsum := propsum + fcp.xform[j].density;
until (propsum > LoopValue) or (j = n - 1);
PropTable[i] := fcp.xform[j];
LoopValue := LoopValue + TotValue / PROP_TABLE_SIZE;
end;
}
end; end;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////