deprecate im_hist()

a useless combination of find and plot

libvips/deprecated/vips7compat.c

@@ -3324,6 +3324,19 @@ im_maplut( IMAGE *in, IMAGE *out, IMAGE *lut )
 	return( 0 );
 }
 
+int 
+im_hist( IMAGE *in, IMAGE *out, int bandno )
+{
+	IMAGE *hist;
+
+	if( !(hist = im_open_local( out, "im_hist", "p" )) ||
+		im_histgr( in, hist, bandno ) ||
+		im_histplot( hist, out ) )
+		return( -1 );
+
+	return( 0 );
+}
+
 int 
 im_falsecolour( IMAGE *in, IMAGE *out )
 {

libvips/histogram/Makefile.am

@@ -6,7 +6,6 @@ libhistogram_la_SOURCES = \
 	phistogram.h \
 	hist_dispatch.c \
 	im_heq.c \
-	im_hist.c \
 	im_histeq.c \
 	im_histgr.c \
 	im_histnD.c \

libvips/histogram/im_hist.c

@@ -1,74 +0,0 @@
-/* Plot the histogram of an image.
- *
- * Copyright: 1991, N. Dessipris.
- *
- * Author: Nicos Dessipris
- * Written on: 27/03/1991
- * Modified on : 
- * 16/6/93 J.Cupitt
- *	- im_ioflag() call changed to im_iocheck()
- * 24/5/95 JC
- *	- ANSIfied and tidied up
- */
-
-/*
-
-    This file is part of VIPS.
-    
-    VIPS is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
-
- */
-
-/*
-
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
-
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif /*HAVE_CONFIG_H*/
-#include <vips/intl.h>
-
-#include <stdio.h>
-
-#include <vips/vips.h>
-
-/**
- * im_hist:
- * @in: input image
- * @out: output image
- * @bandno: band to plot
- *
- * Find and plot the histogram of @in. If @bandno is -1, plot all bands. 
- * Otherwise plot the specified band.
- *
- * See also: im_histgr(), im_histplot().
- *
- * Returns: 0 on success, -1 on error
- */
-int 
-im_hist( IMAGE *in, IMAGE *out, int bandno )
-{
-	IMAGE *hist;
-
-	if( !(hist = im_open_local( out, "im_hist", "p" )) ||
-		im_histgr( in, hist, bandno ) ||
-		im_histplot( hist, out ) )
-		return( -1 );
-
-	return( 0 );
-}

libvips/include/vips/histogram.h

@@ -41,6 +41,9 @@ extern "C" {
 int vips_maplut( VipsImage *in, VipsImage **out, VipsImage *lut, ... )
 	__attribute__((sentinel));
 
+
+
+
 int im_histgr( VipsImage *in, VipsImage *out, int bandno );
 int im_histnD( VipsImage *in, VipsImage *out, int bins );
 int im_hist_indexed( VipsImage *index, VipsImage *value, VipsImage *out );
@@ -55,7 +58,6 @@ int im_histspec( VipsImage *in, VipsImage *ref, VipsImage *out );
 int im_ismonotonic( VipsImage *lut, int *out );
 int im_histplot( VipsImage *in, VipsImage *out );
 
-int im_hist( VipsImage *in, VipsImage *out, int bandno );
 int im_hsp( VipsImage *in, VipsImage *ref, VipsImage *out );
 int im_mpercent( VipsImage *in, double percent, int *out );
 int im_mpercent_hist( VipsImage *hist, double percent, int *out );

libvips/include/vips/vips7compat.h

@@ -850,6 +850,7 @@ int im_lab_morph( VipsImage *in, VipsImage *out,
 int im_quadratic( IMAGE *in, IMAGE *out, IMAGE *coeff );
 
 int im_maplut( VipsImage *in, VipsImage *out, VipsImage *lut );
+int im_hist( VipsImage *in, VipsImage *out, int bandno );
 
 /* ruby-vips uses this
  */