From cb98d371335125d62e35e7763b4f503e7f29f92c Mon Sep 17 00:00:00 2001 From: heyarne Date: Thu, 10 Feb 2022 18:58:30 +0100 Subject: [PATCH] Skip extra reader in http server --- cmd/serve.go | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/cmd/serve.go b/cmd/serve.go index 73832d2..10a65de 100644 --- a/cmd/serve.go +++ b/cmd/serve.go @@ -5,7 +5,6 @@ Copyright © 2022 NAME HERE package cmd import ( - "bytes" "fmt" "net/http" @@ -109,12 +108,9 @@ func getConvert(c *gin.Context) { c.Error(err) } - extraHeaders := map[string]string{ - "X-Image-Width": fmt.Sprintf("%d", width), - "X-Image-height": fmt.Sprintf("%d", height), - } - - c.DataFromReader(http.StatusOK, int64(len(converted)), "x-image/inkpot-epd", bytes.NewReader(converted), extraHeaders) + c.Header("X-Image-Width", fmt.Sprintf("%d", width)) + c.Header("X-Image-Height", fmt.Sprintf("%d", height)) + c.Data(http.StatusOK, "x-image/inkpot-epd", converted) } func putConvert(c *gin.Context) { @@ -150,12 +146,9 @@ func putConvert(c *gin.Context) { c.Error(err) } - extraHeaders := map[string]string{ - "X-Image-Width": fmt.Sprintf("%d", width), - "X-Image-height": fmt.Sprintf("%d", height), - } - - c.DataFromReader(http.StatusOK, int64(len(converted)), "x-image/inkpot-epd", bytes.NewReader(converted), extraHeaders) + c.Header("X-Image-Width", fmt.Sprintf("%d", width)) + c.Header("X-Image-Height", fmt.Sprintf("%d", height)) + c.Data(http.StatusOK, "x-image/inkpot-epd", converted) } func init() {