From d08d23b385d6bde45eab23123b0328e07f74201f Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 8 Jan 2014 21:16:14 +0000 Subject: [PATCH] Small tweaks to be able to build everything target: - fParsed is unused. - Quiet down a bogus -Wuninitialized warning in QWeakPointer. Tested Clang and GCC on Linux. BUG= R=bungeman@google.com Author: mtklein@google.com Review URL: https://codereview.chromium.org/128573002 git-svn-id: http://skia.googlecode.com/svn/trunk@12970 2bbb7eff-a529-9590-31e7-b0007b416f81 --- experimental/PdfViewer/SkPdfFont.cpp | 2 +- experimental/PdfViewer/SkPdfFont.h | 1 - gyp/debugger.gyp | 4 ++++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/experimental/PdfViewer/SkPdfFont.cpp b/experimental/PdfViewer/SkPdfFont.cpp index 548a17e534..71cc851f78 100644 --- a/experimental/PdfViewer/SkPdfFont.cpp +++ b/experimental/PdfViewer/SkPdfFont.cpp @@ -329,7 +329,7 @@ static int skstoi(const SkPdfNativeObject* str) { token.fKeywordLength==sizeof(keyword)-1 && \ strncmp(token.fKeyword, keyword, sizeof(keyword)-1) == 0) -SkPdfToUnicode::SkPdfToUnicode(SkPdfNativeDoc* parsed, SkPdfStream* stream) : fParsed(parsed) { +SkPdfToUnicode::SkPdfToUnicode(SkPdfNativeDoc* parsed, SkPdfStream* stream) { fCMapEncoding = NULL; fCMapEncodingFlag = NULL; diff --git a/experimental/PdfViewer/SkPdfFont.h b/experimental/PdfViewer/SkPdfFont.h index a46e31c645..cc490553d1 100644 --- a/experimental/PdfViewer/SkPdfFont.h +++ b/experimental/PdfViewer/SkPdfFont.h @@ -85,7 +85,6 @@ public: SkTDict& getStandardEncodings(); class SkPdfToUnicode { - SkPdfNativeDoc* fParsed; // TODO(edisonn): hide public members public: unsigned short* fCMapEncoding; diff --git a/gyp/debugger.gyp b/gyp/debugger.gyp index 8c857362ae..84f03972df 100644 --- a/gyp/debugger.gyp +++ b/gyp/debugger.gyp @@ -143,6 +143,10 @@ '<(moc_gen_dir)/moc_SkImageWidget.cpp', '<(moc_gen_dir)/moc_SkGLWidget.cpp', ], + 'cflags': [ + # Clang gets confused by QWeakPointer, see http://llvm.org/bugs/show_bug.cgi?id=13127 + '-Wno-uninitialized', + ], 'dependencies': [ 'debugger_qt_mocs', ],