Changeset 573


Ignore:
Timestamp:
Jun 25, 2024, 10:49:43 AM (4 months ago)
Author:
chronos
Message:
  • Modified: Build with Lazarus 3.4.
  • Modified: Removed U prefix from unit names.
Location:
GraphicTest
Files:
5 edited
21 moved

Legend:

Unmodified
Added
Removed

  • GraphicTest/DrawMethod.pas

    r572 r573  
    1 unit UDrawMethod;
    2 
    3 {$mode delphi}{$H+}
     1unit DrawMethod;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, ExtCtrls, UPlatform, UFastBitmap, Graphics, Controls,
     6  Classes, SysUtils, ExtCtrls, Platform, FastBitmap, Graphics, Controls,
    97  LCLType, IntfGraphics, fpImage, GraphType, DateUtils, Forms,
    108  {$IFDEF OPENGL}GL, GLExt, OpenGLContext,{$ENDIF}
    … …  
    1311type
    1412  TPaintObject = (poImage, poPaintBox, poOpenGL, poCanvas);
    15 
    1613
    1714  { TDrawMethod }
    … …  
    9895procedure TDrawMethodCanvas.UpdateSettings;
    9996begin
    100   inherited UpdateSettings;
     97  inherited;
    10198end;
    10299
    … …  
    109106procedure TDrawMethodCanvas.Done;
    110107begin
    111   inherited Done;
    112 end;
    113 
     108  inherited;
     109end;
    114110
    115111{ TDrawMethodPaintBox }
    … …  
    117113procedure TDrawMethodPaintBox.Paint(Sender: TObject);
    118114begin
    119 
    120115end;
    121116
    122117procedure TDrawMethodPaintBox.UpdateSettings;
    123118begin
    124   inherited UpdateSettings;
     119  inherited;
    125120  PaintBox.ControlStyle := FParent.ControlStyle;
    126121end;
    … …  
    140135begin
    141136  FreeAndNil(PaintBox);
    142   inherited Done;
     137  inherited;
    143138end;
    144139
    … …  
    166161begin
    167162  FreeAndNil(Image);
    168   inherited Done;
    169 end;
    170 
     163  inherited;
     164end;
    171165
    172166{$IFDEF OPENGL}
    … …  
    204198procedure TDrawMethodOpenGL.UpdateSettings;
    205199begin
    206   inherited UpdateSettings;
     200  inherited;
    207201  OpenGLControl.ControlStyle := FParent.ControlStyle;
    208202end;
    … …  
    230224{$ENDIF}
    231225
    232 
    233226{ TDrawMethod }
    234227
    … …  
    253246procedure TDrawMethod.Done;
    254247begin
    255 
    256248end;
    257249
    … …  
    269261procedure TDrawMethod.DrawFrame(FastBitmap: TFastBitmap);
    270262begin
    271 
    272263end;
    273264

  • GraphicTest/FastBitmap.pas

    r572 r573  
    1 unit UFastBitmap;
    2 
    3 {$mode objfpc}{$H+}
     1unit FastBitmap;
    42
    53interface
    … …  
    7371function NoSwapBRComponent(Value: Cardinal): Cardinal; inline;
    7472
     73
    7574implementation
    7675
    … …  
    109108begin
    110109  FreeMem(FPixelsData);
    111   inherited Destroy;
     110  inherited;
    112111end;
    113112
    … …  
    143142function TFastBitmap3.GetPixelAddress(X, Y: Integer): PFastBitmapPixel;
    144143begin
    145   Result := PFastBitmapPixel(FPixelsData) + Y * FSize.X + X;
     144  Result := PFastBitmapPixel(FPixelsData + Y * FSize.X + X);
    146145end;
    147146
    … …  
    201200begin
    202201  FreeMem(FPixelsData);
    203   inherited Destroy;
     202  inherited;
    204203end;
    205204
    … …  
    227226end;
    228227
    229 
    230228end.
    231229

  • GraphicTest/Forms/FormDraw.pas

    r572 r573  
    1 unit UFormDraw;
    2 
    3 {$mode delphi}
     1unit FormDraw;
    42
    53interface
    … …  
    2321  end;
    2422
    25 var
    26   FormDraw: TFormDraw;
    2723
    2824implementation
    … …  
    3834begin
    3935  if EraseBackgroundEnabled then
    40     inherited EraseBackground(DC);
     36    inherited;
    4137end;
    4238
    4339initialization
    44   {$I UFormDraw.lrs}
     40  {$I FormDraw.lrs}
    4541
    4642end.

  • GraphicTest/Forms/FormMain.pas

    r572 r573  
    1 unit UFormMain;
    2 
    3 {$mode delphi}{$H+}
     1unit FormMain;
    42
    53interface
    … …  
    75uses
    86  Classes, SysUtils, LazFileUtils, SynHighlighterPas, SynMemo, Forms, Controls,
    9   Graphics, Dialogs, ComCtrls, ExtCtrls, StdCtrls, DateUtils, UPlatform,
     7  Graphics, Dialogs, ComCtrls, ExtCtrls, StdCtrls, DateUtils, Platform,
    108  LCLType, IntfGraphics, fpImage, Math, GraphType, Contnrs, LclIntf, Spin,
    11   ActnList, Menus, StdActns, UFastBitmap, UDrawMethod, typinfo;
     9  ActnList, Menus, StdActns, FastBitmap, DrawMethod, TypInfo, FormDraw;
    1210
    1311const
    … …  
    107105    Scenes: TObjectList; // TObjectList<TFastBitmap>
    108106    SceneIndex: Integer;
     107    FormDraw: TFormDraw;
    109108    property CurrentMethod: TDrawMethod read FCurrentMethod;
    110109  end;
    … …  
    113112  FormMain: TFormMain;
    114113
     114
    115115implementation
    116116
    … …  
    118118
    119119uses
    120   UFormDraw, UMethodLazIntfImageColorsCopy, UMethodLazIntfImageColorsNoCopy, UMethodCanvasPixels,
    121   UMethodCanvasPixelsUpdateLock, UMethodBGRABitmap, UMethodBitmapRawImageDataPaintBox,
    122   UMethodBitmapRawImageData, UMethodBitmapRawImageDataMove, UMethodDummy, UMethodOpenGL,
    123   UMethodOpenGLPBO{$IFDEF GRAPHICS32}, UGraphics32Method{$ENDIF},
    124   UMethodBitmapScanline, UMethodMove;
     120  MethodLazIntfImageColorsCopy, MethodLazIntfImageColorsNoCopy,
     121  MethodCanvasPixels, MethodCanvasPixelsUpdateLock, MethodBGRABitmap,
     122  MethodBitmapRawImageDataPaintBox, MethodBitmapRawImageData,
     123  MethodBitmapRawImageDataMove, MethodDummy, MethodOpenGL,
     124  MethodOpenGLPBO{$IFDEF GRAPHICS32}, UGraphics32Method{$ENDIF},
     125  MethodBitmapScanline, MethodMove;
    125126
    126127{ TFormMain }
    … …  
    132133  PF: TPixelFormat;
    133134begin
     135  FormDraw := TFormDraw.Create(nil);
     136
    134137  Scenes := TObjectList.Create;
    135138
    … …  
    294297  FreeAndNil(DrawMethods);
    295298  FreeAndNil(Scenes);
     299  FreeAndNil(FormDraw);
    296300end;
    297301

  • GraphicTest/GraphicTest.lpi

    r543 r573  
    22<CONFIG>
    33  <ProjectOptions>
    4     <Version Value="11"/>
     4    <Version Value="12"/>
    55    <General>
     6      <Flags>
     7        <CompatibilityMode Value="True"/>
     8      </Flags>
    69      <SessionStorage Value="InProjectDir"/>
    7       <MainUnit Value="0"/>
    810      <Scaled Value="True"/>
    911      <UseXPManifest Value="True"/>
    … …  
    3133              <CStyleOperator Value="False"/>
    3234              <AllowLabel Value="False"/>
     35              <UseAnsiStrings Value="False"/>
    3336              <CPPInline Value="False"/>
    34               <UseAnsiStrings Value="False"/>
    3537            </SyntaxOptions>
    3638          </Parsing>
    … …  
    9597      </Unit0>
    9698      <Unit1>
    97         <Filename Value="Forms/UFormMain.pas"/>
     99        <Filename Value="Forms/FormMain.pas"/>
    98100        <IsPartOfProject Value="True"/>
    99101        <ComponentName Value="FormMain"/>
    … …  
    102104      </Unit1>
    103105      <Unit2>
    104         <Filename Value="UPlatform.pas"/>
     106        <Filename Value="Platform.pas"/>
    105107        <IsPartOfProject Value="True"/>
    106108      </Unit2>
    107109      <Unit3>
    108         <Filename Value="UDrawMethod.pas"/>
     110        <Filename Value="DrawMethod.pas"/>
    109111        <IsPartOfProject Value="True"/>
    110112      </Unit3>
    111113      <Unit4>
    112         <Filename Value="UFastBitmap.pas"/>
     114        <Filename Value="FastBitmap.pas"/>
    113115        <IsPartOfProject Value="True"/>
    114116      </Unit4>
    115117      <Unit5>
    116         <Filename Value="Forms/UFormDraw.pas"/>
     118        <Filename Value="Forms/FormDraw.pas"/>
    117119        <IsPartOfProject Value="True"/>
    118120        <ComponentName Value="FormDraw"/>
    … …  
    121123      </Unit5>
    122124      <Unit6>
    123         <Filename Value="Methods/UMethodCanvasPixels.pas"/>
     125        <Filename Value="Methods/MethodCanvasPixels.pas"/>
    124126        <IsPartOfProject Value="True"/>
    125127      </Unit6>
    126128      <Unit7>
    127         <Filename Value="Methods/UMethodCanvasPixelsUpdateLock.pas"/>
     129        <Filename Value="Methods/MethodCanvasPixelsUpdateLock.pas"/>
    128130        <IsPartOfProject Value="True"/>
    129131      </Unit7>
    130132      <Unit8>
    131         <Filename Value="Methods/UMethodLazIntfImageColorsCopy.pas"/>
     133        <Filename Value="Methods/MethodLazIntfImageColorsCopy.pas"/>
    132134        <IsPartOfProject Value="True"/>
    133135      </Unit8>
    134136      <Unit9>
    135         <Filename Value="Methods/UMethodLazIntfImageColorsNoCopy.pas"/>
     137        <Filename Value="Methods/MethodLazIntfImageColorsNoCopy.pas"/>
    136138        <IsPartOfProject Value="True"/>
    137139      </Unit9>
    138140      <Unit10>
    139         <Filename Value="Methods/UMethodBGRABitmap.pas"/>
     141        <Filename Value="Methods/MethodBGRABitmap.pas"/>
    140142        <IsPartOfProject Value="True"/>
    141143      </Unit10>
    142144      <Unit11>
    143         <Filename Value="Methods/UMethodBitmapRawImageDataPaintBox.pas"/>
     145        <Filename Value="Methods/MethodBitmapRawImageDataPaintBox.pas"/>
    144146        <IsPartOfProject Value="True"/>
    145147      </Unit11>
    146148      <Unit12>
    147         <Filename Value="Methods/UMethodBitmapRawImageData.pas"/>
     149        <Filename Value="Methods/MethodBitmapRawImageData.pas"/>
    148150        <IsPartOfProject Value="True"/>
    149151      </Unit12>
    150152      <Unit13>
    151         <Filename Value="Methods/UMethodDummy.pas"/>
     153        <Filename Value="Methods/MethodDummy.pas"/>
    152154        <IsPartOfProject Value="True"/>
    153155      </Unit13>
    154156      <Unit14>
    155         <Filename Value="Methods/UMethodBitmapRawImageDataMove.pas"/>
     157        <Filename Value="Methods/MethodBitmapRawImageDataMove.pas"/>
    156158        <IsPartOfProject Value="True"/>
    157159      </Unit14>
    158160      <Unit15>
    159         <Filename Value="Methods/UMethodOpenGL.pas"/>
     161        <Filename Value="Methods/MethodOpenGL.pas"/>
    160162        <IsPartOfProject Value="True"/>
    161163      </Unit15>
    162164      <Unit16>
    163         <Filename Value="Methods/UMethodOpenGLPBO.pas"/>
     165        <Filename Value="Methods/MethodOpenGLPBO.pas"/>
    164166        <IsPartOfProject Value="True"/>
    165167      </Unit16>
    166168      <Unit17>
    167         <Filename Value="Methods/UMethodGraphics32.pas"/>
     169        <Filename Value="Methods/MethodGraphics32.pas"/>
    168170        <IsPartOfProject Value="True"/>
    169171      </Unit17>
    170172      <Unit18>
    171         <Filename Value="Methods/UMethodBitmapScanline.pas"/>
     173        <Filename Value="Methods/MethodBitmapScanline.pas"/>
    172174        <IsPartOfProject Value="True"/>
    173175      </Unit18>
    174176      <Unit19>
    175         <Filename Value="Methods/UMethodMove.pas"/>
     177        <Filename Value="Methods/MethodMove.pas"/>
    176178        <IsPartOfProject Value="True"/>
    177179      </Unit19>
    … …  
    194196        <IncludeAssertionCode Value="True"/>
    195197        <AllowLabel Value="False"/>
     198        <UseAnsiStrings Value="False"/>
    196199        <CPPInline Value="False"/>
    197         <UseAnsiStrings Value="False"/>
    198200      </SyntaxOptions>
    199201    </Parsing>
    … …  
    209211    <Linking>
    210212      <Debugging>
     213        <DebugInfoType Value="dsDwarf3"/>
    211214        <UseHeaptrc Value="True"/>
    212215      </Debugging>

  • GraphicTest/GraphicTest.lpr

    r543 r573  
    11program GraphicTest;
    2 
    3 {$mode objfpc}{$H+}
    42
    53uses
    … …  
    86  {$ENDIF}{$ENDIF}
    97  Interfaces, // this includes the LCL widgetset
    10   Forms, SysUtils, openglcontext, UFormMain, UPlatform, UDrawMethod,
    11   UFastBitmap, UFormDraw, bgrabitmappack, UMethodCanvasPixels,
    12   UMethodCanvasPixelsUpdateLock, UMethodLazIntfImageColorsCopy, UMethodLazIntfImageColorsNoCopy,
    13   UMethodBGRABitmap, UMethodBitmapRawImageDataPaintBox, UMethodBitmapRawImageData,
    14   UMethodDummy, UMethodBitmapRawImageDataMove, UMethodOpenGL, UMethodOpenGLPBO,
    15   UMethodGraphics32, UMethodBitmapScanline;
     8  Forms, SysUtils, openglcontext, FormMain, Platform, DrawMethod,
     9  FastBitmap, FormDraw, bgrabitmappack, MethodCanvasPixels,
     10  MethodCanvasPixelsUpdateLock, MethodLazIntfImageColorsCopy, MethodLazIntfImageColorsNoCopy,
     11  MethodBGRABitmap, MethodBitmapRawImageDataPaintBox, MethodBitmapRawImageData,
     12  MethodDummy, MethodBitmapRawImageDataMove, MethodOpenGL, MethodOpenGLPBO,
     13  MethodGraphics32, MethodBitmapScanline;
    1614
    1715{$R *.res}
    … …  
    3028
    3129  RequireDerivedFormResource := True;
     30  Application.Title:='';
    3231  Application.Scaled:=True;
    3332  Application.Initialize;
    34   Application.CreateForm(TFormMain, FormMain);
    35   Application.CreateForm(TFormDraw, FormDraw);
     33  Application.CreateForm(TFormMain, FormMain.FormMain);
    3634  Application.Run;
    3735end.

  • GraphicTest/Methods/MethodBGRABitmap.pas

    r572 r573  
    1 unit UMethodBGRABitmap;
    2 
    3 {$mode delphi}
     1unit MethodBGRABitmap;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap, BGRABitmap, BGRABitmapTypes,
     6  Classes, SysUtils, DrawMethod, FastBitmap, BGRABitmap, BGRABitmapTypes,
    97  Controls, Graphics;
    108
    … …  
    4442begin
    4543  BGRABitmap.Free;
    46   inherited Destroy;
     44  inherited;
    4745end;
    4846
    … …  
    6462end;
    6563
    66 
    6764end.
    6865

  • GraphicTest/Methods/MethodBitmapRawImageData.pas

    r572 r573  
    1 unit UMethodBitmapRawImageData;
    2 
    3 {$mode delphi}
     1unit MethodBitmapRawImageData;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap, Graphics, GraphType;
     6  Classes, SysUtils, DrawMethod, FastBitmap, Graphics, GraphType;
    97
    108type
    … …  
    6058end;
    6159
    62 
    6360end.
    6461

  • GraphicTest/Methods/MethodBitmapRawImageDataMove.pas

    r572 r573  
    1 unit UMethodBitmapRawImageDataMove;
    2 
    3 {$mode delphi}
     1unit MethodBitmapRawImageDataMove;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap, Graphics, GraphType;
     6  Classes, SysUtils, DrawMethod, FastBitmap, Graphics, GraphType;
    97
    108type
    … …  
    4846end;
    4947
    50 
    5148end.
    5249

  • GraphicTest/Methods/MethodBitmapRawImageDataPaintBox.pas

    r572 r573  
    1 unit UMethodBitmapRawImageDataPaintBox;
    2 
    3 {$mode delphi}
     1unit MethodBitmapRawImageDataPaintBox;
    42
    53interface
    64
    75uses
    8   {$IFDEF windows}Windows,{$ENDIF}Classes, SysUtils, Controls, UDrawMethod, UFastBitmap, Graphics, LCLType,
    9   FPimage, IntfGraphics, GraphType;
     6  {$IFDEF windows}Windows,{$ENDIF}Classes, SysUtils, Controls, DrawMethod,
     7  FastBitmap, Graphics, LCLType, FPimage, IntfGraphics, GraphType;
    108
    119type
    … …  
    4745begin
    4846  FreeAndNil(TempBitmap);
    49   inherited Done;
     47  inherited;
    5048end;
    5149
    … …  
    9492end;
    9593
    96 
    9794end.
    9895

  • GraphicTest/Methods/MethodBitmapScanline.pas

    r572 r573  
    1 unit UMethodBitmapScanline;
    2 
    3 {$mode delphi}
     1unit MethodBitmapScanline;
    42
    53interface
    64
    75uses
    8   LCLIntf, LCLType, Classes, SysUtils, UDrawMethod, UFastBitmap, Controls, Graphics;
     6  LCLIntf, LCLType, Classes, SysUtils, DrawMethod, FastBitmap, Controls, Graphics;
    97
    108type

  • GraphicTest/Methods/MethodCanvasPixels.pas

    r572 r573  
    1 unit UMethodCanvasPixels;
    2 
    3 {$mode delphi}
     1unit MethodCanvasPixels;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap, Graphics;
     6  Classes, SysUtils, DrawMethod, FastBitmap, Graphics;
    97
    108type
    … …  
    4139end;
    4240
    43 
    4441end.
    4542

  • GraphicTest/Methods/MethodCanvasPixelsUpdateLock.pas

    r572 r573  
    1 unit UMethodCanvasPixelsUpdateLock;
    2 
    3 {$mode delphi}
     1unit MethodCanvasPixelsUpdateLock;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap, Graphics;
     6  Classes, SysUtils, DrawMethod, FastBitmap, Graphics;
    97
    108type
    … …  
    4543end;
    4644
    47 
    4845end.
    4946

  • GraphicTest/Methods/MethodDummy.pas

    r572 r573  
    1 unit UMethodDummy;
    2 
    3 {$mode delphi}
     1unit MethodDummy;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap;
     6  Classes, SysUtils, DrawMethod, FastBitmap;
    97
    108type
    … …  
    2321constructor TMethodDummy.Create;
    2422begin
    25   inherited Create;
     23  inherited;
    2624  Caption := 'Dummy';
    2725  Description.Add('This method doesn''t draw anything. It''s purpose is to measure ' +
    … …  
    3331end;
    3432
    35 
    3633end.
    3734

  • GraphicTest/Methods/MethodGraphics32.pas

    r572 r573  
    1 unit UMethodGraphics32;
    2 
    3 {$mode delphi}
     1unit MethodGraphics32;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UFastBitmap, UDrawMethod,
     6  Classes, SysUtils, FastBitmap, DrawMethod,
    97  {$IFDEF GRAPHICS32}GR32, GR32_Image,{$ENDIF}
    108  Controls, Graphics;
    … …  
    3129constructor TMethodGraphics32.Create;
    3230begin
    33   inherited Create;
     31  inherited;
    3432  Caption := 'TGR32Image';
    3533  Description.Add('Graphics32 is well implemented highly optimized Delphi graphic ' +
    … …  
    4644destructor TMethodGraphics32.Destroy;
    4745begin
    48   inherited Destroy;
     46  inherited;
    4947end;
    5048
    … …  
    9290begin
    9391  FreeAndNil(Image);
    94   inherited Done;
     92  inherited;
    9593end;
    9694

  • GraphicTest/Methods/MethodLazIntfImageColorsCopy.pas

    r572 r573  
    1 unit UMethodLazIntfImageColorsCopy;
    2 
    3 {$mode delphi}
     1unit MethodLazIntfImageColorsCopy;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap, IntfGraphics, GraphType,
     6  Classes, SysUtils, DrawMethod, FastBitmap, IntfGraphics, GraphType,
    97  fpImage, Graphics;
    108
    … …  
    3331destructor TMethodLazIntfImageColorsCopy.Destroy;
    3432begin
    35   inherited Destroy;
     33  inherited;
    3634end;
    3735
    … …  
    5351end;
    5452
    55 
    5653end.
    5754

  • GraphicTest/Methods/MethodLazIntfImageColorsNoCopy.pas

    r572 r573  
    1 unit UMethodLazIntfImageColorsNoCopy;
    2 
    3 {$mode delphi}
     1unit MethodLazIntfImageColorsNoCopy;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap, IntfGraphics, Graphics, Controls;
     6  Classes, SysUtils, DrawMethod, FastBitmap, IntfGraphics, Graphics, Controls;
    97
    108type
    … …  
    4240begin
    4341  TempIntfImage.Free;
    44   inherited Destroy;
     42  inherited;
    4543end;
    4644
    … …  
    5755end;
    5856
    59 
    6057end.
    6158

  • GraphicTest/Methods/MethodMove.pas

    r572 r573  
    1 unit UMethodMove;
    2 
    3 {$mode delphi}
     1unit MethodMove;
    42
    53interface
    64
    75uses
    8   LCLIntf, LCLType, Classes, SysUtils, UDrawMethod, UFastBitmap, Controls, Graphics;
     6  LCLIntf, LCLType, Classes, SysUtils, DrawMethod, FastBitmap, Controls, Graphics;
    97
    108type
    … …  
    2725constructor TMethodMove.Create;
    2826begin
    29   inherited Create;
     27  inherited;
    3028  FastBitmap2 := TFastBitmap.Create;
    3129  Caption := 'Move';
    … …  
    3735begin
    3836  FreeAndNil(FastBitmap2);
    39   inherited Destroy;
     37  inherited;
    4038end;
    4139
    … …  
    4947procedure TMethodMove.UpdateSettings;
    5048begin
    51   inherited UpdateSettings;
     49  inherited;
    5250end;
    5351
    … …  
    6058end;
    6159
    62 
    6360end.
    6461

  • GraphicTest/Methods/MethodOpenGL.pas

    r572 r573  
    1 unit UMethodOpenGL;
    2 
    3 {$mode delphi}
     1unit MethodOpenGL;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap
     6  Classes, SysUtils, DrawMethod, FastBitmap
    97  {$IFDEF OPENGL}, GL, GLExt, OpenGLContext{$ENDIF};
    108
    … …  
    1816    procedure DrawFrame(FastBitmap: TFastBitmap); override;
    1917  end;
    20   {$ENDIF}
     18{$ENDIF}
    2119
    2220
    … …  
    2826constructor TMethodOpenGL.Create;
    2927begin
    30   inherited Create;
     28  inherited;
    3129  Caption := 'OpenGL';
    3230  PaintObject := poOpenGL;
    … …  
    3735destructor TMethodOpenGL.Destroy;
    3836begin
    39   inherited Destroy;
     37  inherited;
    4038end;
    4139

  • GraphicTest/Methods/MethodOpenGLPBO.pas

    r572 r573  
    1 unit UMethodOpenGLPBO;
    2 
    3 {$mode delphi}
     1unit MethodOpenGLPBO;
    42
    53interface
    64
    75uses
    8   Classes, SysUtils, UDrawMethod, UFastBitmap, Controls, Graphics
     6  Classes, SysUtils, DrawMethod, FastBitmap, Controls, Graphics
    97  {$IFDEF OPENGL}, GL, GLExt, OpenGLContext{$ENDIF};
    108
    … …  
    6361constructor TMethodOpenGLPBO.Create;
    6462begin
    65   inherited Create;
     63  inherited;
    6664  Caption := 'OpenGL PBO';
    6765  PaintObject := poOpenGL;
    … …  
    7573destructor TMethodOpenGLPBO.Destroy;
    7674begin
    77   inherited Destroy;
     75  inherited;
    7876end;
    7977

  • GraphicTest/Packages/bgrabitmap/bgrautf8.pas

    r521 r573  
    77
    88uses
    9   Classes, SysUtils, BGRAUnicode{$IFDEF BGRABITMAP_USE_LCL}, lazutf8classes{$ENDIF};
     9  Classes, SysUtils, BGRAUnicode{$IFDEF BGRABITMAP_USE_LCL}, lazclasses{$ENDIF};
    1010
    1111{$IFDEF BGRABITMAP_USE_LCL}
    1212type
    13   TFileStreamUTF8 = lazutf8classes.TFileStreamUTF8;
    14   TStringListUTF8 = lazutf8classes.TStringListUTF8;
     13  TFileStreamUTF8 = TFileStream;
     14  TStringListUTF8 = TStringList;
    1515{$ELSE}
    1616type
    … …  
    105105procedure LoadStringsFromFileUTF8(List: TStrings; const FileName: string);
    106106begin
    107   lazutf8classes.LoadStringsFromFileUTF8(List,FileName);
     107  LoadStringsFromFileUTF8(List,FileName);
    108108end;
    109109
    110110procedure SaveStringsToFileUTF8(List: TStrings; const FileName: string);
    111111begin
    112   lazutf8classes.SaveStringsToFileUTF8(List,FileName);
     112  SaveStringsToFileUTF8(List,FileName);
    113113end;
    114114

  • GraphicTest/Packages/bgracontrols/bgrapanel.pas

    r452 r573  
    244244procedure TBGRAPanel.FontChanged(Sender: TObject);
    245245begin
    246   inherited FontChanged(Sender);
     246  inherited;
    247247  Changed;
    248248  Invalidate;
    … …  
    344344procedure TBGRAPanel.Resize;
    345345begin
    346   inherited Resize;
     346  inherited;
    347347  if FBGRA <> nil then
    348348    PrepareBGRA;
    349349end;
    350350
    351 procedure TBGRAPanel.SetEnabled(Value: boolean);
    352 begin
    353   inherited SetEnabled(Value);
     351procedure TBGRAPanel.SetEnabled(Value: Boolean);
     352begin
     353  inherited;
    354354  Changed;
    355355end;

  • GraphicTest/Platform.pas

    r572 r573  
    1 unit UPlatform;
    2 
    3 {$mode delphi}{$H+}
     1unit Platform;
    42
    53interface
    … …  
    7169finalization
    7270
    73 NowPreciseLock.Free;
     71FreeAndNil(NowPreciseLock);
    7472
    7573end.
Note: See TracChangeset for help on using the changeset viewer.