beenull/immich
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: rotation

Browse source
This commit is contained in:
martabal 2023-12-02 22:02:45 +01:00
parent 14120e0c65
commit 9fdc982ca6
No known key found for this signature in database
GPG key ID: C00196E3148A52BD
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
server/src/domain/asset/dto/asset.dto.ts
View file

@ -205,9 +205,9 @@ export class AssetBulkUpdateDto extends BulkIdsDto {
longitude?: number; longitude?: number;
@Optional() @Optional()
@IsInt()
@Min(1) @Min(1)
@Max(8) @Max(8)
@IsInt()
@Type(() => Number) @Type(() => Number)
orientation?: number; orientation?: number;
} }
@ -240,9 +240,9 @@ export class UpdateAssetDto {
longitude?: number; longitude?: number;
@Optional() @Optional()
@IsInt()
@Min(1) @Min(1)
@Max(8) @Max(8)
@IsInt()
@Type(() => Number) @Type(() => Number)
orientation?: number; orientation?: number;
} }

9
web/src/lib/components/asset-viewer/photo-viewer.svelte
View file

@ -30,14 +30,19 @@
// } // }
// }; // };
const getRotationModulo = (rotation: number): number => {
return ((rotation % 360) + 360) % 360;
};
$: { $: {
$zoomImageWheelState.currentRotation === 0 || $zoomImageWheelState.currentRotation === 180 getRotationModulo($zoomImageWheelState.currentRotation) === 0 ||
getRotationModulo($zoomImageWheelState.currentRotation) === 180
? ([imgHeight, imgWidth] = [clientHeight, clientWidth]) ? ([imgHeight, imgWidth] = [clientHeight, clientWidth])
: ([imgWidth, imgHeight] = [clientHeight, clientWidth]); : ([imgWidth, imgHeight] = [clientHeight, clientWidth]);
} }
const rotationToOrientation = (rotation: number): number => { const rotationToOrientation = (rotation: number): number => {
switch (((rotation % 360) + 360) % 360) { switch (getRotationModulo(rotation)) {
case 0: case 0:
return 1; return 1;
case 90: case 90: