paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-13 21:11:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Extention -> Extension (bug ID 25949)

Browse Source 
git-svn-id: trunk@27761 -
This commit is contained in:
michael 2014-05-11 09:43:29 +00:00
parent 708ca37a02
commit b004a48d83
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
packages/fcl-image/src/fphandler.inc
View File

@ -29,17 +29,17 @@ begin
inherited Destroy;
end;
function CalcDefExt (TheExtentions:string) : string;
function CalcDefExt (TheExtensions:string) : string;
var p : integer;
begin
p := pos (';',TheExtentions);
p := pos (';',TheExtensions);
if p = 0 then
result := TheExtentions
result := TheExtensions
else
result := copy(TheExtentions, 1, p-1);
result := copy(TheExtensions, 1, p-1);
end;
procedure TImageHandlersManager.RegisterImageHandlers (const ATypeName,TheExtentions:string;
procedure TImageHandlersManager.RegisterImageHandlers (const ATypeName,TheExtensions:string;
AReader:TFPCustomImageReaderClass; AWriter:TFPCustomImageWriterClass);
var ih : TIHData;
begin
@ -50,15 +50,15 @@ begin
with ih do
begin
FTypeName := ATypeName;
FExtention := lowercase(TheExtentions);
FDefaultExt := CalcDefExt (TheExtentions);
FExtension := lowercase(TheExtensions);
FDefaultExt := CalcDefExt (TheExtensions);
FReader := AReader;
FWriter := AWriter;
end;
FData.Add (ih);
end;
procedure TImageHandlersManager.RegisterImageReader (const ATypeName,TheExtentions:string;
procedure TImageHandlersManager.RegisterImageReader (const ATypeName,TheExtensions:string;
AReader:TFPCustomImageReaderClass);
var ih : TIHData;
begin
@ -76,8 +76,8 @@ begin
with ih do
begin
FTypeName := ATypeName;
FExtention := Lowercase(TheExtentions);
FDefaultExt := CalcDefExt (TheExtentions);
FExtension := Lowercase(TheExtensions);
FDefaultExt := CalcDefExt (TheExtensions);
FReader := AReader;
FWriter := nil;
end;
@ -85,7 +85,7 @@ begin
end;
end;
procedure TImageHandlersManager.RegisterImageWriter (const ATypeName,TheExtentions:string;
procedure TImageHandlersManager.RegisterImageWriter (const ATypeName,TheExtensions:string;
AWriter:TFPCustomImageWriterClass);
var ih : TIHData;
begin
@ -103,8 +103,8 @@ begin
with ih do
begin
FTypeName := ATypeName;
FExtention := lowercase(TheExtentions);
FDefaultExt := CalcDefExt (TheExtentions);
FExtension := lowercase(TheExtensions);
FDefaultExt := CalcDefExt (TheExtensions);
FReader := nil;
FWriter := AWriter;
end;
@ -170,7 +170,7 @@ var ih : TIHData;
begin
ih := GetData (TypeName);
if assigned(ih) then
result := ih.FExtention
result := ih.FExtension
else
result := '';
end;

4
packages/fcl-image/src/fpimage.inc
View File

@ -92,7 +92,7 @@ begin
while (r >= 0) do
begin
d := GetData(r);
if (pos(s,d.Fextention+';') <> 0) then
if (pos(s,d.Fextension+';') <> 0) then
try
h := d.FWriter;
if assigned (h) then
@ -184,7 +184,7 @@ begin
while (r >= 0) do
begin
d := GetData(r);
if (pos(s,d.Fextention+';') <> 0) then
if (pos(s,d.Fextension+';') <> 0) then
try
h := d.FReader;
if assigned (h) then

12
packages/fcl-image/src/fpimage.pp
View File

@ -221,7 +221,7 @@ type
TIHData = class
private
FExtention, FTypeName, FDefaultExt : string;
FExtension, FTypeName, FDefaultExt : string;
FReader : TFPCustomImageReaderClass;
FWriter : TFPCustomImageWriterClass;
end;
@ -240,17 +240,17 @@ type
public
constructor Create;
destructor Destroy; override;
procedure RegisterImageHandlers (const ATypeName,TheExtentions:string;
procedure RegisterImageHandlers (const ATypeName,TheExtensions:string;
AReader:TFPCustomImageReaderClass; AWriter:TFPCustomImageWriterClass);
procedure RegisterImageReader (const ATypeName,TheExtentions:string;
procedure RegisterImageReader (const ATypeName,TheExtensions:string;
AReader:TFPCustomImageReaderClass);
procedure RegisterImageWriter (const ATypeName,TheExtentions:string;
procedure RegisterImageWriter (const ATypeName,TheExtensions:string;
AWriter:TFPCustomImageWriterClass);
property Count : integer read GetCount;
property ImageReader [const TypeName:string] : TFPCustomImageReaderClass read GetReader;
property ImageWriter [const TypeName:string] : TFPCustomImageWriterClass read GetWriter;
property Extentions [const TypeName:string] : string read GetExt;
property DefaultExtention [const TypeName:string] : string read GetDefExt;
property Extensions [const TypeName:string] : string read GetExt;
property DefaultExtension [const TypeName:string] : string read GetDefExt;
property TypeNames [index:integer] : string read GetTypeName;
end;