Skip to content

Commit

Permalink
Merge branch 'refs/heads/fix_xcode5_warnings'
Browse files Browse the repository at this point in the history 
Conflicts:
	framework/Source/GPUImageHSBFilter.m
  • Loading branch information
利辺羅エルネスト committed Dec 9, 2013
2 parents 2e8df3d + 46bb9ad commit a62b2e5
Show file tree
Hide file tree
Showing 5 changed files with 75 additions and 10 deletions.
Binary file added examples/iOS/FilterShowcase/Default-568h@2x.png
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 24 additions & 3 deletions examples/iOS/FilterShowcase/FilterShowcase.xcodeproj/project.pbxproj
View file
Expand Up @@ -36,6 +36,7 @@
BCF9D9AC15CCD1AF007E7FBA /* lookup_miss_etikate.png in Resources */ = {isa = PBXBuildFile; fileRef = BCF9D9A815CCD1AF007E7FBA /* lookup_miss_etikate.png */; };
BCF9D9AD15CCD1AF007E7FBA /* lookup_soft_elegance_1.png in Resources */ = {isa = PBXBuildFile; fileRef = BCF9D9A915CCD1AF007E7FBA /* lookup_soft_elegance_1.png */; };
BCF9D9AE15CCD1AF007E7FBA /* lookup_soft_elegance_2.png in Resources */ = {isa = PBXBuildFile; fileRef = BCF9D9AA15CCD1AF007E7FBA /* lookup_soft_elegance_2.png */; };
E5530A36180FD1D500597F98 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = E5530A35180FD1D500597F98 /* Default-568h@2x.png */; };
F2F3361E156585C400B0FBB8 /* voroni_points2.png in Resources */ = {isa = PBXBuildFile; fileRef = F2F3361D156585C400B0FBB8 /* voroni_points2.png */; };
F2F336271565906000B0FBB8 /* dotletterstiles.png in Resources */ = {isa = PBXBuildFile; fileRef = F2F336261565906000B0FBB8 /* dotletterstiles.png */; };
F2F33629156591CA00B0FBB8 /* curvies.png in Resources */ = {isa = PBXBuildFile; fileRef = F2F33628156591CA00B0FBB8 /* curvies.png */; };
Expand Down Expand Up @@ -102,6 +103,7 @@
BCF9D9A815CCD1AF007E7FBA /* lookup_miss_etikate.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lookup_miss_etikate.png; path = ../../../../framework/Resources/lookup_miss_etikate.png; sourceTree = "<group>"; };
BCF9D9A915CCD1AF007E7FBA /* lookup_soft_elegance_1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lookup_soft_elegance_1.png; path = ../../../../framework/Resources/lookup_soft_elegance_1.png; sourceTree = "<group>"; };
BCF9D9AA15CCD1AF007E7FBA /* lookup_soft_elegance_2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = lookup_soft_elegance_2.png; path = ../../../../framework/Resources/lookup_soft_elegance_2.png; sourceTree = "<group>"; };
E5530A35180FD1D500597F98 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
F2F3361D156585C400B0FBB8 /* voroni_points2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = voroni_points2.png; sourceTree = "<group>"; };
F2F336261565906000B0FBB8 /* dotletterstiles.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = dotletterstiles.png; sourceTree = "<group>"; };
F2F33628156591CA00B0FBB8 /* curvies.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = curvies.png; sourceTree = "<group>"; };
Expand Down Expand Up @@ -132,6 +134,7 @@
BC982AF714F046AC0001FF6F = {
isa = PBXGroup;
children = (
E5530A35180FD1D500597F98 /* Default-568h@2x.png */,
BC982B0C14F046AC0001FF6F /* FilterShowcase */,
BC982B0514F046AC0001FF6F /* Frameworks */,
BC982B0314F046AC0001FF6F /* Products */,
Expand Down Expand Up @@ -243,7 +246,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = Showcase;
LastUpgradeCheck = 0430;
LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Cell Phone";
};
buildConfigurationList = BC982AFC14F046AC0001FF6F /* Build configuration list for PBXProject "FilterShowcase" */;
Expand Down Expand Up @@ -304,6 +307,7 @@
BCF9D9AB15CCD1AF007E7FBA /* lookup_amatorka.png in Resources */,
BCF9D9AC15CCD1AF007E7FBA /* lookup_miss_etikate.png in Resources */,
BCF9D9AD15CCD1AF007E7FBA /* lookup_soft_elegance_1.png in Resources */,
E5530A36180FD1D500597F98 /* Default-568h@2x.png in Resources */,
BCF9D9AE15CCD1AF007E7FBA /* lookup_soft_elegance_2.png in Resources */,
BCB3C3C516BCA2EB003D26B0 /* Icon-72.png in Resources */,
BCB3C3C616BCA2EB003D26B0 /* Icon-72@2x.png in Resources */,
Expand Down Expand Up @@ -353,8 +357,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -366,11 +375,15 @@
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
ONLY_ACTIVE_ARCH = YES;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
Expand All @@ -381,14 +394,22 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "../../../framework/**";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
Expand Down
9 changes: 5 additions & 4 deletions examples/iOS/FilterShowcase/FilterShowcase/ShowcaseFilterViewController.m
View file
Expand Up @@ -1508,21 +1508,22 @@ - (void)setupFilter;
[self.view addSubview:faceView];
faceView.hidden = YES;

__unsafe_unretained ShowcaseFilterViewController * weakSelf = self;
[(GPUImageMotionDetector *) filter setMotionDetectionBlock:^(CGPoint motionCentroid, CGFloat motionIntensity, CMTime frameTime) {
if (motionIntensity > 0.01)
{
CGFloat motionBoxWidth = 1500.0 * motionIntensity;
CGSize viewBounds = self.view.bounds.size;
CGSize viewBounds = weakSelf.view.bounds.size;
dispatch_async(dispatch_get_main_queue(), ^{
faceView.frame = CGRectMake(round(viewBounds.width * motionCentroid.x - motionBoxWidth / 2.0), round(viewBounds.height * motionCentroid.y - motionBoxWidth / 2.0), motionBoxWidth, motionBoxWidth);
faceView.hidden = NO;
weakSelf->faceView.frame = CGRectMake(round(viewBounds.width * motionCentroid.x - motionBoxWidth / 2.0), round(viewBounds.height * motionCentroid.y - motionBoxWidth / 2.0), motionBoxWidth, motionBoxWidth);
weakSelf->faceView.hidden = NO;
});

}
else
{
dispatch_async(dispatch_get_main_queue(), ^{
faceView.hidden = YES;
weakSelf->faceView.hidden = YES;
});
}

Expand Down
15 changes: 12 additions & 3 deletions framework/GPUImage.xcodeproj/project.pbxproj
View file
Expand Up @@ -1396,7 +1396,7 @@
BCF1A32B14DDB1EC00852800 /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0460;
LastUpgradeCheck = 0500;
ORGANIZATIONNAME = "Brad Larson";
};
buildConfigurationList = BCF1A32E14DDB1EC00852800 /* Build configuration list for PBXProject "GPUImage" */;
Expand Down Expand Up @@ -1675,9 +1675,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
Expand All @@ -1692,11 +1693,15 @@
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
ONLY_ACTIVE_ARCH = YES;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
SYMROOT = "$(PROJECT_DIR)/../build";
Expand All @@ -1707,19 +1712,23 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
RUN_CLANG_STATIC_ANALYZER = YES;
Expand Down
34 changes: 34 additions & 0 deletions framework/Source/GPUImageHSBFilter.m
View file
Expand Up @@ -328,6 +328,40 @@ static void zshearmat(mat,dx,dy)
matrixmult(mmat,mat,mat);
}

/*
* simplehuerotatemat -
* simple hue rotation. This changes luminance
*/
//static void simplehuerotatemat(mat,rot)
//float mat[4][4];
//float rot;
//{
// float mag;
// float xrs, xrc;
// float yrs, yrc;
// float zrs, zrc;
//
// /* rotate the grey vector into positive Z */
// mag = sqrt(2.0);
// xrs = 1.0/mag;
// xrc = 1.0/mag;
// xrotatemat(mat,xrs,xrc);
//
// mag = sqrt(3.0);
// yrs = -1.0/mag;
// yrc = sqrt(2.0)/mag;
// yrotatemat(mat,yrs,yrc);
//
// /* rotate the hue */
// zrs = sin(rot*M_PI/180.0);
// zrc = cos(rot*M_PI/180.0);
// zrotatemat(mat,zrs,zrc);
//
// /* rotate the grey vector back into place */
// yrotatemat(mat,-yrs,yrc);
// xrotatemat(mat,-xrs,xrc);
//}

/*
* huerotatemat -
* rotate the hue, while maintaining luminance.
Expand Down

0 comments on commit a62b2e5

Please sign in to comment.