pass into hist_find_ndim

webp-sh · Nov 14, 2024 · 9ab4185 · 9ab4185
1 parent bba2167
commit 9ab4185
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/vips/arithmetic.c b/vips/arithmetic.c
@@ -66,8 +66,8 @@ int hist_find(VipsImage *in, VipsImage **out) {
   return vips_hist_find(in, out, NULL);
 }
 
-int hist_find_ndim(VipsImage *in, VipsImage **out) {
-  return vips_hist_find_ndim(in, out, NULL);
+int hist_find_ndim(VipsImage *in, VipsImage **out, int bins) {
+  return vips_hist_find_ndim(in, out, "bins", bins, NULL);
 }
 
 int hist_cum(VipsImage *in, VipsImage **out) {

diff --git a/vips/arithmetic.go b/vips/arithmetic.go
@@ -140,11 +140,11 @@ func vipsHistFind(in *C.VipsImage) (*C.VipsImage, error) {
 }
 
 // https://www.libvips.org/API/current/libvips-arithmetic.html#vips-hist-find-ndim
-func vipsHistFindNdim(in *C.VipsImage) (*C.VipsImage, error) {
+func vipsHistFindNdim(in *C.VipsImage, bins int) (*C.VipsImage, error) {
 	incOpCounter("histFindNdim")
 	var out *C.VipsImage
 
-	if err := C.hist_find_ndim(in, &out); err != 0 {
+	if err := C.hist_find_ndim(in, &out, C.int(bins)); err != 0 {
 		return nil, handleImageError(out)
 	}
 

diff --git a/vips/arithmetic.h b/vips/arithmetic.h
@@ -17,7 +17,7 @@ int stats(VipsImage *in, VipsImage **out);
 int maxpos(VipsImage *in, double *out);
 int minpos(VipsImage *in, double *out);
 int hist_find(VipsImage *in, VipsImage **out);
-int hist_find_ndim(VipsImage *in, VipsImage **out);
+int hist_find_ndim(VipsImage *in, VipsImage **out, int bins);
 int hist_cum(VipsImage *in, VipsImage **out);
 int hist_norm(VipsImage *in, VipsImage **out);
 int hist_entropy(VipsImage *in, double *out);
diff --git a/vips/image.go b/vips/image.go
@@ -1720,8 +1720,9 @@ func (r *ImageRef) HistogramFind() error {
 	return nil
 }
 
-func (r *ImageRef) HistogramFindNdim() error {
-	out, err := vipsHistFindNdim(r.image)
+// Make a one, two or three dimensional histogram of a 1, 2 or 3 band image. Divide each axis into `bins` bins .. ie. output is 1 x bins, bins x bins, or bins x bins x bins bands. bins defaults to 10.
+func (r *ImageRef) HistogramFindNdim(bins int) error {
+	out, err := vipsHistFindNdim(r.image, bins)
 	if err != nil {
 		return err
 	}