Make FSMatrixFromCFXMatrix() consistent with FSRectFFromCFXFloatRect().
Make FSMatrixFromCFXMatrix() return a FS_MATRIX, and remove its out
parameter.
Change-Id: I26003943c512e733443a67d55070404f7d3063a2
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/65352
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Lei Zhang <thestig@chromium.org>
diff --git a/fpdfsdk/cpdfsdk_helpers.cpp b/fpdfsdk/cpdfsdk_helpers.cpp
index 526b262..4583e0c 100644
--- a/fpdfsdk/cpdfsdk_helpers.cpp
+++ b/fpdfsdk/cpdfsdk_helpers.cpp
@@ -263,13 +263,8 @@
return CFX_Matrix(matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f);
}
-void FSMatrixFromCFXMatrix(const CFX_Matrix& matrix, FS_MATRIX* out_matrix) {
- out_matrix->a = matrix.a;
- out_matrix->b = matrix.b;
- out_matrix->c = matrix.c;
- out_matrix->d = matrix.d;
- out_matrix->e = matrix.e;
- out_matrix->f = matrix.f;
+FS_MATRIX FSMatrixFromCFXMatrix(const CFX_Matrix& matrix) {
+ return {matrix.a, matrix.b, matrix.c, matrix.d, matrix.e, matrix.f};
}
unsigned long Utf16EncodeMaybeCopyAndReturnLength(const WideString& text,
