From 5dc4f24637d353d4d777c251f6d8c5746e062e7e Mon Sep 17 00:00:00 2001 From: Bo Xu Date: Sat, 24 May 2014 12:20:17 -0700 Subject: Fix warnings in android build, fix font rendering issue, fix issue 357588: wrong characters representation, and addjust some code indent BUG= R=jam@chromium.org Review URL: https://codereview.chromium.org/294353002 --- core/src/fxcrt/fx_basic_coords.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'core/src/fxcrt') diff --git a/core/src/fxcrt/fx_basic_coords.cpp b/core/src/fxcrt/fx_basic_coords.cpp index f55c267da5..62061704c7 100644 --- a/core/src/fxcrt/fx_basic_coords.cpp +++ b/core/src/fxcrt/fx_basic_coords.cpp @@ -260,7 +260,12 @@ void CFX_Matrix::Set(FX_FLOAT a, FX_FLOAT b, FX_FLOAT c, FX_FLOAT d, FX_FLOAT e, } void CFX_Matrix::Set(const FX_FLOAT n[6]) { - FXSYS_memcpy32((void*)this, &n, sizeof(CFX_Matrix)); + this->a = n[0]; + this->b = n[1]; + this->c = n[2]; + this->d = n[3]; + this->e = n[4]; + this->f = n[5]; } void CFX_Matrix::SetReverse(const CFX_Matrix &m) { -- cgit v1.2.3