Merge pull request #1 from RoEdAl/arm-32bit

Fix: compile module on 32-bit architectures

Author: Civil

cairo/cairo.go

@@ -107,7 +107,7 @@ func (pi *PathIter) Next() *PathSegment {
 	}
 	// path.data is an array of cairo_path_data_t, but the union makes
 	// things complicated.
-	dataArray := (*[1 << 30]C.cairo_path_data_t)(unsafe.Pointer(pi.path.Ptr.data))
+	dataArray := unsafe.Slice((*C.cairo_path_data_t)(unsafe.Pointer(pi.path.Ptr.data)), pi.path.Ptr.num_data)
 	seg, ofs := decodePathSegment(unsafe.Pointer(&dataArray[pi.i]))
 	pi.i += C.int(ofs)
 	return seg
@@ -3651,7 +3651,7 @@ func SVGGetVersions() []SVGVersion {
 	var cVersionsPtr *C.cairo_svg_version_t
 	var cNumVersions C.int
 	C.cairo_svg_get_versions(&cVersionsPtr, &cNumVersions)
-	slice := (*[1 << 30]C.cairo_svg_version_t)(unsafe.Pointer(cVersionsPtr))[:cNumVersions:cNumVersions]
+	slice := unsafe.Slice((*C.cairo_svg_version_t)(unsafe.Pointer(cVersionsPtr)), cNumVersions)
 	versions := make([]SVGVersion, cNumVersions)
 	for i := 0; i < int(cNumVersions); i++ {
 		versions[i] = SVGVersion(slice[i])

cairo/path.go

@@ -36,11 +36,11 @@ type pathDataHeader struct {
 // decodePathSegment extracts a series of points out of a cairo_path_data_t array.
 func decodePathSegment(pathData unsafe.Pointer) (*PathSegment, int) {
 	header := (*pathDataHeader)(pathData)
+	parts := unsafe.Slice((*PathPoint)(pathData), header.length)
 	seg := PathSegment{
 		Type:   PathDataType(header.dataType),
 		Points: make([]PathPoint, header.length-1),
 	}
-	parts := (*[1 << 30]PathPoint)(pathData)
 	copy(seg.Points, parts[1:])
 	return &seg, int(header.length)
 }

go.mod

@@ -0,0 +1,8 @@
+module github.com/go-graphite/gocairo
+
+go 1.17
+
+require (
+	github.com/martine/gocairo v0.0.0-20160222165215-ddd30f837497
+	rsc.io/c2go v0.0.0-20170620140410-520c22818a08
+)

go.sum

@@ -0,0 +1,4 @@
+github.com/martine/gocairo v0.0.0-20160222165215-ddd30f837497 h1:YokNfnvsFBP4Fw6OdIWsmUQfyQFCR8J9f7FweVa6sgQ=
+github.com/martine/gocairo v0.0.0-20160222165215-ddd30f837497/go.mod h1:iLyMWuHlSRKkfS1vzV+wQNDFVOfQZYkrAAdNS7FPb4w=
+rsc.io/c2go v0.0.0-20170620140410-520c22818a08 h1:AAIN5uzUq20OU2cNoPTVljUm7JDaD0Z/+Xl/uMBHJgU=
+rsc.io/c2go v0.0.0-20170620140410-520c22818a08/go.mod h1:hE73EMCiJ3lIDPgEDEK781LZrVhFDxT+I+ziQRoLVNE=