[G32-commits] SF.net SVN: graphics32:[1392] trunk/Source/GR32_Resamplers.pas

[<and...@us...>]

Revision: 1392
          http://graphics32.svn.sourceforge.net/graphics32/?rev=1392&view=rev
Author:   andersmelander
Date:     2011-06-30 18:23:08 +0000 (Thu, 30 Jun 2011)

Log Message:
-----------
Modified BlockTransfer and BlockTransferX to invalidate same rect regardless of MeasuringMode.

Modified Paths:
--------------
    trunk/Source/GR32_Resamplers.pas

Modified: trunk/Source/GR32_Resamplers.pas
===================================================================
--- trunk/Source/GR32_Resamplers.pas	2011-06-30 16:14:12 UTC (rev 1391)
+++ trunk/Source/GR32_Resamplers.pas	2011-06-30 18:23:08 UTC (rev 1392)
@@ -847,29 +847,32 @@
   SrcWidth := SrcRect.Right - SrcRect.Left;
   SrcHeight := SrcRect.Bottom - SrcRect.Top;
 
-  if not Dst.MeasuringMode then
-  begin
-    if (CombineOp = dmCustom) and not Assigned(CombineCallBack) then
-      CombineOp := dmOpaque;
+  SrcX := SrcRect.Left;
+  SrcY := SrcRect.Top;
 
-    SrcX := SrcRect.Left;
-    SrcY := SrcRect.Top;
+  IntersectRect(DstClip, DstClip, Dst.BoundsRect);
+  IntersectRect(SrcRect, SrcRect, Src.BoundsRect);
 
-    IntersectRect(DstClip, DstClip, Dst.BoundsRect);
-    IntersectRect(SrcRect, SrcRect, Src.BoundsRect);
+  OffsetRect(SrcRect, DstX - SrcX, DstY - SrcY);
+  IntersectRect(SrcRect, DstClip, SrcRect);
+  if IsRectEmpty(SrcRect) then
+    exit;
 
-    OffsetRect(SrcRect, DstX - SrcX, DstY - SrcY);
-    IntersectRect(SrcRect, DstClip, SrcRect);
-    DstClip := SrcRect;
-    OffsetRect(SrcRect, SrcX - DstX, SrcY - DstY);
+  DstClip := SrcRect;
+  OffsetRect(SrcRect, SrcX - DstX, SrcY - DstY);
 
-    if not IsRectEmpty(SrcRect) then
-      try
-        BlendBlock(Dst, DstClip, Src, SrcRect.Left, SrcRect.Top, CombineOp, CombineCallBack);
-      finally
-        EMMS;
-      end;
+  if not Dst.MeasuringMode then
+  begin
+    try
+      if (CombineOp = dmCustom) and not Assigned(CombineCallBack) then
+        CombineOp := dmOpaque;
+
+      BlendBlock(Dst, DstClip, Src, SrcRect.Left, SrcRect.Top, CombineOp, CombineCallBack);
+    finally
+      EMMS;
+    end;
   end;
+
   Dst.Changed(DstClip);
 end;
 
@@ -900,47 +903,47 @@
   SrcRectW := SrcRect.Right - SrcRect.Left - 1;
   SrcRectH := SrcRect.Bottom - SrcRect.Top - 1;
 
-  if not Dst.MeasuringMode then
-  begin
-    FracX := (DstX and $FFFF) shr 8;
-    FracY := (DstY and $FFFF) shr 8;
+  FracX := (DstX and $FFFF) shr 8;
+  FracY := (DstY and $FFFF) shr 8;
 
-    DstX := DstX div $10000;
-    DstY := DstY div $10000;
+  DstX := DstX div $10000;
+  DstY := DstY div $10000;
 
-    DstW := Dst.Width;
-    DstH := Dst.Height;
+  DstW := Dst.Width;
+  DstH := Dst.Height;
 
-    MA := Src.MasterAlpha;
+  MA := Src.MasterAlpha;
 
-    if (DstX >= DstW) or (DstY >= DstH) or (MA = 0) then Exit;
+  if (DstX >= DstW) or (DstY >= DstH) or (MA = 0) then Exit;
 
-    if (DstX + SrcRectW <= 0) or (Dsty + SrcRectH <= 0) then Exit;
+  if (DstX + SrcRectW <= 0) or (Dsty + SrcRectH <= 0) then Exit;
 
-    if DstX < 0 then LW := $FF else LW := FracX xor $FF;
-    if DstY < 0 then TW := $FF else TW := FracY xor $FF;
-    if DstX + SrcRectW >= DstW then RW := $FF else RW := FracX;
-    if DstY + SrcRectH >= DstH then BW := $FF else BW := FracY;
+  if DstX < 0 then LW := $FF else LW := FracX xor $FF;
+  if DstY < 0 then TW := $FF else TW := FracY xor $FF;
+  if DstX + SrcRectW >= DstW then RW := $FF else RW := FracX;
+  if DstY + SrcRectH >= DstH then BW := $FF else BW := FracY;
 
-    DstBounds := Dst.BoundsRect;
-    Dec(DstBounds.Right);
-    Dec(DstBounds.Bottom);
-    OffsetRect(DstBounds, SrcRect.Left - DstX, SrcRect.Top - DstY);
-    IntersectRect(SrcRect, SrcRect, DstBounds);
+  DstBounds := Dst.BoundsRect;
+  Dec(DstBounds.Right);
+  Dec(DstBounds.Bottom);
+  OffsetRect(DstBounds, SrcRect.Left - DstX, SrcRect.Top - DstY);
+  IntersectRect(SrcRect, SrcRect, DstBounds);
 
-    if IsRectEmpty(SrcRect) then Exit;
+  if IsRectEmpty(SrcRect) then Exit;
 
-    SrcW := Src.Width;
+  SrcW := Src.Width;
 
-    SrcRectW := SrcRect.Right - SrcRect.Left;
-    SrcRectH := SrcRect.Bottom - SrcRect.Top;
+  SrcRectW := SrcRect.Right - SrcRect.Left;
+  SrcRectH := SrcRect.Bottom - SrcRect.Top;
 
+  if DstX < 0 then DstX := 0;
+  if DstY < 0 then DstY := 0;
+
+  if not Dst.MeasuringMode then
+  begin
     SetLength(Buffer[0], SrcRectW + 1);
     SetLength(Buffer[1], SrcRectW + 1);
 
-    if DstX < 0 then DstX := 0;
-    if DstY < 0 then DstY := 0;
-
     BlendLineEx := BLEND_LINE_EX[Src.CombineMode]^;
     BlendMemEx := BLEND_MEM_EX[Src.CombineMode]^;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.