diff --git a/packages/fcl-image/src/fppalette.inc b/packages/fcl-image/src/fppalette.inc index fbcde56a58..2a842e8bb2 100644 --- a/packages/fcl-image/src/fppalette.inc +++ b/packages/fcl-image/src/fppalette.inc @@ -38,8 +38,8 @@ begin if (Img.Palette <> self) then begin Count := 0; - for x := 0 to img.width-1 do - for y := 0 to img.height-1 do + for y := 0 to img.height-1 do + for x := 0 to img.width-1 do IndexOf(img[x,y]); end; end; diff --git a/packages/fcl-pdf/src/fppdf.pp b/packages/fcl-pdf/src/fppdf.pp index d481948c36..a79c491fad 100644 --- a/packages/fcl-pdf/src/fppdf.pp +++ b/packages/fcl-pdf/src/fppdf.pp @@ -3154,8 +3154,8 @@ begin if not Result then Exit; - for x := 0 to Image.Width-1 do - for y := 0 to Image.Height-1 do + for y := 0 to Image.Height-1 do + for x := 0 to Image.Width-1 do if Image.Colors[x, y] <> AImage.Colors[x, y] then begin Result := False; diff --git a/packages/fcl-report/src/fpreport.pp b/packages/fcl-report/src/fpreport.pp index 5945f0f924..849c7fe3ed 100644 --- a/packages/fcl-report/src/fpreport.pp +++ b/packages/fcl-report/src/fpreport.pp @@ -9967,8 +9967,8 @@ var x, y: Integer; begin Result := True; - for x := 0 to Image.Width-1 do - for y := 0 to Image.Height-1 do + for y := 0 to Image.Height-1 do + for x := 0 to Image.Width-1 do if Image.Pixels[x, y] <> AImage.Pixels[x, y] then begin Result := False; diff --git a/packages/fcl-report/src/fpreportfpimageexport.pp b/packages/fcl-report/src/fpreportfpimageexport.pp index 6ae3643c09..97af82df2c 100644 --- a/packages/fcl-report/src/fpreportfpimageexport.pp +++ b/packages/fcl-report/src/fpreportfpimageexport.pp @@ -172,19 +172,21 @@ type procedure TFPImageFriend.ReversePixelColorOrder; var - x, y: UInt32; + p, x, y: UInt32; v: TFPCompactImgRGBA8BitValue; n: TFPCompactImgRGBA8BitValue; + begin - for x := 0 to Width-1 do - for y := 0 to Height-1 do + for y := 0 to Height-1 do + for x := 0 to Width-1 do begin - v := FData[x+y*Width]; + p:=x+y*Width; + v := FData[p]; n.b := v.r; n.g := v.g; n.r := v.b; n.a := v.a; - FData[x+y*Width] := n; + FData[p] := n; end; end;