diff options
| author |  bsalomon <bsalomon@google.com> | 2014-12-12 16:41:46 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-12 16:41:46 -0800 |
| commit | fbaace082745a0e301186b2d3b84af62e2fb87ec (patch) | |
| tree | 27982934bbf0defcc05ee93bdae535cd2863b8ff /src | |
| parent | f6139f7c3867a70a750620cd34ce10338a54086e (diff) | |
DM warning-free on win64
Review URL: https://codereview.chromium.org/805543002
Diffstat (limited to 'src')
| -rw-r--r-- | src/gpu/GrLayerHoister.cpp | 4 | ||||
| -rw-r--r-- | src/pdf/SkPDFPage.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/gpu/GrLayerHoister.cpp b/src/gpu/GrLayerHoister.cpp index 493e2f752a..c63fb5476c 100644 --- a/src/gpu/GrLayerHoister.cpp +++ b/src/gpu/GrLayerHoister.cpp @@ -31,8 +31,8 @@ static void prepare_for_hoisting(GrLayerCache* layerCache, const SkPicture* pict = info.fPicture ? info.fPicture : topLevelPicture; GrCachedLayer* layer = layerCache->findLayerOrCreate(topLevelPicture->uniqueID(), - info.fSaveLayerOpID, - info.fRestoreOpID, + SkToInt(info.fSaveLayerOpID), + SkToInt(info.fRestoreOpID), layerRect, initialMat, info.fKey, diff --git a/src/pdf/SkPDFPage.cpp b/src/pdf/SkPDFPage.cpp index cfb6790876..cd05c9f59c 100644 --- a/src/pdf/SkPDFPage.cpp +++ b/src/pdf/SkPDFPage.cpp @@ -49,7 +49,7 @@ void SkPDFPage::finalizePage(SkPDFCatalog* catalog, bool firstPage, off_t SkPDFPage::getPageSize(SkPDFCatalog* catalog, off_t fileOffset) { SkASSERT(fContentStream.get() != NULL); catalog->setFileOffset(fContentStream.get(), fileOffset); - return fContentStream->getOutputSize(catalog, true); + return SkToOffT(fContentStream->getOutputSize(catalog, true)); } void SkPDFPage::emitPage(SkWStream* stream, SkPDFCatalog* catalog) { |