From d49098d7a9b872c38978d0fc41cee8ee1204683f Mon Sep 17 00:00:00 2001 From: michael starke Date: Tue, 13 Oct 2015 16:36:56 +0200 Subject: [PATCH] fixed clang warnings for nullability Signed-off-by: michael starke --- MacPassTests/KPKIconLoading.m | 2 +- MacPassTests/KPKTestNSCoding.m | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/MacPassTests/KPKIconLoading.m b/MacPassTests/KPKIconLoading.m index a73d14c4..9e88c77e 100644 --- a/MacPassTests/KPKIconLoading.m +++ b/MacPassTests/KPKIconLoading.m @@ -43,7 +43,7 @@ XCTAssertNotNil(imageRep, @"One image rep shoudl be there"); XCTAssertTrue([imageRep isKindOfClass:repClass], @"Representation should be bitmap"); NSBitmapImageRep *bitmapRep = (NSBitmapImageRep *)imageRep; - NSData *pngData = [bitmapRep representationUsingType:NSPNGFileType properties:nil]; + NSData *pngData = [bitmapRep representationUsingType:NSPNGFileType properties:@{}]; XCTAssertEqualObjects(pngData, _imageData, @"Image and PNG data shoudl be identical"); } diff --git a/MacPassTests/KPKTestNSCoding.m b/MacPassTests/KPKTestNSCoding.m index 7de5da9d..152c7abe 100644 --- a/MacPassTests/KPKTestNSCoding.m +++ b/MacPassTests/KPKTestNSCoding.m @@ -83,16 +83,16 @@ KPKIcon *icon = [[KPKIcon alloc] initWithImageAtURL:imageURL]; NSData *data = [self encode:icon]; KPKIcon *decodedIcon = [self decode:data ofClass:[KPKIcon class]]; - NSBitmapImageRep *originalRep = [[icon.image representations] lastObject]; - NSBitmapImageRep *decodedRep = [[decodedIcon.image representations] lastObject]; + NSImageRep *originalRep = icon.image.representations.lastObject; + NSImageRep *decodedRep = decodedIcon.image.representations.lastObject; XCTAssertTrue([originalRep isKindOfClass:[NSBitmapImageRep class]]); XCTAssertTrue([decodedRep isKindOfClass:[NSBitmapImageRep class]]); /* We cannot assert bit depth since TIFF conversion might just strip a full white alpha channel XCTAssertEqual([originalRep bitsPerPixel], [decodedRep bitsPerPixel]); */ - XCTAssertEqual([originalRep pixelsHigh], [decodedRep pixelsHigh]); - XCTAssertEqual([originalRep pixelsWide], [decodedRep pixelsWide]); + XCTAssertEqual(originalRep.pixelsHigh, decodedRep.pixelsHigh); + XCTAssertEqual(originalRep.pixelsWide, decodedRep.pixelsWide); NSData *originalData = [icon.image TIFFRepresentation]; NSData *decodedData = [decodedIcon.image TIFFRepresentation];