Changeset 203

Timestamp:

Mar 17, 2011, 9:49:34 AM (14 years ago)

Author:

george

Message:

• Fixed: RawImage.Data row address calculation.

Location:

GraphicTest

Files:

• GraphicTest.lpi (modified) (4 diffs)
• UDrawMethod.pas (modified) (2 diffs)

GraphicTest/GraphicTest.lpi

@@ -55 +55 @@
         <ResourceBaseClass Value="Form"/>
         <UnitName Value="UMainForm"/>
-        <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="107"/>
-        <CursorPos X="1" Y="122"/>
+        <TopLine Value="1"/>
+        <CursorPos X="27" Y="38"/>
         <UsageCount Value="32"/>
         <Loaded Value="True"/>
@@ -182 +181 @@
         <IsPartOfProject Value="True"/>
         <UnitName Value="UDrawMethod"/>
+        <IsVisibleTab Value="True"/>
         <EditorIndex Value="6"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="33" Y="15"/>
+        <TopLine Value="196"/>
+        <CursorPos X="10" Y="206"/>
         <UsageCount Value="26"/>
         <Loaded Value="True"/>
@@ -236 +236 @@
         <TopLine Value="584"/>
         <CursorPos X="3" Y="597"/>
-        <UsageCount Value="10"/>
+        <UsageCount Value="11"/>
         <Loaded Value="True"/>
       </Unit22>
@@ -392 +392 @@
       <Position29>
         <Filename Value="UDrawMethod.pas"/>
-        <Caret Line="179" Column="22" TopLine="164"/>
+        <Caret Line="211" Column="28" TopLine="196"/>
       </Position29>
     </JumpHistory>

GraphicTest/UDrawMethod.pas

@@ -193 +193 @@
   Y, X: Integer;
   PixelPtr: PInteger;
+  RowPtr: PInteger;
   P: TPixelFormat;
   RawImage: TRawImage;
   BytePerPixel: Integer;
+  BytePerRow: Integer;
 begin
   P := Bitmap.PixelFormat;
@@ -202 +204 @@
       Bitmap.BeginUpdate(False);
       RawImage := Bitmap.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
+      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] * $010101;
           Inc(PByte(PixelPtr), BytePerPixel);
         end;
+        Inc(PByte(RowPtr), BytePerRow);
+      end;
     finally
       Bitmap.EndUpdate(False);