From 3db7f06b5bf3f74bbe0256b680931c06996a44be Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Thu, 17 Nov 2016 11:18:14 +0100 Subject: Ensure getVector() and getArray() return a valid gradient pointer. (bzr r15253) --- src/sp-gradient.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/sp-gradient.cpp b/src/sp-gradient.cpp index 746c7fa41..f02149cbb 100644 --- a/src/sp-gradient.cpp +++ b/src/sp-gradient.cpp @@ -820,6 +820,9 @@ has_units_set(SPGradient const *gr) SPGradient *SPGradient::getVector(bool force_vector) { SPGradient * src = chase_hrefs(this, has_stopsFN); + if (src == NULL) { + src = this; + } if (force_vector) { src = sp_gradient_ensure_vector_normalized(src); @@ -830,10 +833,9 @@ SPGradient *SPGradient::getVector(bool force_vector) SPGradient *SPGradient::getArray(bool force_vector) { SPGradient * src = chase_hrefs(this, has_patchesFN); - - // if (force_vector) { - // src = sp_gradient_ensure_vector_normalized(src); - // } + if (src == NULL) { + src = this; + } return src; } -- cgit v1.2.3