diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-06-06 17:02:24 -0400 |
|---|---|---|
| committer | Derek Sollenberger <djsollen@google.com> | 2011-06-07 14:00:04 -0400 |
| commit | 0b15698a8c76bb8abc1b555c1d91892669b4118f (patch) | |
| tree | 08732d5fbb7484ce7e10c65c96fb56294053073a /include/config | |
| parent | 9770b0f3d2b5d512daac50c2c9561d2c073cd8d2 (diff) | |
| download | external_skia-0b15698a8c76bb8abc1b555c1d91892669b4118f.zip external_skia-0b15698a8c76bb8abc1b555c1d91892669b4118f.tar.gz external_skia-0b15698a8c76bb8abc1b555c1d91892669b4118f.tar.bz2 | |
Skia Merge (revision 1510)
This CL includes bug fixes and closely mirrors the version of
Skia used in Chrome M13, which is likely to be our baseline for
ICS.
The CL also adds source files for the SampleApp which will allow
us to execute basic skia tests. The SampleApp requires the
utils/views directory in order to run.
Finally, we have included the PDF backend for Skia in order to
experiment with using it to generate PDF files for certain
applications.
Note: The SampleApp and PDF code are not built as part of libskia.
Change-Id: I1895ccfbd8074e25f19148cc7bd1b4af571fb307
Diffstat (limited to 'include/config')
| -rw-r--r-- | include/config/SkUserConfig.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/config/SkUserConfig.h b/include/config/SkUserConfig.h index aa2e6cf..c56d8cf 100644 --- a/include/config/SkUserConfig.h +++ b/include/config/SkUserConfig.h @@ -54,7 +54,7 @@ /* Somewhat independent of how SkScalar is implemented, Skia also wants to know if it can use floats at all. Naturally, if SK_SCALAR_IS_FLOAT is defined, - then so muse SK_CAN_USE_FLOAT, but if scalars are fixed, SK_CAN_USE_FLOAT + SK_CAN_USE_FLOAT must be too; but if scalars are fixed, SK_CAN_USE_FLOAT can go either way. */ //#define SK_CAN_USE_FLOAT @@ -151,4 +151,3 @@ #endif #endif - |