images4lazarus: removed formats that are now in the LCL

git-svn-id: trunk@15560 -
This commit is contained in:
mattias 2008-06-24 13:14:06 +00:00
parent 94a0e34fb6
commit 24340765e5
10 changed files with 30 additions and 455 deletions

1
.gitattributes vendored
View File

@ -381,7 +381,6 @@ components/images/lazpnm.pas svneol=native#text/pascal
components/images/laztga.pas svneol=native#text/pascal
components/images/lazxpm.pas svneol=native#text/pascal
components/images/readme.txt svneol=native#text/plain
components/images/registerimg4laz.pas svneol=native#text/plain
components/lazreport/doc/contributors.txt svneol=native#text/plain
components/lazreport/doc/firststeps.odt -text
components/lazreport/doc/fr_eng.sxw -text

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?>
<CONFIG>
<Package Version="2">
<Package Version="3">
<Name Value="ImagesForLazarus"/>
<Author Value="Mazen NEIFER"/>
<CompilerOptions>
@ -25,7 +25,7 @@
"/>
<License Value="LGPL"/>
<Version Major="1" Release="1"/>
<Files Count="8">
<Files Count="7">
<Item1>
<Filename Value="lazpng.pas"/>
<UnitName Value="LazPNG"/>
@ -48,16 +48,13 @@
</Item5>
<Item6>
<Filename Value="laztga.pas"/>
<HasRegisterProc Value="True"/>
<UnitName Value="LazTGA"/>
</Item6>
<Item7>
<Filename Value="lazxpm.pas"/>
<UnitName Value="LazXPM"/>
</Item7>
<Item8>
<Filename Value="registerimg4laz.pas"/>
<UnitName Value="RegisterImg4Laz"/>
</Item8>
</Files>
<Type Value="RunAndDesignTime"/>
<RequiredPkgs Count="1">

View File

@ -7,13 +7,13 @@ unit ImagesForLazarus;
interface
uses
LazPNG, LazPNM, LazJPG, LazBMP, LazTGA, LazXPM, RegisterImg4Laz,
LazarusPackageIntf;
LazPNG, LazPNM, LazJPG, LazBMP, LazTGA, LazXPM, LazarusPackageIntf;
implementation
procedure Register;
begin
RegisterUnit('LazTGA', @LazTGA.Register);
end;
initialization

View File

@ -21,89 +21,11 @@ unit LazBMP;
interface
uses
SysUtils, Classes, FPImage, IntfGraphics, Graphics,
FPReadBMP, FPWriteBMP,
ClipBrd;
Graphics;
type
TBMPImage = class(TFPImageBitmap)
protected
procedure InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader); override;
procedure FinalizeFPImageReader(ImgReader: TFPCustomImageReader); override;
procedure InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter); override;
public
constructor Create; override;
class function GetFileExtensions: string; override;
class function GetDefaultFPReader: TFPCustomImageReaderClass; override;
class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;
end;
const
DefaultBMPMimeType = 'image/bmp';
procedure Register;
procedure UnRegister;
TBMPImage = TBitmap; // deprecated
implementation
{ TBMPImage }
procedure TBMPImage.InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader);
begin
if ImgReader is TFPReaderBMP then begin
end;
inherited InitFPImageReader(IntfImg, ImgReader);
end;
procedure TBMPImage.FinalizeFPImageReader(ImgReader: TFPCustomImageReader);
begin
if ImgReader is TFPReaderBMP then begin
end;
inherited FinalizeFPImageReader(ImgReader);
end;
procedure TBMPImage.InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter);
var
BMPWriter: TFPWriterBMP;
begin
if ImgWriter is TFPWriterBMP then begin
BMPWriter:=TFPWriterBMP(ImgWriter);
if BMPWriter<>nil then ;
end;
inherited InitFPImageWriter(IntfImg, ImgWriter);
end;
class function TBMPImage.GetDefaultFPReader: TFPCustomImageReaderClass;
begin
Result:=TFPReaderBMP;
end;
class function TBMPImage.GetDefaultFPWriter: TFPCustomImageWriterClass;
begin
Result:=TFPWriterBMP;
end;
constructor TBMPImage.Create;
begin
inherited Create;
end;
class function TBMPImage.GetFileExtensions: string;
begin
Result:='bmp';
end;
procedure Register;
begin
TPicture.RegisterFileFormat('bmp', 'BMP Image File', TBMPImage);
TPicture.RegisterClipboardFormat(RegisterClipboardFormat(DefaultBMPMimeType),
TBMPImage);
end;
procedure UnRegister;
begin
TPicture.UnregisterGraphicClass(TBMPImage);
end;
end.

View File

@ -21,114 +21,12 @@ unit LazJPG;
interface
uses
SysUtils, Classes, FPImage, IntfGraphics, Graphics,
FPReadJPEG, FPWriteJPEG,
ClipBrd;
Graphics;
type
TJPGQualityRange = TFPJPEGCompressionQuality;
TJPGPerformance = TJPEGReadPerformance;
TJPGImage = class(TFPImageBitmap)
private
FPerformance: TJPGPerformance;
FProgressiveEncoding: boolean;
FQuality: TJPGQualityRange;
protected
procedure InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader); override;
procedure FinalizeFPImageReader(ImgReader: TFPCustomImageReader); override;
procedure InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter); override;
public
constructor Create; override;
class function GetFileExtensions: string; override;
class function GetDefaultFPReader: TFPCustomImageReaderClass; override;
class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;
public
property CompressionQuality: TJPGQualityRange read FQuality write FQuality;
property ProgressiveEncoding: boolean read FProgressiveEncoding write FProgressiveEncoding;
property Performance: TJPGPerformance read FPerformance write FPerformance;
end;
const
DefaultJPGMimeType = 'image/jpeg';
procedure Register;
procedure UnRegister;
TJPGImage = TJPEGImage; // deprecated
implementation
{ TJPGImage }
procedure TJPGImage.InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader);
var
JPGReader: TFPReaderJPEG;
begin
if ImgReader is TFPReaderJPEG then begin
JPGReader:=TFPReaderJPEG(ImgReader);
JPGReader.Performance:=Performance;
end;
inherited InitFPImageReader(IntfImg, ImgReader);
end;
procedure TJPGImage.FinalizeFPImageReader(ImgReader: TFPCustomImageReader);
var
JPGReader: TFPReaderJPEG;
begin
if ImgReader is TFPReaderJPEG then begin
JPGReader:=TFPReaderJPEG(ImgReader);
FProgressiveEncoding:=JPGReader.ProgressiveEncoding;
end;
inherited FinalizeFPImageReader(ImgReader);
end;
procedure TJPGImage.InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter);
var
JPGWriter: TFPWriterJPEG;
begin
if ImgWriter is TFPWriterJPEG then begin
JPGWriter:=TFPWriterJPEG(ImgWriter);
if JPGWriter<>nil then ;
JPGWriter.ProgressiveEncoding:=ProgressiveEncoding;
JPGWriter.CompressionQuality:=CompressionQuality;
end;
inherited InitFPImageWriter(IntfImg, ImgWriter);
end;
class function TJPGImage.GetDefaultFPReader: TFPCustomImageReaderClass;
begin
Result:=TFPReaderJPEG;
end;
class function TJPGImage.GetDefaultFPWriter: TFPCustomImageWriterClass;
begin
Result:=TFPWriterJPEG;
end;
constructor TJPGImage.Create;
begin
inherited Create;
FPerformance:=jpBestQuality;
FProgressiveEncoding:=false;
FQuality:=75;
end;
class function TJPGImage.GetFileExtensions: string;
begin
Result:='jpg;jpeg';
end;
procedure Register;
begin
TPicture.RegisterFileFormat('jpg', 'JPEG Image File', TJPGImage);
TPicture.RegisterFileFormat('jpeg', 'JPEG Image File', TJPGImage);
TPicture.RegisterClipboardFormat(RegisterClipboardFormat(DefaultJPGMimeType),
TJPGImage);
end;
procedure UnRegister;
begin
TPicture.UnregisterGraphicClass(TJPGImage);
end;
end.

View File

@ -21,59 +21,11 @@ unit LazPNG;
interface
uses
SysUtils, Classes, FPImage, IntfGraphics, Graphics,
FPReadPNG, FPWritePNG,ClipBrd;
Graphics;
type
TPNGImage = class(TFPImageBitmap)
public
constructor Create; override;
class function GetFileExtensions: string; override;
class function GetDefaultFPReader: TFPCustomImageReaderClass; override;
class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;
end;
const
DefaultPNGMimeType = 'image/png';
procedure Register;
procedure UnRegister;
TPNGImage = TPortableNetworkGraphic; // deprecated
implementation
{ TPNGImage }
class function TPNGImage.GetDefaultFPReader: TFPCustomImageReaderClass;
begin
Result:=TFPReaderPNG;
end;
class function TPNGImage.GetDefaultFPWriter: TFPCustomImageWriterClass;
begin
Result:=TFPWriterPNG;
end;
constructor TPNGImage.Create;
begin
inherited Create;
end;
class function TPNGImage.GetFileExtensions: string;
begin
Result:='png';
end;
procedure Register;
begin
TPicture.RegisterFileFormat('png', 'PNG Image File', TPNGImage);
TPicture.RegisterClipboardFormat(RegisterClipboardFormat(DefaultPNGMimeType),
TPNGImage);
end;
procedure UnRegister;
begin
TPicture.UnregisterGraphicClass(TPNGImage);
end;
end.

View File

@ -21,69 +21,12 @@ unit LazPNM;
interface
uses
SysUtils, Classes, FPImage, IntfGraphics, Graphics,
FPReadPNM, FPWritePNM,
ClipBrd;
Graphics;
type
TPNMImage = class(TFPImageBitmap)
public
constructor Create; override;
class function GetFileExtensions: string; override;
class function GetDefaultFPReader: TFPCustomImageReaderClass; override;
class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;
end;
const
DefaultPPMMimeType = 'image/ppm';
DefaultPGMMimeType = 'image/pgm';
DefaultPBMMimeType = 'image/pbm';
procedure Register;
procedure UnRegister;
TPNMImage = TPortableAnyMapGraphic; // deprecated
implementation
{ TPNMImage }
class function TPNMImage.GetDefaultFPReader: TFPCustomImageReaderClass;
begin
Result:=TFPReaderPNM;
end;
class function TPNMImage.GetDefaultFPWriter: TFPCustomImageWriterClass;
begin
Result:=TFPWriterPNM;
end;
constructor TPNMImage.Create;
begin
inherited Create;
end;
class function TPNMImage.GetFileExtensions: string;
begin
Result:='ppm;pgm;pbm';
end;
procedure Register;
begin
TPicture.RegisterFileFormat('ppm', 'PNM Image File', TPNMImage);
TPicture.RegisterFileFormat('pgm', 'PNM Image File', TPNMImage);
TPicture.RegisterFileFormat('pbm', 'PNM Image File', TPNMImage);
TPicture.RegisterClipboardFormat(RegisterClipboardFormat(DefaultPPMMimeType),
TPNMImage);
TPicture.RegisterClipboardFormat(RegisterClipboardFormat(DefaultPGMMimeType),
TPNMImage);
TPicture.RegisterClipboardFormat(RegisterClipboardFormat(DefaultPBMMimeType),
TPNMImage);
end;
procedure UnRegister;
begin
TPicture.UnregisterGraphicClass(TPNMImage);
end;
end.

View File

@ -26,16 +26,21 @@ uses
ClipBrd;
type
{ TSharedTGAImage }
TSharedTGAImage = class(TSharedCustomBitmap)
end;
{ TTGAImage }
TTGAImage = class(TFPImageBitmap)
protected
procedure InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader); override;
procedure FinalizeFPImageReader(ImgReader: TFPCustomImageReader); override;
procedure InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter); override;
class function GetReaderClass: TFPCustomImageReaderClass; override;
class function GetWriterClass: TFPCustomImageWriterClass; override;
class function GetSharedImageClass: TSharedRasterImageClass; override;
public
constructor Create; override;
class function GetFileExtensions: string; override;
class function GetDefaultFPReader: TFPCustomImageReaderClass; override;
class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;
end;
const
@ -48,44 +53,19 @@ implementation
{ TTGAImage }
procedure TTGAImage.InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader);
begin
if ImgReader is TFPReaderTarga then begin
end;
inherited InitFPImageReader(IntfImg, ImgReader);
end;
procedure TTGAImage.FinalizeFPImageReader(ImgReader: TFPCustomImageReader);
begin
if ImgReader is TFPReaderTarga then begin
end;
inherited FinalizeFPImageReader(ImgReader);
end;
procedure TTGAImage.InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter);
var
TGAWriter: TFPWriterTarga;
begin
if ImgWriter is TFPWriterTarga then begin
TGAWriter:=TFPWriterTarga(ImgWriter);
if TGAWriter<>nil then ;
end;
inherited InitFPImageWriter(IntfImg, ImgWriter);
end;
class function TTGAImage.GetDefaultFPReader: TFPCustomImageReaderClass;
class function TTGAImage.GetReaderClass: TFPCustomImageReaderClass;
begin
Result:=TFPReaderTarga;
end;
class function TTGAImage.GetDefaultFPWriter: TFPCustomImageWriterClass;
class function TTGAImage.GetWriterClass: TFPCustomImageWriterClass;
begin
Result:=TFPWriterTarga;
end;
constructor TTGAImage.Create;
class function TTGAImage.GetSharedImageClass: TSharedRasterImageClass;
begin
inherited Create;
Result:=TSharedTGAImage;
end;
class function TTGAImage.GetFileExtensions: string;

View File

@ -21,93 +21,11 @@ unit LazXPM;
interface
uses
SysUtils, Classes, FPImage, IntfGraphics, Graphics,
FPReadXPM, FPWriteXPM,
ClipBrd;
Graphics;
type
TXPMImage = class(TFPImageBitmap)
protected
procedure InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader); override;
procedure FinalizeFPImageReader(ImgReader: TFPCustomImageReader); override;
procedure InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter); override;
public
constructor Create; override;
class function GetFileExtensions: string; override;
class function GetDefaultFPReader: TFPCustomImageReaderClass; override;
class function GetDefaultFPWriter: TFPCustomImageWriterClass; override;
end;
const
DefaultXPMMimeType = 'image/xpm';
procedure Register;
procedure UnRegister;
TXPMImage = TPixmap; // deprecated
implementation
{ TXPMImage }
procedure TXPMImage.InitFPImageReader(IntfImg: TLazIntfImage; ImgReader: TFPCustomImageReader);
var
XPMReader: TFPReaderXPM;
begin
if ImgReader is TFPReaderXPM then begin
end;
inherited InitFPImageReader(IntfImg, ImgReader);
end;
procedure TXPMImage.FinalizeFPImageReader(ImgReader: TFPCustomImageReader);
var
XPMReader: TFPReaderXPM;
begin
if ImgReader is TFPReaderXPM then begin
XPMReader:=TFPReaderXPM(ImgReader);
end;
inherited FinalizeFPImageReader(ImgReader);
end;
procedure TXPMImage.InitFPImageWriter(IntfImg: TLazIntfImage; ImgWriter: TFPCustomImageWriter);
var
XPMWriter: TFPWriterXPM;
begin
if ImgWriter is TFPWriterXPM then begin
XPMWriter:=TFPWriterXPM(ImgWriter);
if XPMWriter<>nil then ;
end;
inherited InitFPImageWriter(IntfImg, ImgWriter);
end;
class function TXPMImage.GetDefaultFPReader: TFPCustomImageReaderClass;
begin
Result:=TFPReaderXPM;
end;
class function TXPMImage.GetDefaultFPWriter: TFPCustomImageWriterClass;
begin
Result:=TFPWriterXPM;
end;
constructor TXPMImage.Create;
begin
inherited Create;
end;
class function TXPMImage.GetFileExtensions: string;
begin
Result:='xpm';
end;
procedure Register;
begin
TPicture.RegisterFileFormat('xpm', 'XPM Image File', TXPMImage);
TPicture.RegisterClipboardFormat(RegisterClipboardFormat(DefaultXPMMimeType),
TXPMImage);
end;
procedure UnRegister;
begin
TPicture.UnregisterGraphicClass(TXPMImage);
end;
end.

View File

@ -1,34 +0,0 @@
{ Copyright (C) 2003 Mattias Gaertner
This library is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published by
the Free Software Foundation; either version 2 of the License, or (at your
option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License
for more details.
You should have received a copy of the GNU Library General Public License
along with this library; if not, write to the Free Software Foundation,
Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
}
unit RegisterImg4Laz;
{$mode objfpc}{$H+}
interface
uses
Classes, SysUtils, LazPNM, LazJPG, LazTGA;
implementation
initialization
LazJPG.Register;
LazPNM.Register;
LazTGA.Register;
end.