deprecate im_tone_map() and im_tone_analyze()
too trivial and specialised to be worth redoing
This commit is contained in:
parent
d329fb165d
commit
0fcff235b3
|
@ -26,6 +26,7 @@
|
||||||
- vips_conv() is a simple wrapper over the old convolution functions
|
- vips_conv() is a simple wrapper over the old convolution functions
|
||||||
- new optimize_coding param for jpeg write produces optimal Huffman tables,
|
- new optimize_coding param for jpeg write produces optimal Huffman tables,
|
||||||
thanks Lovell
|
thanks Lovell
|
||||||
|
- im_tone_map() and im_tone_analyse() deprecated
|
||||||
|
|
||||||
3/7/13 started 7.34.2
|
3/7/13 started 7.34.2
|
||||||
- lower priority for Matlab load to reduce segvs from Mat_Open(), thanks
|
- lower priority for Matlab load to reduce segvs from Mat_Open(), thanks
|
||||||
|
|
|
@ -328,7 +328,7 @@ vips_tonelut_init( VipsTonelut *lut )
|
||||||
*
|
*
|
||||||
* vips_tonelut() generates a tone curve for the adjustment of image
|
* vips_tonelut() generates a tone curve for the adjustment of image
|
||||||
* levels. It is mostly designed for adjusting the L* part of a LAB image in
|
* levels. It is mostly designed for adjusting the L* part of a LAB image in
|
||||||
* way suitable for print work, but you can use it for other things too.
|
* a way suitable for print work, but you can use it for other things too.
|
||||||
*
|
*
|
||||||
* The curve is an unsigned 16-bit image with (@in_max + 1) entries,
|
* The curve is an unsigned 16-bit image with (@in_max + 1) entries,
|
||||||
* each in the range [0, @out_max].
|
* each in the range [0, @out_max].
|
||||||
|
@ -337,8 +337,6 @@ vips_tonelut_init( VipsTonelut *lut )
|
||||||
* specify the scaling for the input and output images with the @in_max and
|
* specify the scaling for the input and output images with the @in_max and
|
||||||
* @out_max parameters.
|
* @out_max parameters.
|
||||||
*
|
*
|
||||||
* See also: vips_tone_map(), vips_tone_analyse().
|
|
||||||
*
|
|
||||||
* Returns: 0 on success, -1 on error
|
* Returns: 0 on success, -1 on error
|
||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
noinst_LTLIBRARIES = libdeprecated.la
|
noinst_LTLIBRARIES = libdeprecated.la
|
||||||
|
|
||||||
libdeprecated_la_SOURCES = \
|
libdeprecated_la_SOURCES = \
|
||||||
|
tone.c \
|
||||||
im_linreg.c \
|
im_linreg.c \
|
||||||
im_point_bilinear.c \
|
im_point_bilinear.c \
|
||||||
resample_dispatch.c \
|
resample_dispatch.c \
|
||||||
|
|
|
@ -171,12 +171,11 @@ im_tone_analyse(
|
||||||
return( -1 );
|
return( -1 );
|
||||||
|
|
||||||
if( im_extract_band( t[0], t[1], 0 ) ||
|
if( im_extract_band( t[0], t[1], 0 ) ||
|
||||||
im_clip2fmt( t[1], t[2], IM_BANDFMT_USHORT ) ||
|
im_clip2fmt( t[1], t[2], IM_BANDFMT_USHORT ) )
|
||||||
im_histgr( t[2], t[3], -1 ) )
|
|
||||||
return( -1 );
|
return( -1 );
|
||||||
|
|
||||||
if( im_mpercent_hist( t[3], 0.1 / 100.0, &high ) ||
|
if( im_mpercent( t[2], 0.1 / 100.0, &high ) ||
|
||||||
im_mpercent_hist( t[3], 99.9 / 100.0, &low ) )
|
im_mpercent( t[2], 99.9 / 100.0, &low ) )
|
||||||
return( -1 );
|
return( -1 );
|
||||||
|
|
||||||
Lb = 100 * low / 32768;
|
Lb = 100 * low / 32768;
|
|
@ -3642,7 +3642,7 @@ im_profile( IMAGE *in, IMAGE *out, int dir )
|
||||||
int
|
int
|
||||||
im_mpercent( IMAGE *in, double percent, int *out )
|
im_mpercent( IMAGE *in, double percent, int *out )
|
||||||
{
|
{
|
||||||
if( vips_hist_percent( in, percent, out, NULL ) )
|
if( vips_hist_percent( in, percent / 100.0, out, NULL ) )
|
||||||
return( -1 );
|
return( -1 );
|
||||||
|
|
||||||
return( 0 );
|
return( 0 );
|
||||||
|
|
|
@ -14,8 +14,6 @@ libhistogram_la_SOURCES = \
|
||||||
hist_local.c \
|
hist_local.c \
|
||||||
percent.c \
|
percent.c \
|
||||||
hist_ismonotonic.c \
|
hist_ismonotonic.c \
|
||||||
stdif.c \
|
stdif.c
|
||||||
\
|
|
||||||
tone.c
|
|
||||||
|
|
||||||
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
|
AM_CPPFLAGS = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
|
||||||
|
|
|
@ -60,10 +60,6 @@ int vips_stdif( VipsImage *in, VipsImage **out, int width, int height, ... )
|
||||||
int vips_hist_ismonotonic( VipsImage *in, int *monotonic, ... )
|
int vips_hist_ismonotonic( VipsImage *in, int *monotonic, ... )
|
||||||
__attribute__((sentinel));
|
__attribute__((sentinel));
|
||||||
|
|
||||||
int im_tone_analyse( VipsImage *in, VipsImage *out,
|
|
||||||
double Ps, double Pm, double Ph, double S, double M, double H );
|
|
||||||
int im_tone_map( VipsImage *in, VipsImage *out, VipsImage *lut );
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif /*__cplusplus*/
|
#endif /*__cplusplus*/
|
||||||
|
|
|
@ -881,6 +881,10 @@ int im_mpercent( VipsImage *in, double percent, int *out );
|
||||||
int im_mpercent_hist( VipsImage *hist, double percent, int *out );
|
int im_mpercent_hist( VipsImage *hist, double percent, int *out );
|
||||||
int im_ismonotonic( VipsImage *lut, int *out );
|
int im_ismonotonic( VipsImage *lut, int *out );
|
||||||
|
|
||||||
|
int im_tone_analyse( VipsImage *in, VipsImage *out,
|
||||||
|
double Ps, double Pm, double Ph, double S, double M, double H );
|
||||||
|
int im_tone_map( VipsImage *in, VipsImage *out, VipsImage *lut );
|
||||||
|
|
||||||
/* Not really correct, but who uses these.
|
/* Not really correct, but who uses these.
|
||||||
*/
|
*/
|
||||||
#define im_lhisteq_raw im_lhisteq
|
#define im_lhisteq_raw im_lhisteq
|
||||||
|
|
Loading…
Reference in New Issue