sergiotarxz
/
libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "add more "const" decls" 

This reverts commit 3dc2757330.
This commit is contained in:
John Cupitt 2020-03-05 13:40:07 +00:00
parent 3dc2757330
commit 6a2fbbaed7
6 changed files with 41 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libvips/arithmetic/boolean.c
View File

@ -562,7 +562,7 @@ vips_boolean_const_init( VipsBooleanConst *boolean_const )
static int
vips_boolean_constv( VipsImage *in, VipsImage **out,
VipsOperationBoolean operation, const double *c, int n, va_list ap )
VipsOperationBoolean operation, double *c, int n, va_list ap )
{
VipsArea *area_c;
double *array;
@ -609,7 +609,7 @@ vips_boolean_constv( VipsImage *in, VipsImage **out,
*/
int
vips_boolean_const( VipsImage *in, VipsImage **out,
VipsOperationBoolean boolean, const double *c, int n, ... )
VipsOperationBoolean boolean, double *c, int n, ... )
{
va_list ap;
int result;
@ -637,8 +637,7 @@ vips_boolean_const( VipsImage *in, VipsImage **out,
* Returns: 0 on success, -1 on error
*/
int
vips_andimage_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
vips_andimage_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -667,8 +666,7 @@ vips_andimage_const( VipsImage *in, VipsImage **out,
* Returns: 0 on success, -1 on error
*/
int
vips_orimage_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
vips_orimage_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -697,8 +695,7 @@ vips_orimage_const( VipsImage *in, VipsImage **out,
* Returns: 0 on success, -1 on error
*/
int
vips_eorimage_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
vips_eorimage_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -727,7 +724,7 @@ vips_eorimage_const( VipsImage *in, VipsImage **out,
* Returns: 0 on success, -1 on error
*/
int
vips_lshift_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
vips_lshift_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -756,7 +753,7 @@ vips_lshift_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
* Returns: 0 on success, -1 on error
*/
int
vips_rshift_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
vips_rshift_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;

5
libvips/arithmetic/linear.c
View File

@ -453,7 +453,7 @@ vips_linear_init( VipsLinear *linear )
static int
vips_linearv( VipsImage *in, VipsImage **out,
const double *a, const double *b, int n, va_list ap )
double *a, double *b, int n, va_list ap )
{
VipsArea *area_a;
VipsArea *area_b;
@ -500,8 +500,7 @@ vips_linearv( VipsImage *in, VipsImage **out,
* Returns: 0 on success, -1 on error
*/
int
vips_linear( VipsImage *in, VipsImage **out,
const double *a, const double *b, int n, ... )
vips_linear( VipsImage *in, VipsImage **out, double *a, double *b, int n, ... )
{
va_list ap;
int result;

8
libvips/arithmetic/math2.c
View File

@ -420,7 +420,7 @@ vips_math2_const_init( VipsMath2Const *math2_const )
static int
vips_math2_constv( VipsImage *in, VipsImage **out,
VipsOperationMath2 math2, const double *c, int n, va_list ap )
VipsOperationMath2 math2, double *c, int n, va_list ap )
{
VipsArea *area_c;
double *array;
@ -470,7 +470,7 @@ vips_math2_constv( VipsImage *in, VipsImage **out,
*/
int
vips_math2_const( VipsImage *in, VipsImage **out,
VipsOperationMath2 math2, const double *c, int n, ... )
VipsOperationMath2 math2, double *c, int n, ... )
{
va_list ap;
int result;
@ -496,7 +496,7 @@ vips_math2_const( VipsImage *in, VipsImage **out,
* Returns: 0 on success, -1 on error
*/
int
vips_pow_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
vips_pow_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -523,7 +523,7 @@ vips_pow_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
* Returns: 0 on success, -1 on error
*/
int
vips_wop_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
vips_wop_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;

17
libvips/arithmetic/relational.c
View File

@ -598,7 +598,7 @@ vips_relational_const_init( VipsRelationalConst *relational_const )
static int
vips_relational_constv( VipsImage *in, VipsImage **out,
VipsOperationRelational relational, const double *c, int n, va_list ap )
VipsOperationRelational relational, double *c, int n, va_list ap )
{
VipsArea *area_c;
double *array;
@ -645,7 +645,7 @@ vips_relational_constv( VipsImage *in, VipsImage **out,
*/
int
vips_relational_const( VipsImage *in, VipsImage **out,
VipsOperationRelational relational, const double *c, int n, ... )
VipsOperationRelational relational, double *c, int n, ... )
{
va_list ap;
int result;
@ -671,7 +671,7 @@ vips_relational_const( VipsImage *in, VipsImage **out,
* Returns: 0 on success, -1 on error
*/
int
vips_equal_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
vips_equal_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -698,8 +698,7 @@ vips_equal_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
* Returns: 0 on success, -1 on error
*/
int
vips_notequal_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
vips_notequal_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -726,7 +725,7 @@ vips_notequal_const( VipsImage *in, VipsImage **out,
* Returns: 0 on success, -1 on error
*/
int
vips_less_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
vips_less_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -753,7 +752,7 @@ vips_less_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
* Returns: 0 on success, -1 on error
*/
int
vips_lesseq_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
vips_lesseq_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -780,7 +779,7 @@ vips_lesseq_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
* Returns: 0 on success, -1 on error
*/
int
vips_more_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
vips_more_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;
@ -807,7 +806,7 @@ vips_more_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
* Returns: 0 on success, -1 on error
*/
int
vips_moreeq_const( VipsImage *in, VipsImage **out, const double *c, int n, ... )
vips_moreeq_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;

5
libvips/arithmetic/remainder.c
View File

@ -333,7 +333,7 @@ vips_remainder_const_init( VipsRemainderConst *remainder_const )
static int
vips_remainder_constv( VipsImage *in, VipsImage **out,
const double *c, int n, va_list ap )
double *c, int n, va_list ap )
{
VipsArea *area_c;
double *array;
@ -379,8 +379,7 @@ vips_remainder_constv( VipsImage *in, VipsImage **out,
* Returns: 0 on success, -1 on error
*/
int
vips_remainder_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
vips_remainder_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
{
va_list ap;
int result;

49
libvips/include/vips/arithmetic.h
View File

@ -185,14 +185,14 @@ int vips_multiply( VipsImage *left, VipsImage *right, VipsImage **out, ... )
int vips_divide( VipsImage *left, VipsImage *right, VipsImage **out, ... )
__attribute__((sentinel));
int vips_linear( VipsImage *in, VipsImage **out,
const double *a, const double *b, int n, ... )
double *a, double *b, int n, ... )
__attribute__((sentinel));
int vips_linear1( VipsImage *in, VipsImage **out, double a, double b, ... )
__attribute__((sentinel));
int vips_remainder( VipsImage *left, VipsImage *right, VipsImage **out, ... )
__attribute__((sentinel));
int vips_remainder_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
double *c, int n, ... )
__attribute__((sentinel));
int vips_remainder_const1( VipsImage *in, VipsImage **out,
double c, ... )
@ -279,25 +279,19 @@ int vips_more( VipsImage *left, VipsImage *right, VipsImage **out, ... )
int vips_moreeq( VipsImage *left, VipsImage *right, VipsImage **out, ... )
__attribute__((sentinel));
int vips_relational_const( VipsImage *in, VipsImage **out,
VipsOperationRelational relational, const double *c, int n, ... )
VipsOperationRelational relational, double *c, int n, ... )
__attribute__((sentinel));
int vips_equal_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_equal_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_notequal_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_notequal_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_less_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_less_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_lesseq_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_lesseq_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_more_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_more_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_moreeq_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_moreeq_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_relational_const1( VipsImage *in, VipsImage **out,
VipsOperationRelational relational, double c, ... )
@ -330,22 +324,17 @@ int vips_rshift( VipsImage *left, VipsImage *right, VipsImage **out, ... )
__attribute__((sentinel));
int vips_boolean_const( VipsImage *in, VipsImage **out,
VipsOperationBoolean boolean, const double *c, int n, ... )
VipsOperationBoolean boolean, double *c, int n, ... )
__attribute__((sentinel));
int vips_andimage_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_andimage_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_orimage_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_orimage_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_eorimage_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_eorimage_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_lshift_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_lshift_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_rshift_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_rshift_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_boolean_const1( VipsImage *in, VipsImage **out,
VipsOperationBoolean boolean, double c, ... )
@ -369,13 +358,11 @@ int vips_pow( VipsImage *left, VipsImage *right, VipsImage **out, ... )
int vips_wop( VipsImage *left, VipsImage *right, VipsImage **out, ... )
__attribute__((sentinel));
int vips_math2_const( VipsImage *in, VipsImage **out,
VipsOperationMath2 math2, const double *c, int n, ... )
VipsOperationMath2 math2, double *c, int n, ... )
__attribute__((sentinel));
int vips_pow_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_pow_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_wop_const( VipsImage *in, VipsImage **out,
const double *c, int n, ... )
int vips_wop_const( VipsImage *in, VipsImage **out, double *c, int n, ... )
__attribute__((sentinel));
int vips_math2_const1( VipsImage *in, VipsImage **out,
VipsOperationMath2 math2, double c, ... )