-
Notifications
You must be signed in to change notification settings - Fork 511
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
[ImageIO] Update to Xcode 9 #2353
Merged
Merged
Changes from all commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
51964a4
[ImageIO] Update to Xcode 9
3b95a18
Fix PR comments
2bacb0c
Mark fields internal and use IntPtrs. GetHandle instead of ?.Handle
257d779
Merge branch 'xcode9' of github.com:xamarin/xamarin-macios into ImageIO
4cc16ec
Fix build issues
e8ab921
Add missing availability attributes
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -376,5 +376,44 @@ public CGImageSourceStatus GetStatus (int index) | |
{ | ||
return CGImageSourceGetStatusAtIndex (handle, index); | ||
} | ||
|
||
[Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)] | ||
[DllImport (Constants.ImageIOLibrary)] | ||
static extern IntPtr /* CFDictionaryRef* */ CGImageSourceCopyAuxiliaryDataInfoAtIndex (IntPtr /* CGImageSourceRef* */ isrc, nuint index, IntPtr /* CFStringRef* */ auxiliaryImageDataType); | ||
|
||
[Watch (4, 0), TV (11, 0), Mac (10, 13), iOS (11, 0)] | ||
public CGImageAuxiliaryDataInfo CopyAuxiliaryDataInfo (CGImageSource imageSource, nuint index, CGImageAuxiliaryDataType auxiliaryImageDataType) | ||
{ | ||
var ptr = CGImageSourceCopyAuxiliaryDataInfoAtIndex (imageSource.GetHandle (), index, auxiliaryImageDataType.GetConstant ().GetHandle ()); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Arguments that shouldn't be null should be validated (null-checked) and ArgumentNullException should be thrown. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Same as above |
||
if (ptr == IntPtr.Zero) | ||
return null; | ||
|
||
var info = new CGImageAuxiliaryDataInfo (); | ||
|
||
using (var dictionary = Runtime.GetNSObject<NSDictionary> (ptr)) { | ||
bool success; | ||
|
||
NSData data; | ||
success = dictionary.TryGetValue<NSData> (new NSString (CGImageAuxiliaryDataInfo.Data), out data); | ||
|
||
if (success) | ||
info.DepthData = data; | ||
|
||
NSDictionary dict; | ||
success = dictionary.TryGetValue<NSDictionary> (new NSString (CGImageAuxiliaryDataInfo.DataDescription), out dict); | ||
|
||
if (success) | ||
info.DepthDataDescription = dict; | ||
|
||
CGImageMetadata metadata; | ||
success = dictionary.TryGetValue<CGImageMetadata> (new NSString (CGImageAuxiliaryDataInfo.kMetadata), out metadata); | ||
|
||
if (success) | ||
info.Metadata = metadata; | ||
} | ||
|
||
return info; | ||
|
||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If
auxiliaryDataInfo
is null,dict
will be null, which will throw an NRE.Arguments that shouldn't be null should be validated (null-checked) and ArgumentNullException should be thrown.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
GetHandle is an extension method, so it won't crash when dict is null. For a null value, dict.GetHandle () should return IntPtr.Zero