Changeset 206 for GraphicTest/UDrawMethod.pas

Timestamp:

Mar 18, 2011, 9:34:42 AM (14 years ago)

Author:

george

Message:

• Fixed: Red and Blue color components swaping.
• Fixed: PageControl tabs auto switching.
• Modified: TFastBitmap class replaced by similar one which use pixels data as one memory block instead of array of arrays. With only one memory block optimization using FillChar and Move can be used.

File:

• GraphicTest/UDrawMethod.pas (modified) (13 diffs)

GraphicTest/UDrawMethod.pas

@@ -11 +11 @@
 
 type
+  TPaintObject = (poImage, poPaintBox, poOpenGL);
 
   { TDrawMethod }
@@ -25 +26 @@
     Terminated: Boolean;
     FrameDuration: TDateTime;
+    PaintObject: TPaintObject;
     constructor Create; virtual;
     destructor Destroy; override;
@@ -113 +115 @@
   Caption := 'TBGRABitmap PaintBox';
   BGRABitmap := TBGRABitmap.Create(0, 0);
+  PaintObject := poPaintBox;
 end;
 
@@ -124 +127 @@
 var
   X, Y: Integer;
-  P: PBGRAPixel;
+  P: PInteger;
 begin
   with FastBitmap do
   for Y := 0 to Size.Y - 1 do begin
-    P := BGRABitmap.ScanLine[Y];
+    P := PInteger(BGRABitmap.ScanLine[Y]);
     for X := 0 to Size.X - 1 do begin
-      P^.red := Pixels[X, Y];
+      P^ := NoSwapBRComponent(Pixels[X, Y]);
+      (*P^.red := Pixels[X, Y];
       P^.green := Pixels[X, Y];
       P^.blue := Pixels[X, Y];
-      P^.alpha := 255;
+      P^.alpha := 255; *)
       Inc(P);
     end;
   end;
-  BGRABitmap.InvalidateBitmap; // changed by direct access
-  //BGRABitmap.Draw(Bitmap.Canvas, 0, 0, False);
+  //BGRABitmap.InvalidateBitmap; // changed by direct access
+  //BGRABitmap.Draw(Bitmap.Canvas, 0, 0, True);
   BGRABitmap.Draw(PaintBox.Canvas, 0, 0, True);
+//  Bitmap.RawImage.Ass
 end;
 
@@ -148 +153 @@
   inherited;
   Caption := 'TBitmap.RawImage.Data PaintBox';
+  PaintObject := poPaintBox;
 end;
 
@@ -154 +160 @@
   Y, X: Integer;
   PixelPtr: PInteger;
+  RowPtr: PInteger;
   P: TPixelFormat;
   RawImage: TRawImage;
   BytePerPixel: Integer;
+  BytePerRow: Integer;
   hPaint, hBmp: HDC;
 begin
@@ -164 +172 @@
       TempBitmap.BeginUpdate(False);
       RawImage := TempBitmap.RawImage;
-      PixelPtr := PInteger(RawImage.Data);
+      RowPtr := PInteger(RawImage.Data);
       BytePerPixel := RawImage.Description.BitsPerPixel div 8;
-      for X := 0 to Size.X - 1 do
-        for Y := 0 to Size.Y - 1 do begin
-          PixelPtr^ := Pixels[X, Y] * $010101;
+      BytePerRow := RawImage.Description.BytesPerLine;
+      for Y := 0 to Size.Y - 1 do begin
+        PixelPtr := RowPtr;
+        for X := 0 to Size.X - 1 do begin
+          PixelPtr^ := Pixels[X, Y];
           Inc(PByte(PixelPtr), BytePerPixel);
         end;
+        Inc(PByte(RowPtr), BytePerRow);
+      end;
     finally
       TempBitmap.EndUpdate(False);
@@ -190 +202 @@
 
 procedure TBitmapRawImageData.DrawFrame(FastBitmap: TFastBitmap);
+type
+  TFastBitmapPixelComponents = packed record
+  end;
 var
   Y, X: Integer;
@@ -210 +225 @@
         PixelPtr := RowPtr;
         for X := 0 to Size.X - 1 do begin
-          PixelPtr^ := Pixels[X, Y] * $010101;
+          PixelPtr^ := Pixels[X, Y];
           Inc(PByte(PixelPtr), BytePerPixel);
         end;
@@ -248 +263 @@
     for X := 0 to Size.X - 1 do
       for Y := 0 to Size.Y - 1 do
-        TempIntfImage.Colors[X, Y] := TColorToFPColor(Pixels[X, Y] * $010101);
+        TempIntfImage.Colors[X, Y] := TColorToFPColor(SwapBRComponent(Pixels[X, Y]));
     Bitmap.LoadFromIntfImage(TempIntfImage);
   end;
@@ -277 +292 @@
     for X := 0 to Size.X - 1 do
       for Y := 0 to Size.Y - 1 do
-        TempIntfImage.Colors[X, Y] := TColorToFPColor(Pixels[X, Y] * $010101);
+        TempIntfImage.Colors[X, Y] := TColorToFPColor(SwapBRComponent(Pixels[X, Y]));
     Bitmap.LoadFromIntfImage(TempIntfImage);
   end;
@@ -299 +314 @@
     for X := 0 to Size.X - 1 do
       for Y := 0 to Size.Y - 1 do
-        Bitmap.Canvas.Pixels[X, Y] := Pixels[X, Y] * $010101;
+        Bitmap.Canvas.Pixels[X, Y] := SwapBRComponent(Pixels[X, Y]);
   finally
     Bitmap.EndUpdate(False);
@@ -320 +335 @@
     for X := 0 to Size.X - 1 do
       for Y := 0 to Size.Y - 1 do
-        Bitmap.Canvas.Pixels[X, Y] := Pixels[X, Y] * $010101;
+        Bitmap.Canvas.Pixels[X, Y] := SwapBRComponent(Pixels[X, Y]);
   end;
 end;