LazReport, cairo export, cleanup

git-svn-id: trunk@41011 -
This commit is contained in:
jesus 2013-05-03 05:52:40 +00:00
parent 58422ca971
commit 27b19e929c

View File

@ -41,10 +41,8 @@ type
TlrCairoExportFilter = class(TfrExportFilter) TlrCairoExportFilter = class(TfrExportFilter)
private private
fBackend: TlrCairoBackend; fBackend: TlrCairoBackend;
NewPage: Boolean;
fCairoPrinter: TCairoFilePrinter; fCairoPrinter: TCairoFilePrinter;
FPageNo : Integer; FPageNo : Integer;
DummyControl: TForm;
ScaleX,ScaleY: Double; ScaleX,ScaleY: Double;
DataRect: TRect; DataRect: TRect;
fImageList: TfpList; fImageList: TfpList;
@ -85,9 +83,6 @@ implementation
// missing cairo functions to make shared images posible // missing cairo functions to make shared images posible
const const
CAIRO_MIME_TYPE_JPEG = 'image/jpeg'; CAIRO_MIME_TYPE_JPEG = 'image/jpeg';
CAIRO_MIME_TYPE_PNG = 'image/png';
CAIRO_MIME_TYPE_JP2 = 'image/jp2';
CAIRO_MIME_TYPE_URI = 'text/x-uri';
{$IFDEF CAIRO_HAS_MIME_TYPE_UNIQUE} {$IFDEF CAIRO_HAS_MIME_TYPE_UNIQUE}
CAIRO_MIME_TYPE_UNIQUE = 'application/x-cairo.uuid' CAIRO_MIME_TYPE_UNIQUE = 'application/x-cairo.uuid'
{$ENDIF} {$ENDIF}
@ -526,8 +521,7 @@ end;
procedure TlrCairoExportFilter.ShowPicture(View: TfrPictureView; x, y, h, procedure TlrCairoExportFilter.ShowPicture(View: TfrPictureView; x, y, h,
w: integer); w: integer);
var var
cr: pcairo_t; isf: pcairo_surface_t;
sf, isf: pcairo_surface_t;
m: TMemoryStream; m: TMemoryStream;
item: PImageItem; item: PImageItem;
@ -545,9 +539,6 @@ begin
picw := Picture.Graphic.Width; picw := Picture.Graphic.Width;
pich := Picture.Graphic.Height; pich := Picture.Graphic.Height;
cr := pcairo_t(fCairoPrinter.Canvas.Handle);
sf := cairo_get_target(cr);
ImageShared := (View.SharedName<>'') and (Backend=cePDF); ImageShared := (View.SharedName<>'') and (Backend=cePDF);
AddToList := false; AddToList := false;
@ -727,8 +718,7 @@ procedure TlrCairoExportFilter.OnText(X, Y: Integer; const Text: string;
var var
nx, ny, gapx, gapy, sgapx, sgapy: Integer; nx, ny, gapx, gapy, sgapx, sgapy: Integer;
aStyle: TTextStyle; aStyle: TTextStyle;
OldClipping: Boolean; R: TRect;
OldClipRect, R: TRect;
begin begin
// The text drawn in this function is enclosed in a view frame // The text drawn in this function is enclosed in a view frame