Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(710)

Side by Side Diff: src/pdf/SkPDFTypes.cpp

Issue 1051273004: Avoid defining snprintf when MSVC provides it Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/core/SkString.cpp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2011 Google Inc. 3 * Copyright 2011 Google Inc.
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkPDFTypes.h" 10 #include "SkPDFTypes.h"
11 #include "SkStream.h" 11 #include "SkStream.h"
12 12
13 #ifdef SK_BUILD_FOR_WIN 13 #if defined(_MSC_VER) && _MSC_VER < 1900
14 #define SNPRINTF _snprintf 14 #define SNPRINTF _snprintf
15 #else 15 #else
16 #define SNPRINTF snprintf 16 #define SNPRINTF snprintf
17 #endif 17 #endif
18 18
19 //////////////////////////////////////////////////////////////////////////////// 19 ////////////////////////////////////////////////////////////////////////////////
20 20
21 SkPDFObjRef::SkPDFObjRef(SkPDFObject* obj) : fObj(obj) { 21 SkPDFObjRef::SkPDFObjRef(SkPDFObject* obj) : fObj(obj) {
22 SkSafeRef(obj); 22 SkSafeRef(obj);
23 } 23 }
(...skipping 420 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 fObjects.push(obj); 444 fObjects.push(obj);
445 return true; 445 return true;
446 } 446 }
447 447
448 int32_t SkPDFObjNumMap::getObjectNumber(SkPDFObject* obj) const { 448 int32_t SkPDFObjNumMap::getObjectNumber(SkPDFObject* obj) const {
449 int32_t* objectNumberFound = fObjectNumbers.find(obj); 449 int32_t* objectNumberFound = fObjectNumbers.find(obj);
450 SkASSERT(objectNumberFound); 450 SkASSERT(objectNumberFound);
451 return *objectNumberFound; 451 return *objectNumberFound;
452 } 452 }
453 453
OLDNEW
« no previous file with comments | « src/core/SkString.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698