瀏覽代碼

Merge branch source:main into main

Curtis Hamilton 3 周之前
父節點
當前提交
177dbc0ea1
共有 2 個文件被更改,包括 11 次插入11 次删除
  1. 1 1
      packages/fcl-image/src/fpinterpolation.inc
  2. 10 10
      packages/libtar/src/libtar.pp

+ 1 - 1
packages/fcl-image/src/fpinterpolation.inc

@@ -149,7 +149,7 @@ var
   xSupport: integer;// how many horizontal pixel are needed to create one pixel
   xSupport: integer;// how many horizontal pixel are needed to create one pixel
   yEntries: Pointer;
   yEntries: Pointer;
   yEntrySize: integer;
   yEntrySize: integer;
-  ySupport: integer;// how many vertizontal pixel are needed to create one pixel
+  ySupport: integer;// how many vertical pixel are needed to create one pixel
   NewSupportLines: LongInt;
   NewSupportLines: LongInt;
   yEntry: Pointer;
   yEntry: Pointer;
   SrcStartY: LongInt;
   SrcStartY: LongInt;

+ 10 - 10
packages/libtar/src/libtar.pp

@@ -179,7 +179,7 @@ TYPE
                   FBytesToGo  : INT64;     // Bytes until the next Header Record
                   FBytesToGo  : INT64;     // Bytes until the next Header Record
                 PUBLIC
                 PUBLIC
                   CONSTRUCTOR Create (Stream   : TStream);                                OVERLOAD;
                   CONSTRUCTOR Create (Stream   : TStream);                                OVERLOAD;
-                  CONSTRUCTOR Create (Filename : STRING;
+                  CONSTRUCTOR Create (const Filename : AnsiString;
                                       FileMode : WORD = fmOpenRead OR fmShareDenyWrite);  OVERLOAD;
                                       FileMode : WORD = fmOpenRead OR fmShareDenyWrite);  OVERLOAD;
                   DESTRUCTOR Destroy;                                       OVERRIDE;
                   DESTRUCTOR Destroy;                                       OVERRIDE;
                   PROCEDURE Reset;                                         // Reset File Pointer
                   PROCEDURE Reset;                                         // Reset File Pointer
@@ -210,9 +210,9 @@ TYPE
                  CONSTRUCTOR CreateEmpty;
                  CONSTRUCTOR CreateEmpty;
                PUBLIC
                PUBLIC
                  CONSTRUCTOR Create (TargetStream   : TStream);                            OVERLOAD;
                  CONSTRUCTOR Create (TargetStream   : TStream);                            OVERLOAD;
-                 CONSTRUCTOR Create (TargetFilename : STRING; Mode : INTEGER = fmCreate);  OVERLOAD;
+                 CONSTRUCTOR Create (const TargetFilename : AnsiString; Mode : INTEGER = fmCreate);  OVERLOAD;
                  DESTRUCTOR Destroy; OVERRIDE;                   // Writes End-Of-File Tag
                  DESTRUCTOR Destroy; OVERRIDE;                   // Writes End-Of-File Tag
-                 PROCEDURE AddFile   (Filename : STRING;  TarFilename : AnsiString = '');
+                 PROCEDURE AddFile   (const Filename : AnsiString;  TarFilename : AnsiString = '');
                  PROCEDURE AddStream (Stream   : TStream; TarFilename : AnsiString; FileDateGmt : TDateTime);
                  PROCEDURE AddStream (Stream   : TStream; TarFilename : AnsiString; FileDateGmt : TDateTime);
                  PROCEDURE AddString (Contents : Ansistring;  TarFilename : AnsiString; FileDateGmt : TDateTime);  // RawByteString
                  PROCEDURE AddString (Contents : Ansistring;  TarFilename : AnsiString; FileDateGmt : TDateTime);  // RawByteString
                  PROCEDURE AddDir          (Dirname            : AnsiString; DateGmt : TDateTime; MaxDirSize : INT64 = 0);
                  PROCEDURE AddDir          (Dirname            : AnsiString; DateGmt : TDateTime; MaxDirSize : INT64 = 0);
@@ -244,8 +244,8 @@ CONST
 
 
 
 
 FUNCTION  PermissionString      (Permissions : TTarPermissions) : STRING;
 FUNCTION  PermissionString      (Permissions : TTarPermissions) : STRING;
-FUNCTION  ConvertFilename       (Filename    : STRING)          : STRING;
-FUNCTION  FileTimeGMT           (FileName    : STRING)          : TDateTime;  OVERLOAD;
+FUNCTION  ConvertFilename       (const Filename    : AnsiString)          : AnsiString;
+FUNCTION  FileTimeGMT           (const FileName    : AnsiString)          : TDateTime;  OVERLOAD;
 FUNCTION  FileTimeGMT           (SearchRec   : TSearchRec)      : TDateTime;  OVERLOAD;
 FUNCTION  FileTimeGMT           (SearchRec   : TSearchRec)      : TDateTime;  OVERLOAD;
 PROCEDURE ClearDirRec           (VAR DirRec  : TTarDirRec);
 PROCEDURE ClearDirRec           (VAR DirRec  : TTarDirRec);
 
 
@@ -273,7 +273,7 @@ BEGIN
 END;
 END;
 
 
 
 
-FUNCTION ConvertFilename  (Filename : STRING) : STRING;
+FUNCTION ConvertFilename  (const Filename : AnsiString) : AnsiString;
 // Converts the filename to Unix conventions
 // Converts the filename to Unix conventions
 // could be empty and inlined away for FPC. FPC I/O should be
 // could be empty and inlined away for FPC. FPC I/O should be
 // forward/backward slash safe.
 // forward/backward slash safe.
@@ -285,7 +285,7 @@ BEGIN
   (*$ENDIF *)
   (*$ENDIF *)
 END;
 END;
 
 
-FUNCTION FileTimeGMT (FileName: STRING): TDateTime;
+FUNCTION FileTimeGMT (const FileName: AnsiString): TDateTime;
          // Returns the Date and Time of the last modification of the given File
          // Returns the Date and Time of the last modification of the given File
          // The Result is zero if the file could not be found
          // The Result is zero if the file could not be found
          // The Result is given in UTC (GMT) time zone
          // The Result is given in UTC (GMT) time zone
@@ -589,7 +589,7 @@ BEGIN
 END;
 END;
 
 
 
 
-CONSTRUCTOR TTarArchive.Create (Filename : STRING; FileMode : WORD);
+CONSTRUCTOR TTarArchive.Create (const Filename : Ansistring; FileMode : WORD);
 BEGIN
 BEGIN
   INHERITED Create;
   INHERITED Create;
   FStream     := TFileStream.Create (Filename, FileMode);
   FStream     := TFileStream.Create (Filename, FileMode);
@@ -801,7 +801,7 @@ BEGIN
 END;
 END;
 
 
 
 
-CONSTRUCTOR TTarWriter.Create (TargetFilename : STRING; Mode : INTEGER = fmCreate);
+CONSTRUCTOR TTarWriter.Create (const TargetFilename : AnsiString; Mode : INTEGER = fmCreate);
 BEGIN
 BEGIN
   CreateEmpty;
   CreateEmpty;
   FStream     := TFileStream.Create (TargetFilename, Mode);
   FStream     := TFileStream.Create (TargetFilename, Mode);
@@ -821,7 +821,7 @@ BEGIN
 END;
 END;
 
 
 
 
-PROCEDURE TTarWriter.AddFile   (Filename : STRING;  TarFilename : AnsiString = '');
+PROCEDURE TTarWriter.AddFile   (const Filename : AnsiString;  TarFilename : AnsiString = '');
 VAR
 VAR
   S    : TFileStream;
   S    : TFileStream;
   Date : TDateTime;
   Date : TDateTime;