Fix the drawing tests to not use Objective-C and build on OS X. #1470
Conversation
|
|
||
| virtual std::string GetResourcePath(const std::string& resource) override { | ||
| // Using / as a path separator is valid on both Windows and OS X. | ||
| return __ModuleDirectory() + "/data/" + resource; |
There was a problem hiding this comment.
"/data/" [](start = 36, length = 10)
Curious: In windows the files aren't copied into data.
Also it would be better not to hard code /data/ in this function and pass it in?
(make it more generic? maybe?) #ByDesign
There was a problem hiding this comment.
The Drawing test vcxproj absolutely copies a data/ directory.
If we standardize on data/, we don't have to propagate that decision into every test file consumer (and centralizing it here lets us change it in a single place if we do decide to.) #ByDesign
There was a problem hiding this comment.
for some reason I was thinking it wasn't. Double checked and it is.
gotcha.
In reply to: 90145289 [](ancestors = 90145289)
Yes. This is a static member function on DrawingTestConfig. Since we cannot annotate it as such via classical means, this comment serves to illustrate that it is static. In reply to: 263743436 [](ancestors = 263743436) Refers to: tests/UnitTests/CoreGraphics.drawing/EntryPoint.cpp:93 in f000645. [](commit_id = f000645, deletion_comment = False) |
| @@ -576,8 +576,7 @@ bool _CGIsValidRenderTargetPixelFormat(WICPixelFormatGUID pixelFormat) { | |||
| HRESULT _CGImageGetWICImageSource(CGImageRef image, IWICBitmap** source) { | |||
| RETURN_HR_IF_NULL(E_INVALIDARG, image); | |||
| RETURN_HR_IF_NULL(E_POINTER, source); | |||
| *source = image->ImageSource().Get(); | |||
| return S_OK; | |||
| return image->ImageSource().CopyTo(source); | |||
|
|
||
| DISABLED_DRAW_TEST_F(CGContext, DrawIntoRect, UIKitMimicTest) { | ||
| // Draw a portion of an image into a different region. | ||
| CFDataRef data = (CFDataRef)[NSData dataWithContentsOfFile:getPathToFile(@"png3.9.png")]; | ||
| woc::unique_cf<CGDataProviderRef> dataProvider(CGDataProviderCreateWithCFData(data)); | ||
| auto drawingConfig = DrawingTestConfig::Get(); |
There was a problem hiding this comment.
nit: not a good use of auto when the return type is known.
There was a problem hiding this comment.
This fixes #1453 and #1448.
I thought that #1453 was the cause of the teardown crash I was seeing, so it got fixed here; it turns out that CGImageDestination was overreleasing a CGImage's CGDataProvider.
This change is