Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pro Photo Upload Settings #759

Merged
merged 54 commits into from
Sep 24, 2020
Merged
Changes from 1 commit
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
2a2ad2f
Started implementing EXIF metadata viewer
Jul 1, 2020
1f74d6f
Conversion of APEX units. EXIF AUX section
Jul 2, 2020
8ba636d
Added histogram created with CoreImage
Jul 2, 2020
464f20b
Using more appropriate image creation method
Jul 6, 2020
dbabfbf
Added GPS location parsing / presentation
Jul 6, 2020
1eaa6f9
Made image details formatting more compact
Jul 6, 2020
3f72d49
Added header with image thumbnail, file size info
Jul 9, 2020
324b896
Added TIFF meta-data
Jul 9, 2020
06950ec
Merge branch 'milestone/1.4' into exif_metadata
hosy Jul 9, 2020
6fed7a3
Added TIFF:PhotometricInterpretation mapping
Jul 9, 2020
47b6427
Merge branch 'exif_metadata' of https://github.com/owncloud/ios-app i…
Jul 9, 2020
0d6668b
Small fixes in the EXIF meta data view
Jul 10, 2020
adbb541
Moved GPS data to the top, improved exposure bias formatting
Jul 10, 2020
108cd44
few text formatting fixes
Jul 13, 2020
b5d8f45
Layout changes to make metadata view look nicer on iPad
Jul 15, 2020
1dd8f28
Pro photo features configured as IAP
Jul 15, 2020
dc066ad
Localization changes
Jul 16, 2020
66b514c
Fixed wrong text formatting
Jul 21, 2020
1c947e1
Merge remote-tracking branch 'origin/exif_metadata' into pro_photo_fe…
Jul 24, 2020
22c9e2f
Started implemented pro photo upload settings
Jul 24, 2020
5738b9b
Added extended photo upload settings
Jul 24, 2020
9999dd8
First functioning implementation
Jul 27, 2020
b7dcd64
Fixed issue with image preview rotation
Jul 27, 2020
c7fce7c
Fixed rotation issue in image preview
Jul 27, 2020
003f8a6
Fixed incorrect image dimensions in case of RAW photo
Jul 27, 2020
2cf65e9
Added a RAW photo badge in photo picker
Jul 29, 2020
a5390a7
Added ‘Pro Photo’ IAP as a single purchasable product
Jul 31, 2020
4a98944
Merge remote-tracking branch 'origin/exif_metadata' into feature/pro_…
Jul 31, 2020
6e0d621
Changed wording and added localized strings
Jul 31, 2020
3cdc037
Check user eligibility for using pro photo upload features
Aug 3, 2020
4c50d61
Fixed code review findings
Aug 4, 2020
a1bda90
Fixed review findings
Aug 26, 2020
86f84b7
Changed app store IAP identifier for Pro Photo package
Aug 26, 2020
c925dc0
Merge branch 'milestone/11.4.1' into exif_metadata
Aug 31, 2020
de59ce4
Update oC SDK
Aug 31, 2020
6f54fb1
Fixed issues with previously merged code not buildable
Sep 1, 2020
a889496
Merge remote-tracking branch 'origin/milestone/11.4.1' into exif_meta…
Sep 13, 2020
e2d1992
Merge remote-tracking branch 'origin/milestone/11.4.1' into feature/p…
Sep 13, 2020
c8eb89d
Updated oc SDK
Sep 13, 2020
905f485
Merged latest changes and made branch buildable again
Sep 13, 2020
2eb113c
Merge remote-tracking branch 'origin/exif_metadata' into feature/pro_…
Sep 13, 2020
3dca155
Merge remote-tracking branch 'origin/milestone/11.4.1' into feature/p…
felix-schwarz Sep 15, 2020
42eba22
- revert reverted changes in ownCloud File Provider/OCItem+FileProvid…
felix-schwarz Sep 15, 2020
e8ca954
- revert logging-related reverts performed by 72c2d80aef726f9a18a97cc…
felix-schwarz Sep 15, 2020
f07b9bb
- revert bugfix removal originating from 905f485
felix-schwarz Sep 15, 2020
06a5948
Avoid recomputing badge images used in table view cells
Sep 16, 2020
3364b13
Corrected review findings
Sep 16, 2020
a8381af
Fixed latest review findings
Sep 17, 2020
325a8e3
Made code more reliable in terms of reacting to account changes in a …
Sep 18, 2020
0112183
Merge remote-tracking branch 'origin/milestone/11.4.1' into feature/p…
Sep 23, 2020
706c7dc
Changed the logic how photo resource is chosen for export
Sep 23, 2020
5dfcb12
More robust detection of RAW assets
Sep 23, 2020
612fe29
Don’t show prefer RAW option if there is no camera on board which wou…
Sep 23, 2020
c17fc0c
Fixed compilation issues with Xcode 11.7
Sep 24, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fixed incorrect image dimensions in case of RAW photo
Michael Neuwert committed Jul 27, 2020

Verified

This commit was signed with the committer’s verified signature. The key has expired.
kylekurz Kyle Kurz
commit 003f8a6a829034a00101cdcb55284d247697229f
16 changes: 13 additions & 3 deletions ownCloud/Client/Actions/ImageMetadataViewController.swift
Original file line number Diff line number Diff line change
@@ -483,9 +483,19 @@ class ImageMetadataParser {
result.profile = profile
}

if let height = imageProperties[kCGImagePropertyPixelHeight as String] as? CGFloat,
let width = imageProperties[kCGImagePropertyPixelWidth as String] as? CGFloat {
result.size = CGSize(width: width, height: height)
result.size = CGSize.zero
if let exifDict = imageProperties[kCGImagePropertyExifDictionary as String] as? [String : Any] {
if let height = exifDict[kCGImagePropertyExifPixelYDimension as String] as? CGFloat,
let width = exifDict[kCGImagePropertyExifPixelXDimension as String] as? CGFloat {
result.size = CGSize(width: width, height: height)
}
}

if result.size == CGSize.zero {
if let height = imageProperties[kCGImagePropertyPixelHeight as String] as? CGFloat,
let width = imageProperties[kCGImagePropertyPixelWidth as String] as? CGFloat {
result.size = CGSize(width: width, height: height)
}
}

if let dpi = imageProperties[kCGImagePropertyDPIHeight as String] as? Int {