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

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

Issue 47513017: More Windows 64b compilation warning fixes (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
Patch Set: Fix linux & mac builds Created 7 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « src/images/bmpdecoderhelper.cpp ('k') | src/pdf/SkPDFDeviceFlattener.cpp » ('j') | 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 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "SkPDFDevice.h" 8 #include "SkPDFDevice.h"
9 9
10 #include "SkAnnotation.h" 10 #include "SkAnnotation.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 SkScalar xAdj = SkFixedToScalar(xAdv); 116 SkScalar xAdj = SkFixedToScalar(xAdv);
117 SkScalar yAdj = SkFixedToScalar(yAdv); 117 SkScalar yAdj = SkFixedToScalar(yAdv);
118 if (paint.getTextAlign() == SkPaint::kCenter_Align) { 118 if (paint.getTextAlign() == SkPaint::kCenter_Align) {
119 xAdj = SkScalarHalf(xAdj); 119 xAdj = SkScalarHalf(xAdj);
120 yAdj = SkScalarHalf(yAdj); 120 yAdj = SkScalarHalf(yAdj);
121 } 121 }
122 *x = *x - xAdj; 122 *x = *x - xAdj;
123 *y = *y - yAdj; 123 *y = *y - yAdj;
124 } 124 }
125 125
126 static size_t max_glyphid_for_typeface(SkTypeface* typeface) { 126 static int max_glyphid_for_typeface(SkTypeface* typeface) {
127 SkAutoResolveDefaultTypeface autoResolve(typeface); 127 SkAutoResolveDefaultTypeface autoResolve(typeface);
128 typeface = autoResolve.get(); 128 typeface = autoResolve.get();
129 return typeface->countGlyphs() - 1; 129 return typeface->countGlyphs() - 1;
130 } 130 }
131 131
132 typedef SkAutoSTMalloc<128, uint16_t> SkGlyphStorage; 132 typedef SkAutoSTMalloc<128, uint16_t> SkGlyphStorage;
133 133
134 static size_t force_glyph_encoding(const SkPaint& paint, const void* text, 134 static size_t force_glyph_encoding(const SkPaint& paint, const void* text,
135 size_t len, SkGlyphStorage* storage, 135 size_t len, SkGlyphStorage* storage,
136 uint16_t** glyphIDs) { 136 uint16_t** glyphIDs) {
(...skipping 2167 matching lines...) Expand 10 before | Expand all | Expand 10 after
2304 } 2304 }
2305 2305
2306 bool SkPDFDevice::onReadPixels(const SkBitmap& bitmap, int x, int y, 2306 bool SkPDFDevice::onReadPixels(const SkBitmap& bitmap, int x, int y,
2307 SkCanvas::Config8888) { 2307 SkCanvas::Config8888) {
2308 return false; 2308 return false;
2309 } 2309 }
2310 2310
2311 bool SkPDFDevice::allowImageFilter(SkImageFilter*) { 2311 bool SkPDFDevice::allowImageFilter(SkImageFilter*) {
2312 return false; 2312 return false;
2313 } 2313 }
OLDNEW
« no previous file with comments | « src/images/bmpdecoderhelper.cpp ('k') | src/pdf/SkPDFDeviceFlattener.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698