From 2ff2e0bd1365a05c15ea9bcb08bc80f99a8507cc Mon Sep 17 00:00:00 2001 From: "jwatt%jwatt.org" Date: Sat, 15 Oct 2005 00:21:05 +0000 Subject: [PATCH] Fixing bug 312232. getScreenCTM fails in xulrunner builds due to uninitialized nsresult. Patched by Rob Adams , r=me, sr=tor@acm.org, a=asa@mozill.org git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@182289 18797224-902f-48f8-a5cc-f745e15eee43 --- .../content/svg/content/src/nsSVGMarkerElement.cpp | 12 +++++++----- mozilla/content/svg/content/src/nsSVGSVGElement.cpp | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/mozilla/content/svg/content/src/nsSVGMarkerElement.cpp b/mozilla/content/svg/content/src/nsSVGMarkerElement.cpp index 2494acc0cec..8a02d16c158 100644 --- a/mozilla/content/svg/content/src/nsSVGMarkerElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGMarkerElement.cpp @@ -416,6 +416,8 @@ nsSVGMarkerElement::GetMarkerTransform(float aStrokeWidth, NS_IMETHODIMP nsSVGMarkerElement::GetViewboxToViewportTransform(nsIDOMSVGMatrix **_retval) { + nsresult rv = NS_OK; + if (!mViewBoxToViewportTransform) { float viewportWidth; { @@ -512,15 +514,15 @@ nsSVGMarkerElement::GetViewboxToViewportTransform(nsIDOMSVGMatrix **_retval) printf(" [b d f] = [ 0, %f, %f]\n", d, f); #endif - NS_NewSVGMatrix(getter_AddRefs(mViewBoxToViewportTransform), - a, 0.0f, - 0.0f, d, - e, f); + rv = NS_NewSVGMatrix(getter_AddRefs(mViewBoxToViewportTransform), + a, 0.0f, + 0.0f, d, + e, f); } *_retval = mViewBoxToViewportTransform; NS_IF_ADDREF(*_retval); - return NS_OK; + return rv; } //---------------------------------------------------------------------- diff --git a/mozilla/content/svg/content/src/nsSVGSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGSVGElement.cpp index 1096c19a9b9..fce7815f6be 100644 --- a/mozilla/content/svg/content/src/nsSVGSVGElement.cpp +++ b/mozilla/content/svg/content/src/nsSVGSVGElement.cpp @@ -806,7 +806,7 @@ nsSVGSVGElement::GetElementById(const nsAString & elementId, nsIDOMElement **_re NS_IMETHODIMP nsSVGSVGElement::GetViewboxToViewportTransform(nsIDOMSVGMatrix **_retval) { - nsresult rv; + nsresult rv = NS_OK; if (!mViewBoxToViewportTransform) { float viewportWidth;