| 0cfa53d69f121ba65ae8466971f54c38081afe44 |
|
31-Jul-2013 |
Derek Sollenberger <djsollen@google.com> |
Merge Skia r10377 into Android.
This CL also includes a cherry-pick of r10483 to fix
errors in the JPEG region decoder.
Conflicts:
include/core/SkUserConfig.h
src/images/SkImageDecoder.cpp
src/images/SkImageDecoder_libbmp.cpp
src/images/SkImageDecoder_libgif.cpp
src/images/SkImageDecoder_libico.cpp
src/images/SkImageDecoder_libjpeg.cpp
src/images/SkImageDecoder_libpng.cpp
src/images/SkImageDecoder_libwebp.cpp
src/images/SkImageDecoder_wbmp.cpp
src/ports/FontHostConfiguration_android.cpp
src/ports/FontHostConfiguration_android.h
src/ports/SkFontConfigInterface_android.cpp
Change-Id: I415ba6cfbb7ee41f4c8c5c01ec1bcc32345568d2
|