diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ports/SkFontHost_win_dw.cpp | 2 | ||||
| -rw-r--r-- | src/utils/win/SkHRESULT.cpp | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/ports/SkFontHost_win_dw.cpp b/src/ports/SkFontHost_win_dw.cpp index 431eeacca5..e024b465aa 100644 --- a/src/ports/SkFontHost_win_dw.cpp +++ b/src/ports/SkFontHost_win_dw.cpp @@ -801,6 +801,8 @@ SkScalerContext_DW::SkScalerContext_DW(DWriteFontTypeface* typeface, fGsA.m12 = SkScalarToFloat(GsA.get(SkMatrix::kMSkewY)); // This should be ~0. fGsA.m21 = SkScalarToFloat(GsA.get(SkMatrix::kMSkewX)); fGsA.m22 = SkScalarToFloat(GsA.get(SkMatrix::kMScaleY)); + fGsA.dx = 0; + fGsA.dy = 0; // fG_inv is G inverse, which is fairly simple since G is 2x2 rotational. fG_inv.setAll(G.get(SkMatrix::kMScaleX), -G.get(SkMatrix::kMSkewX), G.get(SkMatrix::kMTransX), diff --git a/src/utils/win/SkHRESULT.cpp b/src/utils/win/SkHRESULT.cpp index 111cb761bd..495f074eb2 100644 --- a/src/utils/win/SkHRESULT.cpp +++ b/src/utils/win/SkHRESULT.cpp @@ -9,10 +9,11 @@ #include "SkHRESULT.h" -void SkTraceHR(const char* file, unsigned long line, - HRESULT hr, const char* msg) { - SkDEBUGCODE(if (NULL != msg) SkDEBUGF(("%s\n", msg))); - SkDEBUGF(("%s(%lu) : error 0x%x: ", file, line, hr)); +void SkTraceHR(const char* file, unsigned long line, HRESULT hr, const char* msg) { + if (NULL != msg) { + SkDebugf("%s\n", msg); + } + SkDebugf("%s(%lu) : error 0x%x: ", file, line, hr); LPSTR errorText = NULL; FormatMessageA(FORMAT_MESSAGE_ALLOCATE_BUFFER | @@ -27,9 +28,9 @@ void SkTraceHR(const char* file, unsigned long line, ); if (NULL == errorText) { - SkDEBUGF(("<unknown>\n")); + SkDebugf("<unknown>\n"); } else { - SkDEBUGF(("%s", errorText)); + SkDebugf("%s", errorText); LocalFree(errorText); errorText = NULL; } |