From d17d13df9df41d4505501e831ff0ada5b2222ff8 Mon Sep 17 00:00:00 2001 From: Kurt Date: Sat, 20 Jul 2019 12:23:47 -0400 Subject: Remove ImageOptionsReader and rework example to demonstrate RegisterImageOptionsReader() --- fpdf_test.go | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) (limited to 'fpdf_test.go') diff --git a/fpdf_test.go b/fpdf_test.go index 54de6c2..63c28c5 100644 --- a/fpdf_test.go +++ b/fpdf_test.go @@ -858,37 +858,37 @@ func ExampleFpdf_ImageOptions() { // Successfully generated pdf/Fpdf_ImageOptions.pdf } -// ImageOption struct can be used to affect horizontal image placement. -func ExampleFpdf_ImageOptionsReader() { - var opt gofpdf.ImageOptions - var pdfStr, imgStr string - var fl *os.File - var err error +// ExampleFpdf_RegisterImageOptionsReader demonstrates how to load an image +// from a io.Reader (in this case, a file) and register it with options. +func ExampleFpdf_RegisterImageOptionsReader() { + var ( + opt gofpdf.ImageOptions + pdfStr string + fl *os.File + err error + ) - pdfStr = example.Filename("Fpdf_ImageOptionsReader") + pdfStr = example.Filename("Fpdf_RegisterImageOptionsReader") pdf := gofpdf.New("P", "mm", "A4", "") pdf.AddPage() pdf.SetFont("Arial", "", 11) - pdf.SetX(60) - opt.ImageType = "png" - imgStr = example.ImageFile("logo.png") - fl, err = os.Open(imgStr) + fl, err = os.Open(example.ImageFile("logo.png")) if err == nil { - pdf.ImageOptionsReader(imgStr, fl, -10, 10, 30, 0, false, opt, 0, "") + opt.ImageType = "png" opt.AllowNegativePosition = true - _, err = fl.Seek(0, 0) - if err == nil { - pdf.ImageOptionsReader(imgStr, fl, -10, 50, 30, 0, false, opt, 0, "") - err = pdf.OutputFileAndClose(pdfStr) - } + _ = pdf.RegisterImageOptionsReader("logo", opt, fl) fl.Close() + for x := -20.0; x <= 40.0; x += 5 { + pdf.ImageOptions("logo", x, x+30, 0, 0, false, opt, 0, "") + } + err = pdf.OutputFileAndClose(pdfStr) } example.Summary(err, pdfStr) // Output: - // Successfully generated pdf/Fpdf_ImageOptionsReader.pdf + // Successfully generated pdf/Fpdf_RegisterImageOptionsReader.pdf } -// This examples demonstrates Landscape mode with images. +// This example demonstrates Landscape mode with images. func ExampleFpdf_SetAcceptPageBreakFunc() { var y0 float64 var crrntCol int @@ -948,7 +948,7 @@ func ExampleFpdf_SetAcceptPageBreakFunc() { // Successfully generated pdf/Fpdf_SetAcceptPageBreakFunc_landscape.pdf } -// This examples tests corner cases as reported by the gocov tool. +// This example tests corner cases as reported by the gocov tool. func ExampleFpdf_SetKeywords() { var err error fileStr := example.Filename("Fpdf_SetKeywords") -- cgit v1.2.1-24-ge1ad