0ct0pu5/photoprism
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Vectors: Use RSVG instead of imagemagick to convert SVG to PNG #3885

Browse source 
Signed-off-by: Michael Mayer <michael@photoprism.app>
This commit is contained in:
Michael Mayer 2023-11-20 11:43:54 +01:00
parent ac588057da
commit 717e616700
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
internal/photoprism/convert_image_png.go
View file

@ -41,16 +41,16 @@ func (c *Convert) PngConvertCommands(f *MediaFile, pngName string) (result []*ex
result = append(result, exec.Command(c.conf.JpegXLDecoderBin(), f.FileName(), pngName))
}
// Try ImageMagick for other image file formats if allowed.
if c.conf.ImageMagickEnabled() && c.imagemagickBlacklist.Allow(fileExt) &&
// SVG vector graphics can be converted with librsvg if installed,
// otherwise try to convert the media file with ImageMagick.
if c.conf.RsvgConvertEnabled() && f.IsSVG() {
args := []string{"-a", "-f", "png", "-o", pngName, f.FileName()}
result = append(result, exec.Command(c.conf.RsvgConvertBin(), args...))
} else if c.conf.ImageMagickEnabled() && c.imagemagickBlacklist.Allow(fileExt) &&
(f.IsImage() && !f.IsJpegXL() && !f.IsRaw() && !f.IsHEIF() || f.IsVector() && c.conf.VectorEnabled()) {
resize := fmt.Sprintf("%dx%d>", c.conf.PngSize(), c.conf.PngSize())
args := []string{f.FileName(), "-flatten", "-resize", resize, pngName}
result = append(result, exec.Command(c.conf.ImageMagickBin(), args...))
} else if f.IsVector() && c.conf.RsvgConvertEnabled() {
// Vector graphics may be also be converted with librsvg if installed.
args := []string{"-a", "-f", "png", "-o", pngName, f.FileName()}
result = append(result, exec.Command(c.conf.RsvgConvertBin(), args...))
}
// No suitable converter found?