lfk/document-server
2
0
Fork 0
Code Issues 2 Pull Requests Actions Projects Releases 13 Wiki Activity

refactor(barcode): Switch to inclusive padding

Browse Source
This commit is contained in:
Nicolai Ort 2024-12-12 19:16:55 +01:00
parent de6fe4991c
commit ea6a4a7080
Signed by: niggl
GPG Key ID: 13AFA55AF62F269F
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
services/barcode.go
View File

@ -36,7 +36,7 @@ func (b *DefaultBarcodeService) GenerateBarcode(format string, content string, w
} }
if b.RedisClient != nil { if b.RedisClient != nil {
cachedBarcode, err := b.RedisClient.Get(ctx, fmt.Sprintf("barcode:%s:%s:%d:%d", format, content, width, height)).Result() cachedBarcode, err := b.RedisClient.Get(ctx, fmt.Sprintf("barcode:%s:%s:%d:%d:%d", format, content, width, height, padding)).Result()
if err == nil { if err == nil {
log.Printf("Cache hit for barcode:%s:%s:%d:%d", format, content, width, height) log.Printf("Cache hit for barcode:%s:%s:%d:%d", format, content, width, height)
buf := bytes.Buffer{} buf := bytes.Buffer{}
@ -69,18 +69,23 @@ func (b *DefaultBarcodeService) GenerateBarcode(format string, content string, w
break break
} }
scaledCode, err := barcode.Scale(generatedCode, width, height) // Create a white background image
bg := image.NewRGBA(image.Rect(0, 0, width, height))
white := color.RGBA{255, 255, 255, 255}
draw.Draw(bg, bg.Bounds(), &image.Uniform{white}, image.Point{}, draw.Src)
// Calculate the new size for the barcode to fit within the padding
newWidth := width - 2*padding
newHeight := height - 2*padding
// Scale the barcode to the new size
scaledCode, err := barcode.Scale(generatedCode, newWidth, newHeight)
if err != nil { if err != nil {
return bytes.Buffer{}, err return bytes.Buffer{}, err
} }
// Create a white background image
bg := image.NewRGBA(image.Rect(0, 0, width+2*padding, height+2*padding))
white := color.RGBA{255, 255, 255, 255}
draw.Draw(bg, bg.Bounds(), &image.Uniform{white}, image.Point{}, draw.Src)
// Draw the barcode on top of the white background with padding // Draw the barcode on top of the white background with padding
draw.Draw(bg, scaledCode.Bounds().Add(image.Point{padding + (width-scaledCode.Bounds().Dx())/2, padding + (height-scaledCode.Bounds().Dy())/2}), scaledCode, image.Point{}, draw.Over) draw.Draw(bg, scaledCode.Bounds().Add(image.Point{padding, padding}), scaledCode, image.Point{}, draw.Over)
var buf bytes.Buffer var buf bytes.Buffer
err = png.Encode(&buf, bg) err = png.Encode(&buf, bg)