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

Side by Side Diff: src/utils/SkParsePath.cpp

Issue 117053002: remove SK_SCALAR_IS_[FLOAT,FIXED] and assume floats (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 7 years 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
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 #include "SkParse.h" 8 #include "SkParse.h"
9 #include "SkParsePath.h" 9 #include "SkParsePath.h"
10 10
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
181 result->swap(path); 181 result->swap(path);
182 return true; 182 return true;
183 } 183 }
184 184
185 /////////////////////////////////////////////////////////////////////////////// 185 ///////////////////////////////////////////////////////////////////////////////
186 186
187 #include "SkString.h" 187 #include "SkString.h"
188 #include "SkStream.h" 188 #include "SkStream.h"
189 189
190 static void write_scalar(SkWStream* stream, SkScalar value) { 190 static void write_scalar(SkWStream* stream, SkScalar value) {
191 #ifdef SK_SCALAR_IS_FLOAT
192 char buffer[64]; 191 char buffer[64];
193 #ifdef SK_BUILD_FOR_WIN32 192 #ifdef SK_BUILD_FOR_WIN32
194 int len = _snprintf(buffer, sizeof(buffer), "%g", value); 193 int len = _snprintf(buffer, sizeof(buffer), "%g", value);
195 #else 194 #else
196 int len = snprintf(buffer, sizeof(buffer), "%g", value); 195 int len = snprintf(buffer, sizeof(buffer), "%g", value);
197 #endif 196 #endif
198 char* stop = buffer + len; 197 char* stop = buffer + len;
199 #else
200 char buffer[SkStrAppendScalar_MaxSize];
201 char* stop = SkStrAppendScalar(buffer, value);
202 #endif
203 stream->write(buffer, stop - buffer); 198 stream->write(buffer, stop - buffer);
204 } 199 }
205 200
206 static void append_scalars(SkWStream* stream, char verb, const SkScalar data[], 201 static void append_scalars(SkWStream* stream, char verb, const SkScalar data[],
207 int count) { 202 int count) {
208 stream->write(&verb, 1); 203 stream->write(&verb, 1);
209 write_scalar(stream, data[0]); 204 write_scalar(stream, data[0]);
210 for (int i = 1; i < count; i++) { 205 for (int i = 1; i < count; i++) {
211 stream->write(" ", 1); 206 stream->write(" ", 1);
212 write_scalar(stream, data[i]); 207 write_scalar(stream, data[i]);
(...skipping 26 matching lines...) Expand all
239 case SkPath::kClose_Verb: 234 case SkPath::kClose_Verb:
240 stream.write("Z", 1); 235 stream.write("Z", 1);
241 break; 236 break;
242 case SkPath::kDone_Verb: 237 case SkPath::kDone_Verb:
243 str->resize(stream.getOffset()); 238 str->resize(stream.getOffset());
244 stream.copyTo(str->writable_str()); 239 stream.copyTo(str->writable_str());
245 return; 240 return;
246 } 241 }
247 } 242 }
248 } 243 }
OLDNEW
« src/core/SkCanvas.cpp ('K') | « src/utils/SkParse.cpp ('k') | src/xml/SkJSDisplayable.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698