Revert "Revert "fix: Don't dereference null surface props (#154)" (#155)"

mattleibow · web-flow · commit 39fe00aec91b · 2025-04-10T22:29:09.000+02:00
This reverts commit de43121.
diff --git a/src/c/sk_image.cpp b/src/c/sk_image.cpp
@@ -60,7 +60,7 @@ sk_image_t* sk_image_new_from_picture(sk_picture_t* picture, const sk_isize_t* d
     if (cmatrix) {
         m = AsMatrix(cmatrix);
     }
-    return ToImage(SkImages::DeferredFromPicture(sk_ref_sp(AsPicture(picture)), *AsISize(dimensions), cmatrix ? &m : nullptr, AsPaint(paint), useFloatingPointBitDepth ? SkImages::BitDepth::kF16 : SkImages::BitDepth::kU8, sk_ref_sp(AsColorSpace(colorSpace)), *AsSurfaceProps(props)).release());
+    return ToImage(SkImages::DeferredFromPicture(sk_ref_sp(AsPicture(picture)), *AsISize(dimensions), cmatrix ? &m : nullptr, AsPaint(paint), useFloatingPointBitDepth ? SkImages::BitDepth::kF16 : SkImages::BitDepth::kU8, sk_ref_sp(AsColorSpace(colorSpace)), props ? (*AsSurfaceProps(props)).release()) : {});
 }
 
 int sk_image_get_width(const sk_image_t* cimage) {

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ sk_image_t* sk_image_new_from_picture(sk_picture_t* picture, const sk_isize_t* d`
`60`	`60`	`if (cmatrix) {`
`61`	`61`	`m = AsMatrix(cmatrix);`
`62`	`62`	`}`
`63`		`- return ToImage(SkImages::DeferredFromPicture(sk_ref_sp(AsPicture(picture)), AsISize(dimensions), cmatrix ? &m : nullptr, AsPaint(paint), useFloatingPointBitDepth ? SkImages::BitDepth::kF16 : SkImages::BitDepth::kU8, sk_ref_sp(AsColorSpace(colorSpace)), AsSurfaceProps(props)).release());`
	`63`	`+ return ToImage(SkImages::DeferredFromPicture(sk_ref_sp(AsPicture(picture)), AsISize(dimensions), cmatrix ? &m : nullptr, AsPaint(paint), useFloatingPointBitDepth ? SkImages::BitDepth::kF16 : SkImages::BitDepth::kU8, sk_ref_sp(AsColorSpace(colorSpace)), props ? (AsSurfaceProps(props)).release()) : {});`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`int sk_image_get_width(const sk_image_t* cimage) {`