Just save current work.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@1607 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
yangjixian
2011-05-02 16:31:46 +00:00
parent b9bf45bc79
commit 328c133706
4 changed files with 97 additions and 67 deletions

View File

@ -139,6 +139,7 @@ operator * (const A, B: TRGBATriple): TRGBATriple;
operator div (const A, B: TRGBATriple): TRGBATriple; operator div (const A, B: TRGBATriple): TRGBATriple;
function DWordTrans(SrcRow: TRGBATriple): DWORD; function DWordTrans(SrcRow: TRGBATriple): DWORD;
function DWordToTriple(SrcRow: DWORD): TRGBATriple; function DWordToTriple(SrcRow: DWORD): TRGBATriple;
procedure StretchLinear(Dest, Src: TDLBitmap);
implementation implementation

View File

@ -614,7 +614,7 @@ begin
aBitmap.InvalidateScanLine; aBitmap.InvalidateScanLine;
end; end;
procedure StretchLinear(Dest, Src: TDLBitmap); // only for 24bit bitmap procedure StretchLinear(Dest, Src: TDLBitmap);
var var
sw, sh, dw, dh, B, N, x, y, i, j, k, nPixelSize: DWord; sw, sh, dw, dh, B, N, x, y, i, j, k, nPixelSize: DWord;
pLinePrev, pLineNext, pDest, pA, pB, pC, pD: pRGBATriple; pLinePrev, pLineNext, pDest, pA, pB, pC, pD: pRGBATriple;
@ -672,6 +672,29 @@ begin
end; end;
end; end;
end; end;
Dest.InvalidateScanLine;
end; end;
procedure StretchDLBMP(Src: TDLBitmap; MultiX, MultiY: integer);
var
sw, sh, dw, dh, B, N, x, y, i, j, k, nPixelSize: DWord;
Dest: TDLBitmap;
begin
sw := Src.Width - 1;
sh := Src.Height - 1;
dw := (Src.Width - 1) * MultiX;
dh := (Src.Height - 1) * MultiY;
nPixelSize := 3;
for i := 0 to sh do
begin
for j := 0 to sw do
begin
for k := 0 to nPixelSize - 1 do
begin
end;
end;
end;
Dest.InvalidateScanLine;
end;

View File

@ -599,7 +599,11 @@ procedure TRGBBitmapCore.StretchDrawTo(ACanvas: TCanvas;
DstX, DstY, DstWidth, DstHeight: integer); DstX, DstY, DstWidth, DstHeight: integer);
begin begin
if ACanvas <> nil then if ACanvas <> nil then
ACanvas.StretchDraw(Rect(DstX, DstY, DstWidth, DstHeight), Self); // ACanvas.StretchDraw(Rect(DstX, DstY, DstWidth, DstHeight), Self);
begin
ACanvas.AntialiasingMode:=amOff;
ACanvas.CopyRect(Rect(DstX, DstY, DstWidth, DstHeight), Self.Canvas, Rect(0,0,Width,Height));
end;
end; end;
{ TRGB32BitmapCore } { TRGB32BitmapCore }

View File

@ -72,7 +72,7 @@
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="430"/> <TopLine Value="430"/>
<CursorPos X="26" Y="443"/> <CursorPos X="22" Y="443"/>
<UsageCount Value="32"/> <UsageCount Value="32"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit2> </Unit2>
@ -168,10 +168,12 @@
<Unit12> <Unit12>
<Filename Value="T:\fpclaz\laz\lcl\graphics.pp"/> <Filename Value="T:\fpclaz\laz\lcl\graphics.pp"/>
<UnitName Value="Graphics"/> <UnitName Value="Graphics"/>
<EditorIndex Value="3"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="41"/> <TopLine Value="1083"/>
<CursorPos X="19" Y="52"/> <CursorPos X="15" Y="1094"/>
<UsageCount Value="10"/> <UsageCount Value="10"/>
<Loaded Value="True"/>
</Unit12> </Unit12>
<Unit13> <Unit13>
<Filename Value="picturemanager.pas"/> <Filename Value="picturemanager.pas"/>
@ -242,8 +244,8 @@
<UnitName Value="BmpRGBTypes"/> <UnitName Value="BmpRGBTypes"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="591"/> <TopLine Value="589"/>
<CursorPos X="20" Y="602"/> <CursorPos X="36" Y="604"/>
<UsageCount Value="28"/> <UsageCount Value="28"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit21> </Unit21>
@ -355,9 +357,9 @@
<Unit35> <Unit35>
<Filename Value="DLBitmap.pas"/> <Filename Value="DLBitmap.pas"/>
<UnitName Value="DLBitmap"/> <UnitName Value="DLBitmap"/>
<EditorIndex Value="3"/> <EditorIndex Value="4"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="164"/> <TopLine Value="170"/>
<CursorPos X="15" Y="180"/> <CursorPos X="15" Y="180"/>
<UsageCount Value="16"/> <UsageCount Value="16"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@ -389,7 +391,7 @@
<Unit39> <Unit39>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBmpUtils.inc"/>
<IsVisibleTab Value="True"/> <IsVisibleTab Value="True"/>
<EditorIndex Value="4"/> <EditorIndex Value="5"/>
<WindowIndex Value="0"/> <WindowIndex Value="0"/>
<TopLine Value="616"/> <TopLine Value="616"/>
<CursorPos X="32" Y="661"/> <CursorPos X="32" Y="661"/>
@ -430,123 +432,123 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="picturectrls.pas"/> <Filename Value="picturectrls.pas"/>
<Caret Line="97" Column="90" TopLine="94"/> <Caret Line="298" Column="27" TopLine="288"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="picturectrls.pas"/> <Filename Value="picturectrls.pas"/>
<Caret Line="190" Column="19" TopLine="171"/> <Caret Line="443" Column="26" TopLine="430"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="picturectrls.pas"/> <Filename Value="bmprgbtypes.pas"/>
<Caret Line="191" Column="19" TopLine="172"/> <Caret Line="131" Column="28" TopLine="120"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="picturectrls.pas"/> <Filename Value="bmprgbtypes.pas"/>
<Caret Line="298" Column="27" TopLine="288"/> <Caret Line="603" Column="33" TopLine="591"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="picturectrls.pas"/> <Filename Value="bmprgbtypes.pas"/>
<Caret Line="443" Column="26" TopLine="430"/> <Caret Line="602" Column="22" TopLine="591"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="bmprgbtypes.pas"/> <Filename Value="bmprgbtypes.pas"/>
<Caret Line="131" Column="28" TopLine="120"/> <Caret Line="602" Column="20" TopLine="591"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="bmprgbtypes.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="603" Column="33" TopLine="591"/> <Caret Line="430" Column="17" TopLine="419"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="bmprgbtypes.pas"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="602" Column="22" TopLine="591"/> <Caret Line="573" Column="18" TopLine="557"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="bmprgbtypes.pas"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="602" Column="20" TopLine="591"/> <Caret Line="573" Column="17" TopLine="557"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="DLBitmap.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="430" Column="17" TopLine="419"/> <Caret Line="439" Column="56" TopLine="435"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="573" Column="18" TopLine="557"/> <Caret Line="449" Column="52" TopLine="438"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="573" Column="17" TopLine="557"/> <Caret Line="41" Column="68" TopLine="34"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="DLBitmap.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="439" Column="56" TopLine="435"/> <Caret Line="41" Column="44" TopLine="31"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="DLBitmap.pas"/>
<Caret Line="449" Column="52" TopLine="438"/>
</Position14>
<Position15>
<Filename Value="DLBitmap.pas"/>
<Caret Line="41" Column="68" TopLine="34"/>
</Position15>
<Position16>
<Filename Value="DLBitmap.pas"/>
<Caret Line="41" Column="44" TopLine="31"/>
</Position16>
<Position17>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="626" Column="33" TopLine="616"/> <Caret Line="626" Column="33" TopLine="616"/>
</Position14>
<Position15>
<Filename Value="DLBmpUtils.inc"/>
<Caret Line="620" Column="59" TopLine="606"/>
</Position15>
<Position16>
<Filename Value="DLBmpUtils.inc"/>
<Caret Line="536" Column="13" TopLine="516"/>
</Position16>
<Position17>
<Filename Value="DLBitmap.pas"/>
<Caret Line="147" Column="47" TopLine="137"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="620" Column="59" TopLine="606"/> <Caret Line="662" Column="20" TopLine="655"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="536" Column="13" TopLine="516"/> <Caret Line="661" Column="34" TopLine="651"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="DLBitmap.pas"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="147" Column="47" TopLine="137"/> <Caret Line="662" Column="30" TopLine="651"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="662" Column="20" TopLine="655"/> <Caret Line="664" Column="35" TopLine="652"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="661" Column="34" TopLine="651"/> <Caret Line="665" Column="26" TopLine="653"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="662" Column="30" TopLine="651"/> <Caret Line="666" Column="40" TopLine="655"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="DLBmpUtils.inc"/> <Filename Value="DLBmpUtils.inc"/>
<Caret Line="664" Column="35" TopLine="652"/> <Caret Line="662" Column="18" TopLine="654"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="DLBmpUtils.inc"/>
<Caret Line="665" Column="26" TopLine="653"/>
</Position25>
<Position26>
<Filename Value="DLBmpUtils.inc"/>
<Caret Line="666" Column="40" TopLine="655"/>
</Position26>
<Position27>
<Filename Value="DLBmpUtils.inc"/>
<Caret Line="662" Column="18" TopLine="654"/>
</Position27>
<Position28>
<Filename Value="DLBitmap.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="184" Column="23" TopLine="167"/> <Caret Line="184" Column="23" TopLine="167"/>
</Position28> </Position25>
<Position29> <Position26>
<Filename Value="DLBitmap.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="176" Column="5" TopLine="165"/> <Caret Line="176" Column="5" TopLine="165"/>
</Position29> </Position26>
<Position30> <Position27>
<Filename Value="DLBitmap.pas"/> <Filename Value="DLBitmap.pas"/>
<Caret Line="180" Column="16" TopLine="167"/> <Caret Line="180" Column="16" TopLine="167"/>
</Position27>
<Position28>
<Filename Value="picturectrls.pas"/>
<Caret Line="443" Column="22" TopLine="430"/>
</Position28>
<Position29>
<Filename Value="bmprgbtypes.pas"/>
<Caret Line="131" Column="28" TopLine="120"/>
</Position29>
<Position30>
<Filename Value="bmprgbtypes.pas"/>
<Caret Line="603" Column="18" TopLine="589"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectOptions> </ProjectOptions>