diff --git a/.gitignore b/.gitignore index 7fd0e9d..bc371fc 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,8 @@ android/build.properties android/build/ android/dist/ android/libs/ +/ios/imagefactory.xcodeproj/project.xcworkspace +/ios/imagefactory.xcodeproj/xcuserdata +/ios/build +/ios/Classes/TiImagefactoryModuleAssets.m +/ios/metadata.json diff --git a/ios/Classes/TiImagefactoryModule.m b/ios/Classes/TiImagefactoryModule.m index ed8db43..41ed2d0 100644 --- a/ios/Classes/TiImagefactoryModule.m +++ b/ios/Classes/TiImagefactoryModule.m @@ -106,9 +106,10 @@ +(UIImage*)imageTransform:(TransformType)type image:(UIImage*)image withArgs:(id return [TiImageFactory imageTransparentBorder:image withArgs:args]; case kTransformAlpha: return [TiImageFactory imageAlpha:image withArgs:args]; - } - - return image; + case kTransformNone: + default: + return image; + } } +(id)imageTransform:(TransformType)type withArgs:(id)args diff --git a/ios/Classes/UIImage/TiUIImage+Resize.m b/ios/Classes/UIImage/TiUIImage+Resize.m index eeedecd..f7bedae 100644 --- a/ios/Classes/UIImage/TiUIImage+Resize.m +++ b/ios/Classes/UIImage/TiUIImage+Resize.m @@ -210,7 +210,7 @@ + (UIImage *)resizedImageWithContentMode:(UIViewContentMode)contentMode break; default: - [NSException raise:NSInvalidArgumentException format:@"Unsupported content mode: %d", contentMode]; + [NSException raise:NSInvalidArgumentException format:@"Unsupported content mode: %ld", (long)contentMode]; } CGSize newSize = CGSizeMake(image.size.width * ratio, image.size.height * ratio); diff --git a/ios/imagefactory.xcodeproj/project.pbxproj b/ios/imagefactory.xcodeproj/project.pbxproj index 1609193..4db6ec8 100644 --- a/ios/imagefactory.xcodeproj/project.pbxproj +++ b/ios/imagefactory.xcodeproj/project.pbxproj @@ -287,6 +287,7 @@ RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Debug; }; @@ -325,6 +326,7 @@ RUN_CLANG_STATIC_ANALYZER = NO; SDKROOT = iphoneos; USER_HEADER_SEARCH_PATHS = ""; + VALID_ARCHS = "$(ARCHS_STANDARD)"; }; name = Release; }; diff --git a/ios/manifest b/ios/manifest index cb063aa..1e1652a 100644 --- a/ios/manifest +++ b/ios/manifest @@ -2,13 +2,13 @@ # this is your module manifest and used by Titanium # during compilation, packaging, distribution, etc. # -version: 1.2.0 +version: 1.2.1 apiversion: 2 architectures: armv7 i386 x86_64 arm64 description: Image Factory author: Jeff English license: Apache License, Version 2.0 -copyright: Copyright (c) 2013-2014 by Appcelerator, Inc. +copyright: Copyright (c) 2013-2017 by Appcelerator, Inc. # these should not be edited @@ -16,4 +16,4 @@ name: imagefactory moduleid: ti.imagefactory guid: 0aab25d7-0486-40ab-94a3-ed4f9a293414 platform: iphone -minsdk: 3.4.1.GA +minsdk: 5.0.0.GA diff --git a/ios/titanium.xcconfig b/ios/titanium.xcconfig index d43542b..6208335 100644 --- a/ios/titanium.xcconfig +++ b/ios/titanium.xcconfig @@ -4,7 +4,7 @@ // OF YOUR TITANIUM SDK YOU'RE BUILDING FOR // // -TITANIUM_SDK_VERSION = 3.4.1.GA +TITANIUM_SDK_VERSION = 6.0.1.GA //