xuthus/pigallery2
1
0
Fork 0
mirror of https://github.com/xuthus83/pigallery2.git synced 2024-11-03 21:04:03 +08:00
Code Actions Projects Activity

fixing exif orientation bug on map

Browse Source
This commit is contained in:
Patrik J. Braun 2018-11-02 11:44:13 +01:00
parent 64dc2ef2d8
commit 205f98e654
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/model/sql/enitites/PhotoEntity.ts
View File

@ -80,7 +80,7 @@ export class PhotoMetadataEntity implements PhotoMetadata {
@Column(type => PositionMetaDataEntity)
positionData: PositionMetaDataEntity;
@Column('tinyint', {default: 1})
@Column('tinyint', {default: OrientationTypes.TOP_LEFT})
orientation: OrientationTypes;
@Column(type => ImageSizeEntity)

3
backend/model/threading/DiskMangerWorker.ts
View File

@ -93,7 +93,7 @@ export class DiskMangerWorker {
cameraData: {},
positionData: null,
size: {},
orientation: OrientationTypes.TOP_RIGHT,
orientation: OrientationTypes.TOP_LEFT,
creationDate: 0,
fileSize: 0
};
@ -133,6 +133,7 @@ export class DiskMangerWorker {
metadata.orientation = exif.tags.Orientation;
}
if (exif.imageSize) {
metadata.size = <ImageSize> {width: exif.imageSize.width, height: exif.imageSize.height};
} else if (exif.tags.RelatedImageWidth && exif.tags.RelatedImageHeight) {

7
frontend/app/gallery/map/lightbox/lightbox.map.gallery.component.ts
View File

@ -108,10 +108,11 @@ export class GalleryMapLightboxComponent implements OnChanges, AfterViewInit {
}).map(p => {
let width = 500;
let height = 500;
if (p.metadata.size.width > p.metadata.size.height) {
height = width * (p.metadata.size.height / p.metadata.size.width);
const rotatedSize = PhotoDTO.getRotatedSize(p);
if (rotatedSize.width > rotatedSize.height) {
height = width * (rotatedSize.height / rotatedSize.width);
} else {
width = height * (p.metadata.size.width / p.metadata.size.height);
width = height * (rotatedSize.width / rotatedSize.height);
}
const iconTh = this.thumbnailService.getIcon(new IconPhoto(p));
iconTh.Visible = true;