Explicit casts due to build settings

Nyx0uf · Sep 27, 2012 · 3281cd4 · 3281cd4
1 parent 64d9141
commit 3281cd4
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 21 deletions.
diff --git a/Categories/UIImage+Masking.h b/Categories/UIImage+Masking.h
@@ -3,7 +3,7 @@
 //  NYXImagesKit
 //
 //  Created by @Nyx0uf on 02/06/11.
-//  Copyright 2012 Benjamin Godard. All rights reserved.
+//  Copyright 2012 Nyx0uf. All rights reserved.
 //  www.cocoaintheshell.com
 //
 

diff --git a/Categories/UIImage+Masking.m b/Categories/UIImage+Masking.m
@@ -3,7 +3,7 @@
 //  NYXImagesKit
 //
 //  Created by @Nyx0uf on 02/06/11.
-//  Copyright 2012 Benjamin Godard. All rights reserved.
+//  Copyright 2012 Nyx0uf. All rights reserved.
 //  www.cocoaintheshell.com
 //
 
@@ -16,8 +16,8 @@ @implementation UIImage (NYX_Masking)
 -(UIImage*)maskWithImage:(UIImage*)maskImage
 {
 	/// Create a bitmap context with valid alpha
-	const size_t originalWidth = self.size.width;
-	const size_t originalHeight = self.size.height;
+	const size_t originalWidth = (size_t)self.size.width;
+	const size_t originalHeight = (size_t)self.size.height;
 	CGContextRef bmContext = NYXCreateARGBBitmapContext(originalWidth, originalHeight, 0);
 	if (!bmContext)
 		return nil;
@@ -29,7 +29,7 @@ -(UIImage*)maskWithImage:(UIImage*)maskImage
 
 	/// Image mask
 	CGImageRef cgMaskImage = maskImage.CGImage; 
-	CGImageRef mask = CGImageMaskCreate(maskImage.size.width, maskImage.size.height, CGImageGetBitsPerComponent(cgMaskImage), CGImageGetBitsPerPixel(cgMaskImage), CGImageGetBytesPerRow(cgMaskImage), CGImageGetDataProvider(cgMaskImage), NULL, false);
+	CGImageRef mask = CGImageMaskCreate((size_t)maskImage.size.width, (size_t)maskImage.size.height, CGImageGetBitsPerComponent(cgMaskImage), CGImageGetBitsPerPixel(cgMaskImage), CGImageGetBytesPerRow(cgMaskImage), CGImageGetDataProvider(cgMaskImage), NULL, false);
 
 	/// Draw the original image in the bitmap context
 	const CGRect r = (CGRect){.origin.x = 0.0f, .origin.y = 0.0f, .size.width = originalWidth, .size.height = originalHeight};

diff --git a/Categories/UIImage+Rotating.h b/Categories/UIImage+Rotating.h
@@ -3,7 +3,7 @@
 //  NYXImagesKit
 //
 //  Created by @Nyx0uf on 02/05/11.
-//  Copyright 2012 Benjamin Godard. All rights reserved.
+//  Copyright 2012 Nyx0uf. All rights reserved.
 //  www.cocoaintheshell.com
 //
 

diff --git a/Categories/UIImage+Rotating.m b/Categories/UIImage+Rotating.m
@@ -3,7 +3,7 @@
 //  NYXImagesKit
 //
 //  Created by @Nyx0uf on 02/05/11.
-//  Copyright 2012 Benjamin Godard. All rights reserved.
+//  Copyright 2012 Nyx0uf. All rights reserved.
 //  www.cocoaintheshell.com
 //
 
@@ -17,14 +17,14 @@ @implementation UIImage (NYX_Rotating)
 
 -(UIImage*)rotateInRadians:(float)radians
 {
-	const size_t width = self.size.width * self.scale;
-	const size_t height = self.size.height * self.scale;
+	const size_t width = (size_t)(self.size.width * self.scale);
+	const size_t height = (size_t)(self.size.height * self.scale);
 
 	CGRect imgRect = (CGRect){.origin.x = 0.0f, .origin.y = 0.0f, .size.width = width, .size.height = height};
 	CGRect rotatedRect = CGRectApplyAffineTransform(imgRect, CGAffineTransformMakeRotation(radians));
 
 	/// Create an ARGB bitmap context
-	CGContextRef bmContext = NYXCreateARGBBitmapContext(rotatedRect.size.width, rotatedRect.size.height, 0);
+	CGContextRef bmContext = NYXCreateARGBBitmapContext((size_t)rotatedRect.size.width, (size_t)rotatedRect.size.height, 0);
 	if (!bmContext)
 		return nil;
 
@@ -52,17 +52,14 @@ -(UIImage*)rotateInRadians:(float)radians
 
 -(UIImage*)rotateInDegrees:(float)degrees
 {
-	return [self rotateInRadians:NYX_DEGREES_TO_RADIANS(degrees)];
+	return [self rotateInRadians:(float)NYX_DEGREES_TO_RADIANS(degrees)];
 }
 
 -(UIImage*)rotateImagePixelsInRadians:(float)radians
 {
-	if (!(&vImageRotate_ARGB8888))
-		return nil;
-
 	/// Create an ARGB bitmap context
-	const size_t width = self.size.width * self.scale;
-	const size_t height = self.size.height * self.scale;
+	const size_t width = (size_t)(self.size.width * self.scale);
+	const size_t height = (size_t)(self.size.height * self.scale);
 	const size_t bytesPerRow = width * kNyxNumberOfComponentsPerARBGPixel;
 	CGContextRef bmContext = NYXCreateARGBBitmapContext(width, height, bytesPerRow);
 	if (!bmContext) 
@@ -96,14 +93,14 @@ -(UIImage*)rotateImagePixelsInRadians:(float)radians
 
 -(UIImage*)rotateImagePixelsInDegrees:(float)degrees
 {
-	return [self rotateImagePixelsInRadians:NYX_DEGREES_TO_RADIANS(degrees)];
+	return [self rotateImagePixelsInRadians:(float)NYX_DEGREES_TO_RADIANS(degrees)];
 }
 
 -(UIImage*)verticalFlip
 {
 	/// Create an ARGB bitmap context
-	const size_t originalWidth = self.size.width * self.scale;
-	const size_t originalHeight = self.size.height * self.scale;
+	const size_t originalWidth = (size_t)(self.size.width * self.scale);
+	const size_t originalHeight = (size_t)(self.size.height * self.scale);
 	CGContextRef bmContext = NYXCreateARGBBitmapContext(originalWidth, originalHeight, originalWidth * kNyxNumberOfComponentsPerARBGPixel);
 	if (!bmContext)
 		return nil;
@@ -133,8 +130,8 @@ -(UIImage*)verticalFlip
 -(UIImage*)horizontalFlip
 {
 	/// Create an ARGB bitmap context
-	const size_t originalWidth = self.size.width * self.scale;
-	const size_t originalHeight = self.size.height * self.scale;
+	const size_t originalWidth = (size_t)(self.size.width * self.scale);
+	const size_t originalHeight = (size_t)(self.size.height * self.scale);
 	CGContextRef bmContext = NYXCreateARGBBitmapContext(originalWidth, originalHeight, originalWidth * kNyxNumberOfComponentsPerARBGPixel);
 	if (!bmContext)
 		return nil;