Adjusting TestMatMinMaxIdx3d function to create a zero'd 3d matrix. E…

…rrors were occuring before because of a non-zero'd mat being created. Malloc'ing space for min and max index in MinMaxIdx rather than making array and passing in address to [0] index.

core.cpp

@@ -660,8 +660,6 @@ void Mat_MinMaxIdx(Mat m, double* minVal, double* maxVal, int* minIdx, int* maxI
 
     for(unsigned int a = 0; a < sizeof(cMinIdx)/sizeof(cMinIdx[0]); a++) {
         minIdx[a] = cMinIdx[a];
-    }
-    for(unsigned int a = 0; a < sizeof(cMaxIdx)/sizeof(cMaxIdx[0]); a++) {
         maxIdx[a] = cMaxIdx[a];
     }
 }

core.go

@@ -1517,18 +1517,31 @@ func MinMaxIdx(input Mat) (minVal, maxVal float32, minIdx, maxIdx []int) {
 	var cMaxVal C.double
 
 	dims := len(input.Size())
-	cMinIdx := make([]C.int, dims)
-	cMaxIdx := make([]C.int, dims)
+	cMinIdx := (*C.int)(C.malloc(C.size_t(C.sizeof_int * dims)))
+	cMaxIdx := (*C.int)(C.malloc(C.size_t(C.sizeof_int * dims)))
+	defer C.free(unsafe.Pointer(cMinIdx))
+	defer C.free(unsafe.Pointer(cMaxIdx))
 
-	C.Mat_MinMaxIdx(input.p, &cMinVal, &cMaxVal, &cMinIdx[0], &cMaxIdx[0])
+	C.Mat_MinMaxIdx(input.p, &cMinVal, &cMaxVal, cMinIdx, cMaxIdx)
 
-	for i := 0; i < dims; i++ {
-		minIdx = append(minIdx, int(cMinIdx[i]))
+	h := &reflect.SliceHeader{
+		Data: uintptr(unsafe.Pointer(cMinIdx)),
+		Len:  dims,
+		Cap:  dims,
 	}
-	for i := 0; i < dims; i++ {
-		maxIdx = append(maxIdx, int(cMaxIdx[i]))
+	minIndex := *(*[]C.int)(unsafe.Pointer(h))
+
+	h = &reflect.SliceHeader{
+		Data: uintptr(unsafe.Pointer(cMaxIdx)),
+		Len:  dims,
+		Cap:  dims,
 	}
+	maxIndex := *(*[]C.int)(unsafe.Pointer(h))
 
+	for i := 0; i < dims; i++ {
+		minIdx = append(minIdx, int(minIndex[i]))
+		maxIdx = append(maxIdx, int(maxIndex[i]))
+	}
 	return float32(cMinVal), float32(cMaxVal), minIdx, maxIdx
 }
 

core_test.go

@@ -2575,7 +2575,6 @@ func TestMatMinMaxIdx(t *testing.T) {
 	src.SetFloatAt(4, 4, 16)
 
 	minVal, maxVal, minIdx, maxIdx := MinMaxIdx(src)
-
 	if minVal != 0 {
 		t.Error("TestMatMinMaxIdx minVal should be 0.")
 	}
@@ -2593,6 +2592,15 @@ func TestMatMinMaxIdx(t *testing.T) {
 func TestMatMinMaxIdx3d(t *testing.T) {
 	src := NewMatWithSizes([]int{3,3,3}, MatTypeCV32FC1)
 	defer src.Close()
+
+	for x := 0; x < 3; x++ {
+		for y := 0; y < 3; y++ {
+			for z := 0; z < 3; z++ {
+				src.SetFloatAt3(x, y, z, 0)
+			}
+		}
+	}
+
 	src.SetFloatAt3(2, 1, 2, 2)
 
 	minVal, maxVal, minIdx, maxIdx := MinMaxIdx(src)