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

CoreImage:Implementation of CIImage using CGImage + test #1625

Merged
merged 5 commits into from
Jan 13, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 7 additions & 8 deletions Frameworks/CoreImage/CIContext.mm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//******************************************************************************
//
// Copyright (c) 2016 Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft. All rights reserved.
//
// This code is licensed under the MIT License (MIT).
//
Expand All @@ -17,7 +17,7 @@
#import <StubReturn.h>
#import <CoreImage/CIContext.h>

#include "Starboard.h"
#import <Starboard.h>
#import "CIImageInternal.h"

NSString* const kCIContextOutputColorSpace = @"kCIContextOutputColorSpace";
Expand Down Expand Up @@ -74,8 +74,7 @@ + (CIContext*)contextWithEAGLContext:(EAGLContext*)eaglContext options:(NSDictio
@Notes parameter dict is ignored.
*/
+ (CIContext*)contextWithOptions:(NSDictionary*)dict {
CIContext* context = [[CIContext alloc] init];
return context;
return [[CIContext alloc] init];
}
Copy link

@DHowett-MSFT DHowett-MSFT Jan 4, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know this is not your code, but now it is! This will leak. #ByDesign

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(I couldn't determine whether ARC was on for this framework.)


In reply to: 94636333 [](ancestors = 94636333)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same reason I touched it, but ARC is enabled :)


In reply to: 94636365 [](ancestors = 94636365,94636333)


/**
Expand Down Expand Up @@ -158,10 +157,10 @@ - (void)render:(CIImage*)image toCVPixelBuffer:(CVPixelBufferRef)buffer bounds:(
@Notes
*/
- (void)render:(CIImage*)image
toMTLTexture:(id<MTLTexture>)texture
commandBuffer:(id<MTLCommandBuffer>)commandBuffer
bounds:(CGRect)bounds
colorSpace:(CGColorSpaceRef)colorSpace {
toMTLTexture:(id<MTLTexture>)texture
commandBuffer:(id<MTLCommandBuffer>)commandBuffer
bounds:(CGRect)bounds
colorSpace:(CGColorSpaceRef)colorSpace {
UNIMPLEMENTED();
}

Expand Down
Loading