mirrors/homebox
1
0
Fork 0
mirror of https://github.com/sysadminsmedia/homebox.git synced 2025-12-21 13:23:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix HEIC and JXL image rotation by properly reading orientation metadata

Browse Source 
Co-authored-by: tankerkiller125 <3457368+tankerkiller125@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2025-10-18 03:19:41 +00:00
parent 2184d08de9
commit 0516669b06
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
backend/internal/data/repo/repo_item_attachments.go
View File

@@ -629,7 +629,7 @@ func (r *AttachmentRepo) CreateThumbnail(ctx context.Context, groupId, attachmen
log.Debug().Msg("creating thumbnail for heic file") log.Debug().Msg("creating thumbnail for heic file")
img, err := heic.Decode(bytes.NewReader(contentBytes)) img, err := heic.Decode(bytes.NewReader(contentBytes))
if err != nil { if err != nil {
log.Err(err).Msg("failed to decode avif image") log.Err(err).Msg("failed to decode heic image")
err := tx.Rollback() err := tx.Rollback()
if err != nil { if err != nil {
return err return err
@@ -637,9 +637,9 @@ func (r *AttachmentRepo) CreateThumbnail(ctx context.Context, groupId, attachmen
return err return err
} }
log.Debug().Msg("reading original file orientation") log.Debug().Msg("reading original file orientation")
imageMeta, err := imagemeta.Decode(bytes.NewReader(contentBytes)) imageMeta, err := imagemeta.DecodeHeif(bytes.NewReader(contentBytes))
if err != nil { if err != nil {
log.Err(err).Msg("failed to decode original file content") log.Err(err).Msg("failed to decode heic file metadata")
err := tx.Rollback() err := tx.Rollback()
if err != nil { if err != nil {
return err return err
@@ -660,14 +660,22 @@ func (r *AttachmentRepo) CreateThumbnail(ctx context.Context, groupId, attachmen
log.Debug().Msg("creating thumbnail for jpegxl file") log.Debug().Msg("creating thumbnail for jpegxl file")
img, err := jpegxl.Decode(bytes.NewReader(contentBytes)) img, err := jpegxl.Decode(bytes.NewReader(contentBytes))
if err != nil { if err != nil {
log.Err(err).Msg("failed to decode avif image") log.Err(err).Msg("failed to decode jpegxl image")
err := tx.Rollback() err := tx.Rollback()
if err != nil { if err != nil {
return err return err
} }
return err return err
} }
thumbnailPath, err := r.processThumbnailFromImage(ctx, groupId, img, title, uint16(1)) log.Debug().Msg("reading original file orientation")
orientation := uint16(1) // Default orientation
imageMeta, err := imagemeta.Decode(bytes.NewReader(contentBytes))
if err != nil {
log.Debug().Msg("unable to decode jxl metadata, using default orientation")
} else {
orientation = uint16(imageMeta.Orientation)
}
thumbnailPath, err := r.processThumbnailFromImage(ctx, groupId, img, title, orientation)
if err != nil { if err != nil {
err := tx.Rollback() err := tx.Rollback()
if err != nil { if err != nil {