pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

Improved clipping rect handling.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@553 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
tomb0
2008-09-11 08:14:25 +00:00
parent 5276962d02
commit 59640eecea
2 changed files with 64 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
components/rgbgraphics/example/rgbexample.lpi
View File

@ -7,7 +7,7 @@
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value=".\"/> <IconPath Value=".\"/>
<TargetFileExt Value=".exe"/> <TargetFileExt Value=".exe"/>
<ActiveEditorIndexAtStart Value="0"/> <ActiveEditorIndexAtStart Value="2"/>
</General> </General>
<VersionInfo> <VersionInfo>
<ProjectVersion Value=""/> <ProjectVersion Value=""/>
@ -38,7 +38,7 @@
<Filename Value="rgbexample.lpr"/> <Filename Value="rgbexample.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="RGBExample"/> <UnitName Value="RGBExample"/>
<CursorPos X="1" Y="17"/> <CursorPos X="74" Y="12"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<UsageCount Value="34"/> <UsageCount Value="34"/>
@ -48,6 +48,7 @@
<Filename Value="rgbunit.pas"/> <Filename Value="rgbunit.pas"/>
<ComponentName Value="FormExample"/> <ComponentName Value="FormExample"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<ResourceBaseClass Value="Form"/>
<ResourceFilename Value="rgbunit.lrs"/> <ResourceFilename Value="rgbunit.lrs"/>
<UnitName Value="RGBUnit"/> <UnitName Value="RGBUnit"/>
<CursorPos X="23" Y="33"/> <CursorPos X="23" Y="33"/>
@ -59,9 +60,9 @@
<Unit2> <Unit2>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<UnitName Value="RGBGraphics"/> <UnitName Value="RGBGraphics"/>
<CursorPos X="42" Y="35"/> <CursorPos X="21" Y="31"/>
<TopLine Value="22"/> <TopLine Value="22"/>
<EditorIndex Value="3"/> <EditorIndex Value="2"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit2> </Unit2>
@ -283,8 +284,8 @@
<Unit35> <Unit35>
<Filename Value="..\..\lazarus\lcl\interfaces\qt\qt4.pas"/> <Filename Value="..\..\lazarus\lcl\interfaces\qt\qt4.pas"/>
<UnitName Value="qt4"/> <UnitName Value="qt4"/>
<CursorPos X="1" Y="1"/> <CursorPos X="11" Y="35"/>
<TopLine Value="1883"/> <TopLine Value="22"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
</Unit35> </Unit35>
<Unit36> <Unit36>
@ -326,18 +327,14 @@
<UnitName Value="ExtCtrls"/> <UnitName Value="ExtCtrls"/>
<CursorPos X="30" Y="584"/> <CursorPos X="30" Y="584"/>
<TopLine Value="572"/> <TopLine Value="572"/>
<EditorIndex Value="2"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit41> </Unit41>
<Unit42> <Unit42>
<Filename Value="..\..\lazarus\lcl\graphics.pp"/> <Filename Value="..\..\lazarus\lcl\graphics.pp"/>
<UnitName Value="Graphics"/> <UnitName Value="Graphics"/>
<CursorPos X="34" Y="1319"/> <CursorPos X="34" Y="1319"/>
<TopLine Value="1308"/> <TopLine Value="1308"/>
<EditorIndex Value="4"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit42> </Unit42>
<Unit43> <Unit43>
<Filename Value="..\..\lazarus\lcl\include\picture.inc"/> <Filename Value="..\..\lazarus\lcl\include\picture.inc"/>
@ -368,153 +365,142 @@
<Filename Value="..\..\lazarus\lcl\include\bitmap.inc"/> <Filename Value="..\..\lazarus\lcl\include\bitmap.inc"/>
<CursorPos X="25" Y="62"/> <CursorPos X="25" Y="62"/>
<TopLine Value="60"/> <TopLine Value="60"/>
<EditorIndex Value="5"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit47> </Unit47>
<Unit48> <Unit48>
<Filename Value="..\..\lazarus\fpc\2.2.1\source\packages\fcl-image\src\fpwritebmp.pp"/> <Filename Value="..\..\lazarus\fpc\2.2.1\source\packages\fcl-image\src\fpwritebmp.pp"/>
<UnitName Value="FPWriteBMP"/> <UnitName Value="FPWriteBMP"/>
<CursorPos X="3" Y="31"/> <CursorPos X="3" Y="31"/>
<TopLine Value="18"/> <TopLine Value="18"/>
<EditorIndex Value="6"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit48> </Unit48>
</Units> </Units>
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="28" HistoryIndex="27">
<Position1> <Position1>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="291" Column="16" TopLine="276"/> <Caret Line="290" Column="15" TopLine="276"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="290" Column="15" TopLine="276"/> <Caret Line="347" Column="49" TopLine="330"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="347" Column="49" TopLine="330"/> <Caret Line="343" Column="59" TopLine="335"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="343" Column="59" TopLine="335"/> <Caret Line="342" Column="55" TopLine="329"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="342" Column="55" TopLine="329"/> <Caret Line="340" Column="36" TopLine="329"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="340" Column="36" TopLine="329"/> <Caret Line="1" Column="1" TopLine="1"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="197" Column="27" TopLine="184"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="197" Column="27" TopLine="184"/> <Caret Line="198" Column="27" TopLine="185"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="198" Column="27" TopLine="185"/> <Caret Line="199" Column="27" TopLine="186"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="199" Column="27" TopLine="186"/> <Caret Line="340" Column="36" TopLine="327"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="340" Column="36" TopLine="327"/> <Caret Line="342" Column="15" TopLine="329"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="342" Column="15" TopLine="329"/> <Caret Line="345" Column="36" TopLine="332"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="345" Column="36" TopLine="332"/> <Caret Line="348" Column="15" TopLine="335"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="348" Column="15" TopLine="335"/> <Caret Line="371" Column="36" TopLine="347"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="371" Column="36" TopLine="347"/> <Caret Line="390" Column="14" TopLine="374"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="390" Column="14" TopLine="374"/> <Caret Line="1" Column="1" TopLine="1"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="1" Column="1" TopLine="1"/> <Caret Line="342" Column="61" TopLine="331"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="342" Column="61" TopLine="331"/> <Caret Line="342" Column="59" TopLine="331"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="342" Column="59" TopLine="331"/> <Caret Line="291" Column="10" TopLine="279"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="291" Column="10" TopLine="279"/> <Caret Line="375" Column="10" TopLine="363"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="375" Column="10" TopLine="363"/> <Caret Line="471" Column="37" TopLine="456"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="471" Column="37" TopLine="456"/> <Caret Line="457" Column="28" TopLine="444"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="457" Column="28" TopLine="444"/> <Caret Line="458" Column="28" TopLine="445"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="458" Column="28" TopLine="445"/> <Caret Line="457" Column="28" TopLine="445"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="457" Column="28" TopLine="445"/> <Caret Line="453" Column="30" TopLine="445"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="..\rgbgraphics.pas"/> <Filename Value="..\rgbgraphics.pas"/>
<Caret Line="453" Column="30" TopLine="445"/> <Caret Line="458" Column="31" TopLine="445"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="..\..\lazarus\lcl\include\bitmap.inc"/>
<Caret Line="62" Column="21" TopLine="60"/>
</Position27>
<Position28>
<Filename Value="..\rgbgraphics.pas"/>
<Caret Line="458" Column="31" TopLine="445"/>
</Position28>
<Position29>
<Filename Value="rgbexample.lpr"/> <Filename Value="rgbexample.lpr"/>
<Caret Line="17" Column="1" TopLine="1"/> <Caret Line="17" Column="1" TopLine="1"/>
</Position29> </Position27>
<Position30> <Position28>
<Filename Value="rgbunit.pas"/> <Filename Value="rgbunit.pas"/>
<Caret Line="44" Column="16" TopLine="43"/> <Caret Line="44" Column="16" TopLine="43"/>
</Position30> </Position28>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="8"/>
<PathDelim Value="\"/> <PathDelim Value="\"/>
<SearchPaths> <SearchPaths>
<LCLWidgetType Value="qt"/>
<SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/> <SrcPath Value="$(LazarusDir)\lcl\;$(LazarusDir)\lcl\interfaces\$(LCLWidgetType)\"/>
</SearchPaths> </SearchPaths>
<CodeGeneration> <Parsing>
<Generate Value="Faster"/> <SyntaxOptions>
</CodeGeneration> <CStyleOperator Value="False"/>
</SyntaxOptions>
</Parsing>
<Linking> <Linking>
<Options> <Options>
<LinkerOptions Value="-framework carbon"/> <LinkerOptions Value="-framework carbon"/>

25
components/rgbgraphics/rgbroutines.pas
View File

@ -89,6 +89,16 @@ type
implementation implementation
function GetDCClipRect(Dest: HDC): TRect;
begin
if GetClipBox(Dest, @Result) = ERROR then
begin
Result.TopLeft := Point(0, 0);
if not GetDeviceSize(Dest, Result.BottomRight) then
Result.BottomRight := Point(8000, 8000);
end;
end;
procedure DrawRGB32Bitmap(Dst: TRGB32BitmapCore; X, Y: Integer; Src: TRGB32BitmapCore); procedure DrawRGB32Bitmap(Dst: TRGB32BitmapCore; X, Y: Integer; Src: TRGB32BitmapCore);
var var
SrcX, SrcWidth, SrcY, SrcHeight: Integer; SrcX, SrcWidth, SrcY, SrcHeight: Integer;
@ -524,7 +534,9 @@ begin
if (Bitmap = nil) or (Bitmap.Pixels = nil) then Exit; if (Bitmap = nil) or (Bitmap.Pixels = nil) then Exit;
if (Bitmap.Width <= 0) or (Bitmap.Height <= 0) then Exit; if (Bitmap.Width <= 0) or (Bitmap.Height <= 0) then Exit;
if (SrcWidth <= 0) or (SrcHeight <= 0) then Exit; if (SrcWidth <= 0) or (SrcHeight <= 0) then Exit;
GetClipBox(Dest, @Clip);
Clip := GetDCClipRect(Dest);
if (DstX >= Clip.Right) or (DstY >= Clip.Bottom) or if (DstX >= Clip.Right) or (DstY >= Clip.Bottom) or
(DstX + SrcWidth < Clip.Left) or (DstY + SrcHeight < Clip.Top) then Exit; (DstX + SrcWidth < Clip.Left) or (DstY + SrcHeight < Clip.Top) then Exit;
@ -551,7 +563,9 @@ begin
if (Bitmap.Width <= 0) or (Bitmap.Height <= 0) then Exit; if (Bitmap.Width <= 0) or (Bitmap.Height <= 0) then Exit;
if (SrcWidth <= 0) or (SrcHeight <= 0) then Exit; if (SrcWidth <= 0) or (SrcHeight <= 0) then Exit;
if (DstWidth <= 0) or (DstHeight <= 0) then Exit; if (DstWidth <= 0) or (DstHeight <= 0) then Exit;
GetClipBox(Dest, @Clip);
Clip := GetDCClipRect(Dest);
if (DstX >= Clip.Right) or (DstY >= Clip.Bottom) or if (DstX >= Clip.Right) or (DstY >= Clip.Bottom) or
(DstX + DstWidth < Clip.Left) or (DstY + DstHeight < Clip.Top) then Exit; (DstX + DstWidth < Clip.Left) or (DstY + DstHeight < Clip.Top) then Exit;
@ -719,7 +733,8 @@ begin
if (Bitmap = nil) or (Bitmap.Pixels = nil) then Exit; if (Bitmap = nil) or (Bitmap.Pixels = nil) then Exit;
if (Bitmap.Width <= 0) or (Bitmap.Height <= 0) then Exit; if (Bitmap.Width <= 0) or (Bitmap.Height <= 0) then Exit;
if (DstWidth <= 0) or (DstHeight <= 0) then Exit; if (DstWidth <= 0) or (DstHeight <= 0) then Exit;
GetClipBox(Dest, @Clip);
Clip := GetDCClipRect(Dest);
ZoomX := DstWidth / Bitmap.Width; ZoomX := DstWidth / Bitmap.Width;
ZoomY := DstHeight / Bitmap.Height; ZoomY := DstHeight / Bitmap.Height;
@ -742,7 +757,9 @@ begin
if (Bitmap = nil) or (Bitmap.Pixels = nil) then Exit; if (Bitmap = nil) or (Bitmap.Pixels = nil) then Exit;
if (Bitmap.Width <= 0) or (Bitmap.Height <= 0) then Exit; if (Bitmap.Width <= 0) or (Bitmap.Height <= 0) then Exit;
if (SrcWidth <= 0) or (SrcHeight <= 0) then Exit; if (SrcWidth <= 0) or (SrcHeight <= 0) then Exit;
GetClipBox(Dest, @Clip);
Clip := GetDCClipRect(Dest);
if (DstX >= Clip.Right) or (DstY >= Clip.Bottom) or if (DstX >= Clip.Right) or (DstY >= Clip.Bottom) or
(DstX + SrcWidth < Clip.Left) or (DstY + SrcHeight < Clip.Top) then Exit; (DstX + SrcWidth < Clip.Left) or (DstY + SrcHeight < Clip.Top) then Exit;