draw/image: in scalar output before accessing colormap, check if it points to something

godsic · godsic · commit d38176fd30f7 · 2018-02-09T00:35:25.000+01:00
diff --git a/draw/image.go b/draw/image.go
@@ -40,7 +40,11 @@ func On(img *image.RGBA, f *data.Slice, fmin, fmax string, arrowSize int, colorm
 
 	case 1:
 		min, max := parseMinMax(f, fmin, fmax)
-		drawFloats(img, f.Scalars(), min, max, colormap[0].Cmap...)
+		if colormap == nil {
+			drawFloats(img, f.Scalars(), min, max)
+		} else {
+			drawFloats(img, f.Scalars(), min, max, colormap[0].Cmap...)
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,11 @@ func On(img image.RGBA, f data.Slice, fmin, fmax string, arrowSize int, colorm`
`40`	`40`
`41`	`41`	`case 1:`
`42`	`42`	`min, max := parseMinMax(f, fmin, fmax)`
`43`		`- drawFloats(img, f.Scalars(), min, max, colormap[0].Cmap...)`
	`43`	`+ if colormap == nil {`
	`44`	`+ drawFloats(img, f.Scalars(), min, max)`
	`45`	`+ } else {`
	`46`	`+ drawFloats(img, f.Scalars(), min, max, colormap[0].Cmap...)`
	`47`	`+ }`
`44`	`48`	`}`
`45`	`49`	`}`
`46`	`50`