AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix gyp files to allow ninja to build 64 bit on Mac.

Browse Source 
Fix warnings that cropped up building as 64-bit.

BUG=
R=bsalomon@google.com, bungeman@google.com

Author: mtklein@google.com

Review URL: https://chromiumcodereview.appspot.com/13852013

git-svn-id: http://skia.googlecode.com/svn/trunk@8814 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-04-22 20:26:44 +00:00
parent ea774d2a5a
commit 5d7ca957ed
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bench/DashBench.cpp
View File

@ -323,12 +323,13 @@ public:
enum LineType {
kHori_LineType,
kVert_LineType,
kDiag_LineType
kDiag_LineType,
kLineTypeCount
};
static const char* LineTypeName(LineType lt) {
static const char* gNames[] = { "hori", "vert", "diag" };
SkASSERT((size_t)lt <= SK_ARRAY_COUNT(gNames));
SK_COMPILE_ASSERT(kLineTypeCount == SK_ARRAY_COUNT(gNames), names_wrong_size);
return gNames[lt];
}
@ -356,6 +357,9 @@ public:
case kDiag_LineType:
matrix.setRotate(45, cx, cy);
break;
case kLineTypeCount:
// Not a real enum value.
break;
}
const SkScalar overshoot = 100*1000;

6
gyp/common_conditions.gypi
View File

@ -178,12 +178,12 @@
'conditions' : [
[ 'skia_arch_width == 64', {
'xcode_settings': {
'ARCHS': 'x86_64',
'ARCHS': ['x86_64'],
},
}],
[ 'skia_arch_width == 32', {
'xcode_settings': {
'ARCHS': 'i386',
'ARCHS': ['i386'],
},
}],
[ 'skia_warnings_as_errors', {
@ -274,7 +274,7 @@
},
},
'xcode_settings': {
'ARCHS': 'armv6 armv7',
'ARCHS': ['armv6', 'armv7'],
'CODE_SIGNING_REQUIRED': 'NO',
'CODE_SIGN_IDENTITY[sdk=iphoneos*]': '',
'IPHONEOS_DEPLOYMENT_TARGET': '<(ios_sdk_version)',

2
src/gpu/gl/GrGLSL.h
View File

@ -54,7 +54,7 @@ static inline int GrSLTypeToVecLength(GrSLType type) {
1, // kMat44f_GrSLType
1, // kSampler2D_GrSLType
};
GrAssert((size_t) type < GR_ARRAY_COUNT(kVecLengths));
GR_STATIC_ASSERT(kGrSLTypeCount == GR_ARRAY_COUNT(kVecLengths));
return kVecLengths[type];
}

2
src/gpu/gl/GrGpuGL.cpp
View File

@ -1966,7 +1966,7 @@ inline GrGLenum tile_to_gl_wrap(SkShader::TileMode tm) {
GR_GL_REPEAT,
GR_GL_MIRRORED_REPEAT
};
GrAssert((unsigned) tm <= SK_ARRAY_COUNT(gWrapModes));
GR_STATIC_ASSERT(SkShader::kTileModeCount == SK_ARRAY_COUNT(gWrapModes));
GR_STATIC_ASSERT(0 == SkShader::kClamp_TileMode);
GR_STATIC_ASSERT(1 == SkShader::kRepeat_TileMode);
GR_STATIC_ASSERT(2 == SkShader::kMirror_TileMode);

4
src/views/mac/SkTextFieldCell.m
View File

@ -25,8 +25,8 @@
inView:(NSView *)controlView
editor:(NSText *)textObj
delegate:(id)anObject
start:(int)selStart
length:(int)selLength {
start:(NSInteger)selStart
length:(NSInteger)selLength {
aRect = [self drawingRectForBounds:aRect];
selectingOrEditing = YES;
[super selectWithFrame:aRect