mirror of https://github.com/halo-dev/halo
fix: vertical images are rotated to horizontal when generating thumbnails (#6842)
#### What type of PR is this? /kind improvement /area core /milestone 2.20.x #### What this PR does / why we need it: 修复竖向图片生成缩略图后会丢失方向信息展示为横向图片的问题 #### Which issue(s) this PR fixes: Fixes #6802 #### Does this PR introduce a user-facing change? ```release-note 修复竖向图片生成缩略图后会丢失方向信息展示为横向图片的问题 ```pull/6849/head v2.20.0-rc.2
parent
b761fe2b79
commit
3bdec9eacf
|
@ -68,6 +68,7 @@ dependencies {
|
|||
api "org.thymeleaf.extras:thymeleaf-extras-springsecurity6"
|
||||
api 'org.apache.tika:tika-core'
|
||||
api "org.imgscalr:imgscalr-lib"
|
||||
api 'com.drewnoakes:metadata-extractor'
|
||||
|
||||
api "io.github.resilience4j:resilience4j-spring-boot3"
|
||||
api "io.github.resilience4j:resilience4j-reactor"
|
||||
|
|
|
@ -2,6 +2,10 @@ package run.halo.app.core.attachment;
|
|||
|
||||
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
|
||||
|
||||
import com.drew.imaging.ImageMetadataReader;
|
||||
import com.drew.metadata.Directory;
|
||||
import com.drew.metadata.Metadata;
|
||||
import com.drew.metadata.exif.ExifIFD0Directory;
|
||||
import java.io.File;
|
||||
import java.io.FileOutputStream;
|
||||
import java.io.IOException;
|
||||
|
@ -92,9 +96,38 @@ public class ThumbnailGenerator {
|
|||
}
|
||||
var thumbnail = Scalr.resize(img, Scalr.Method.AUTOMATIC, Scalr.Mode.FIT_TO_WIDTH,
|
||||
size.getWidth());
|
||||
// Rotate image if needed
|
||||
var orientation = readExifOrientation(file);
|
||||
if (orientation != null) {
|
||||
thumbnail = Scalr.rotate(thumbnail, orientation);
|
||||
}
|
||||
ImageIO.write(thumbnail, formatName, thumbnailFile);
|
||||
}
|
||||
|
||||
private static Scalr.Rotation readExifOrientation(File inputFile) {
|
||||
try {
|
||||
Metadata metadata = ImageMetadataReader.readMetadata(inputFile);
|
||||
Directory directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
|
||||
if (directory != null && directory.containsTag(ExifIFD0Directory.TAG_ORIENTATION)) {
|
||||
return getScalrRotationFromExifOrientation(
|
||||
directory.getInt(ExifIFD0Directory.TAG_ORIENTATION));
|
||||
}
|
||||
} catch (Exception e) {
|
||||
log.debug("Failed to read EXIF orientation from file: {}", inputFile, e);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static Scalr.Rotation getScalrRotationFromExifOrientation(int orientation) {
|
||||
// https://www.media.mit.edu/pia/Research/deepview/exif.html#:~:text=0x0112-,Orientation,-unsigned%20short
|
||||
return switch (orientation) {
|
||||
case 3 -> Scalr.Rotation.CW_180;
|
||||
case 6 -> Scalr.Rotation.CW_90;
|
||||
case 8 -> Scalr.Rotation.CW_270;
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
|
||||
private static boolean isUnsupportedFormat(@NonNull String formatName) {
|
||||
return UNSUPPORTED_FORMATS.contains(formatName.toLowerCase());
|
||||
}
|
||||
|
|
|
@ -24,6 +24,7 @@ ext {
|
|||
twoFactorAuth = "1.3"
|
||||
tika = "2.9.2"
|
||||
imgscalr = '4.2'
|
||||
exifExtractor = '2.19.0'
|
||||
}
|
||||
|
||||
javaPlatform {
|
||||
|
@ -58,6 +59,7 @@ dependencies {
|
|||
api "com.j256.two-factor-auth:two-factor-auth:$twoFactorAuth"
|
||||
api "org.apache.tika:tika-core:$tika"
|
||||
api "org.imgscalr:imgscalr-lib:$imgscalr"
|
||||
api "com.drewnoakes:metadata-extractor:$exifExtractor"
|
||||
}
|
||||
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue