зеркало из https://github.com/mozilla/moz-skia.git
Fix warnings on Ubuntu13
Turn off warnings when building libwebp. Turn off warnings when building libjpeg. Initialize some variables immediately. NOTRY=True NOTREECHECKS=True BUG=skia:2213 BUG=skia:2214 R=bsalomon@google.com, halcanary@google.com Author: scroggo@google.com Review URL: https://codereview.chromium.org/175383002 git-svn-id: http://skia.googlecode.com/svn/trunk@13545 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
Родитель
032a52fd4c
Коммит
4324c3ba70
|
@ -101,14 +101,10 @@
|
|||
'../third_party/externals/libjpeg',
|
||||
],
|
||||
},
|
||||
'conditions': [
|
||||
[ 'skia_os != "win"', {
|
||||
'product_name': 'jpeg',
|
||||
'cflags': [
|
||||
'-Wno-main', # supresses warnings about naming things "main"
|
||||
],
|
||||
}],
|
||||
'cflags': [
|
||||
'-w', # supresses warnings
|
||||
],
|
||||
|
||||
},
|
||||
],
|
||||
}, {
|
||||
|
|
|
@ -34,6 +34,7 @@
|
|||
'../third_party/externals/libwebp/src/dec/vp8l.c',
|
||||
'../third_party/externals/libwebp/src/dec/webp.c',
|
||||
],
|
||||
'cflags': [ '-w' ],
|
||||
},
|
||||
{
|
||||
'target_name': 'libwebp_demux',
|
||||
|
@ -44,6 +45,7 @@
|
|||
'sources': [
|
||||
'../third_party/externals/libwebp/src/demux/demux.c',
|
||||
],
|
||||
'cflags': [ '-w' ],
|
||||
},
|
||||
{
|
||||
'target_name': 'libwebp_dsp',
|
||||
|
@ -62,6 +64,7 @@
|
|||
'../third_party/externals/libwebp/src/dsp/upsampling_sse2.c',
|
||||
'../third_party/externals/libwebp/src/dsp/yuv.c',
|
||||
],
|
||||
'cflags': [ '-w' ],
|
||||
'conditions': [
|
||||
['skia_os == "android"', {
|
||||
'dependencies' : [
|
||||
|
@ -87,7 +90,7 @@
|
|||
'cflags!': [
|
||||
'-mfpu=vfpv3-d16',
|
||||
],
|
||||
'cflags': [ '-mfpu=neon' ],
|
||||
'cflags': [ '-mfpu=neon', '-w' ],
|
||||
},{ # !(arm_version >= 7)
|
||||
'type': 'none',
|
||||
}],
|
||||
|
@ -139,6 +142,7 @@
|
|||
'../third_party/externals/libwebp/src/utils/thread.c',
|
||||
'../third_party/externals/libwebp/src/utils/utils.c',
|
||||
],
|
||||
'cflags': [ '-w' ],
|
||||
},
|
||||
{
|
||||
'target_name': 'libwebp',
|
||||
|
|
|
@ -372,7 +372,7 @@ const SkMemberInfo* SkDisplayType::GetMembers(SkAnimateMaker* maker,
|
|||
|
||||
const SkMemberInfo* SkDisplayType::GetMember(SkAnimateMaker* maker,
|
||||
SkDisplayTypes type, const char** matchPtr ) {
|
||||
int infoCount;
|
||||
int infoCount = 0; // Initialize to remove a warning.
|
||||
const SkMemberInfo* info = GetMembers(maker, type, &infoCount);
|
||||
info = SkMemberInfo::Find(info, infoCount, matchPtr);
|
||||
// SkASSERT(info);
|
||||
|
|
|
@ -154,7 +154,7 @@ bool GrGpuGL::programUnitTest(int maxStages) {
|
|||
|
||||
int currAttribIndex = 1; // we need to always leave room for position
|
||||
int currTextureCoordSet = 0;
|
||||
int attribIndices[2];
|
||||
int attribIndices[2] = { 0, 0 };
|
||||
GrTexture* dummyTextures[] = {dummyTexture1.get(), dummyTexture2.get()};
|
||||
|
||||
int numStages = random.nextULessThan(maxStages + 1);
|
||||
|
|
Загрузка…
Ссылка в новой задаче