add ImageHolderByReader

gopdf_test.go

@@ -30,7 +30,7 @@ func BenchmarkPdfWithImageHolder(b *testing.B) {
 		return
 	}
 
-	bytesOfImg, err := ioutil.ReadFile("./test/res/gopher02.png")
+	bytesOfImg, err := ioutil.ReadFile("./test/res/chilli.jpg")
 	if err != nil {
 		b.Error(err)
 		return

image_holder.go

@@ -21,7 +21,12 @@ func ImageHolderByBytes(b []byte) (ImageHolder, error) {
 
 //ImageHolderByPath create ImageHolder by image path
 func ImageHolderByPath(path string) (ImageHolder, error) {
-	return newImageFile(path)
+	return newImageBuffByPath(path)
+}
+
+//ImageHolderByReader create ImageHolder by io.Reader
+func ImageHolderByReader(r io.Reader) (ImageHolder, error) {
+	return newImageBuffByReader(r)
 }
 
 //imageBuff image holder (impl ImageHolder)
@@ -42,27 +47,35 @@ func newImageBuff(b []byte) (*imageBuff, error) {
 	return &i, nil
 }
 
-func (i *imageBuff) ID() string {
-	return i.id
+func newImageBuffByPath(path string) (*imageBuff, error) {
+	var i imageBuff
+	i.id = path
+	b, err := ioutil.ReadFile(path)
+	if err != nil {
+		return nil, err
+	}
+	i.Write(b)
+	return &i, nil
 }
 
-//imageFile image holder
-type imageFile struct {
-	id string
-	bytes.Buffer
-}
+func newImageBuffByReader(r io.Reader) (*imageBuff, error) {
 
-func newImageFile(path string) (*imageFile, error) {
-	var i imageFile
-	i.id = path
-	b, err := ioutil.ReadFile(path)
+	b, err := ioutil.ReadAll(r)
+	if err != nil {
+		return nil, err
+	}
+
+	h := md5.New()
+	_, err = h.Write(b)
 	if err != nil {
 		return nil, err
 	}
+	var i imageBuff
+	i.id = fmt.Sprintf("%x", h.Sum(nil))
 	i.Write(b)
 	return &i, nil
 }
 
-func (i *imageFile) ID() string {
+func (i *imageBuff) ID() string {
 	return i.id
 }