diff --git a/components/fpvectorial/fpvectorial.pas b/components/fpvectorial/fpvectorial.pas index 73bb2af08f..8c78fbb2c1 100644 --- a/components/fpvectorial/fpvectorial.pas +++ b/components/fpvectorial/fpvectorial.pas @@ -2624,6 +2624,8 @@ var begin inherited Render(ADest, ARenderInfo, ADestX, ADestY, AMulX, AMulY, ADoDraw); + if Document.GetPageCount() = 0 then Exit; + lPage := Document.GetPage(0); lPageHeight := Round(lPage.Height); lPage.GetNaturalRenderPos(lPageHeight, lMulY); diff --git a/components/fpvectorial/htmlvectorialreader.pas b/components/fpvectorial/htmlvectorialreader.pas index cb2ba5ac85..e613e9945b 100644 --- a/components/fpvectorial/htmlvectorialreader.pas +++ b/components/fpvectorial/htmlvectorialreader.pas @@ -14,7 +14,7 @@ interface uses Classes, SysUtils, math, contnrs, - fpimage, fpcanvas, laz2_xmlread, laz2_dom, fgl, + fpimage, fpcanvas, laz2_xmlread, laz2_dom, fgl, lazfileutils, // image data formats fpreadpng, // HTML can contain SVG @@ -232,7 +232,8 @@ begin else if TvVectorialDocument.GetFormatFromExtension(lAttrValue, False) <> vfUnknown then begin lEmbVecImg := ADest.AddEmbeddedVectorialDoc(); - lEmbVecImg.Document.ReadFromFile(lAttrValue); + if FileExistsUTF8(lAttrValue) then + lEmbVecImg.Document.ReadFromFile(lAttrValue); end; end; 'xlink:href':