Merge branch 'update-contrib-gofpdi' of https://github.com/mrtsbt/gofpdf into mrtsbt-update-contrib-gofpdi

1 files changed, 24 insertions, 0 deletions

diff --git a/contrib/gofpdi/gofpdi.go b/contrib/gofpdi/gofpdi.go
index b951ea3..58f8fae 100644
--- a/contrib/gofpdi/gofpdi.go
+++ b/contrib/gofpdi/gofpdi.go
@@ -2,6 +2,7 @@ package gofpdi
 
 import (
 	realgofpdi "github.com/phpdave11/gofpdi"
+	"io"
 )
 
 // Create new gofpdi instance
@@ -23,7 +24,21 @@ type gofpdiPdf interface {
 func ImportPage(f gofpdiPdf, sourceFile string, pageno int, box string) int {
 	// Set source file for fpdi
 	fpdi.SetSourceFile(sourceFile)
+	// return template id
+	return getTemplateID(f, pageno, box)
+}
 
+// ImportPage imports a page of a PDF with the specified box (/MediaBox,
+// /TrimBox, /ArtBox, /CropBox, or /BleedBox). Returns a template id that can
+// be used with UseImportedTemplate to draw the template onto the page.
+func ImportPageFromStream(f gofpdiPdf, rs *io.ReadSeeker, pageno int, box string) int {
+	// Set source stream for fpdi
+	fpdi.SetSourceStream(rs)
+	// return template id
+	return getTemplateID(f, pageno, box)
+}
+
+func getTemplateID(f gofpdiPdf, pageno int, box string) int {
 	// Import page
 	tpl := fpdi.ImportPage(pageno, box)
 
@@ -61,3 +76,12 @@ func UseImportedTemplate(f gofpdiPdf, tplid int, x float64, y float64, w float64
 
 	f.UseImportedTemplate(tplName, scaleX, scaleY, tX, tY)
 }
+
+// GetPageSizes returns page dimensions for all pages of the imported pdf.
+// Result consists of map[<page number>]map[<box>]map[<dimension>]<value>.
+// <page number>: page number, note that page numbers start at 1
+// <box>: box identifier, e.g. "/MediaBox"
+// <dimension>: dimension string, either "w" or "h"
+func GetPageSizes() map[int]map[string]map[string]float64 {
+	return fpdi.GetPageSizes()
+}