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

Ensure consistent formatting of ->format_table (#3199)

Browse Source
This commit is contained in:
Kleis Auke Wolthuizen 2022-11-30 10:41:05 +01:00 committed by GitHub
parent fb21c2483a
commit 0629a5de7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
43 changed files with 134 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libvips/arithmetic/abs.c
View File

@ -244,8 +244,8 @@ vips_abs_buffer( VipsArithmetic *arithmetic,
/* Format doesn't change with abs, other than complex -> real.
*/
static const VipsBandFormat vips_abs_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, C, US, S, UI, I, F, F, D, D
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, F, F, D, D
};
static void

4
libvips/arithmetic/add.c
View File

@ -158,8 +158,8 @@ add_buffer( VipsArithmetic *arithmetic, VipsPel *out, VipsPel **in, int width )
* match the case statement in add_buffer() above.
*/
static const VipsBandFormat vips_add_format_table[10] = {
/* UC C US S UI I F X D DX */
US, S, UI, I, UI, I, F, X, D, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ US, S, UI, I, UI, I, F, X, D, DX
};
static void

4
libvips/arithmetic/boolean.c
View File

@ -224,8 +224,8 @@ vips_boolean_buffer( VipsArithmetic *arithmetic,
/* Type conversions for boolean.
*/
static const VipsBandFormat vips_boolean_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, C, US, S, UI, I, I, I, I, I,
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, I, I, I, I
};
static void

18
libvips/arithmetic/complex.c
View File

@ -234,8 +234,8 @@ vips_complex_buffer( VipsArithmetic *arithmetic,
#define DX VIPS_FORMAT_DPCOMPLEX
static const VipsBandFormat vips_complex_format_table[10] = {
/* UC C US S UI I F X D DX */
X, X, X, X, X, X, X, X, DX, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ X, X, X, X, X, X, X, X, DX, DX
};
static void
@ -527,8 +527,8 @@ vips_complex2_buffer( VipsArithmetic *arithmetic,
#define DX VIPS_FORMAT_DPCOMPLEX
static const VipsBandFormat vips_complex2_format_table[10] = {
/* UC C US S UI I F X D DX */
X, X, X, X, X, X, X, X, DX, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ X, X, X, X, X, X, X, X, DX, DX
};
static void
@ -741,8 +741,8 @@ vips_complexget_buffer( VipsArithmetic *arithmetic,
#define DX VIPS_FORMAT_DPCOMPLEX
static const VipsBandFormat vips_complexget_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, C, US, S, UI, I, F, F, D, D
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, F, F, D, D
};
static void
@ -951,9 +951,9 @@ vips_complexform_buffer( VipsArithmetic *arithmetic,
/* Type promotion for form complex. Sign and value preserving. Make sure
* these match the case statement in complexform_buffer() above.
*/
static int vips_complexform_format_table[10] = {
/* UC C US S UI I F X D DX */
X, X, X, X, X, X, X, X, DX,DX
static VipsBandFormat vips_complexform_format_table[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ X, X, X, X, X, X, X, X, DX, DX
};
static void

6
libvips/arithmetic/divide.c
View File

@ -210,9 +210,9 @@ vips_divide_buffer( VipsArithmetic *arithmetic,
/* Type promotion for division. Sign and value preserving. Make sure
* these match the case statement in divide_buffer() above.
*/
static int vips_divide_format_table[10] = {
/* UC C US S UI I F X D DX */
F, F, F, F, F, F, F, X, D, DX
static VipsBandFormat vips_divide_format_table[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ F, F, F, F, F, F, F, X, D, DX
};
static void

4
libvips/arithmetic/hist_find.c
View File

@ -386,8 +386,8 @@ vips_hist_find_scan( VipsStatistic *statistic, void *seq,
/* Type mapping: go to uchar or ushort.
*/
static const VipsBandFormat vips_hist_find_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, US, US, US, US, US, US
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, US, US, US, US, US, US
};
static void

4
libvips/arithmetic/hist_find_indexed.c
View File

@ -130,8 +130,8 @@ histogram_new( VipsHistFindIndexed *indexed )
/* Type mapping: go to uchar or ushort.
*/
static const VipsBandFormat vips_hist_find_indexed_format[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, US, US, US, US, US, US
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, US, US, US, US, US, US
};
static int

4
libvips/arithmetic/hist_find_ndim.c
View File

@ -286,8 +286,8 @@ vips_hist_find_ndim_scan( VipsStatistic *statistic, void *seq,
/* Type mapping: go to uchar or ushort.
*/
static const VipsBandFormat vips_hist_find_ndim_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, US, US, US, US, US, US
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, US, US, US, US, US, US
};
static void

4
libvips/arithmetic/hough.c
View File

@ -152,8 +152,8 @@ vips_hough_scan( VipsStatistic *statistic,
/* Input image is cast to this format.
*/
static const VipsBandFormat vips_hough_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
};
static void

4
libvips/arithmetic/invert.c
View File

@ -151,8 +151,8 @@ vips_invert_buffer( VipsArithmetic *arithmetic,
/* Format doesn't change with invert.
*/
static const VipsBandFormat vips_invert_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, C, US, S, UI, I, F, X, D, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, F, X, D, DX
};
static void

4
libvips/arithmetic/linear.c
View File

@ -401,8 +401,8 @@ vips_linear_buffer( VipsArithmetic *arithmetic,
/* Format doesn't change with linear.
*/
static const VipsBandFormat vips_linear_format_table[10] = {
/* UC C US S UI I F X D DX */
F, F, F, F, F, F, F, X, D, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ F, F, F, F, F, F, F, X, D, DX
};
static void

4
libvips/arithmetic/math.c
View File

@ -206,8 +206,8 @@ vips_math_buffer( VipsArithmetic *arithmetic,
#define DX VIPS_FORMAT_DPCOMPLEX
static const VipsBandFormat vips_math_format_table[10] = {
/* UC C US S UI I F X D DX */
F, F, F, F, F, F, F, X, D, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ F, F, F, F, F, F, F, X, D, DX
};
static void

6
libvips/arithmetic/math2.c
View File

@ -206,9 +206,9 @@ vips_math2_buffer( VipsArithmetic *arithmetic,
/* Type promotion for math2. Keep in sync with math2_buffer() above.
*/
static int vips_math2_format_table[10] = {
/* UC C US S UI I F X D DX */
F, F, F, F, F, F, F, X, D, DX
static const VipsBandFormat vips_math2_format_table[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ F, F, F, F, F, F, F, X, D, DX
};
static void

6
libvips/arithmetic/multiply.c
View File

@ -158,9 +158,9 @@ vips_multiply_buffer( VipsArithmetic *arithmetic,
/* Type promotion for multiplication. Sign and value preserving. Make sure
* these match the case statement in multiply_buffer() above.
*/
static int vips_multiply_format_table[10] = {
/* UC C US S UI I F X D DX */
US, S, UI, I, UI, I, F, X, D, DX
static const VipsBandFormat vips_multiply_format_table[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ US, S, UI, I, UI, I, F, X, D, DX
};
static void

4
libvips/arithmetic/project.c
View File

@ -87,8 +87,8 @@ G_DEFINE_TYPE( VipsProject, vips_project, VIPS_TYPE_STATISTIC );
#define N VIPS_FORMAT_NOTSET
static const VipsBandFormat vips_project_format_table[10] = {
/* UC C US S UI I F X D DX */
UI, I, UI, I, UI, I, D, N, D, N
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UI, I, UI, I, UI, I, D, N, D, N
};
static Histogram *

4
libvips/arithmetic/relational.c
View File

@ -198,8 +198,8 @@ vips_relational_buffer( VipsArithmetic *arithmetic,
#define DX VIPS_FORMAT_DPCOMPLEX
static const VipsBandFormat vips_relational_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
};
static void

6
libvips/arithmetic/remainder.c
View File

@ -154,9 +154,9 @@ vips_remainder_buffer( VipsArithmetic *arithmetic,
/* Type promotion for remainder. Keep in sync with remainder_buffer() above.
*/
static int vips_remainder_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, C, US, S, UI, I, F, X, D, DX
static const VipsBandFormat vips_remainder_format_table[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, F, X, D, DX
};
static void

4
libvips/arithmetic/round.c
View File

@ -143,8 +143,8 @@ vips_round_buffer( VipsArithmetic *arithmetic,
#define DX VIPS_FORMAT_DPCOMPLEX
static const VipsBandFormat vips_round_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, C, US, S, UI, I, F, X, D, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, F, X, D, DX
};
static void

4
libvips/arithmetic/sign.c
View File

@ -138,8 +138,8 @@ vips_sign_buffer( VipsArithmetic *arithmetic,
#define DX VIPS_FORMAT_DPCOMPLEX
static const VipsBandFormat vips_sign_format_table[10] = {
/* UC C US S UI I F X D DX */
C, C, C, C, C, C, C, X, C, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ C, C, C, C, C, C, C, X, C, DX
};
static void

4
libvips/arithmetic/subtract.c
View File

@ -148,8 +148,8 @@ vips_subtract_buffer( VipsArithmetic *arithmetic,
* match the case statement in vips_subtract_buffer() above.
*/
static const VipsBandFormat vips_subtract_format_table[10] = {
/* UC C US S UI I F X D DX */
S, S, I, I, I, I, F, X, D, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ S, S, I, I, I, I, F, X, D, DX
};
static void

4
libvips/arithmetic/sum.c
View File

@ -127,8 +127,8 @@ sum_buffer( VipsArithmetic *arithmetic, VipsPel *out, VipsPel **in, int width )
* match the case statement in sum_buffer() above.
*/
static const VipsBandFormat vips_sum_format_table[10] = {
/* UC C US S UI I F X D DX */
UI, I, UI, I, UI, I, F, X, D, DX
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UI, I, UI, I, UI, I, F, X, D, DX
};
static void

4
libvips/conversion/bandbool.c
View File

@ -190,8 +190,8 @@ vips_bandbool_buffer( VipsBandarySequence *seq,
/* Format conversions for boolean.
*/
static const VipsBandFormat vips_bandbool_format_table[10] = {
/* UC C US S UI I F X D DX */
UC, C, US, S, UI, I, I, I, I, I,
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, I, I, I, I
};
static void

20
libvips/conversion/gamma.c
View File

@ -69,16 +69,16 @@ G_DEFINE_TYPE( VipsGamma, vips_gamma, VIPS_TYPE_CONVERSION );
/* For each input format, what we normalise the pow() about.
*/
static double vips_gamma_maxval[10] = {
/* UC */ UCHAR_MAX,
/* C */ SCHAR_MAX,
/* US */ USHRT_MAX,
/* S */ SHRT_MAX,
/* UI */ UINT_MAX,
/* I */ INT_MAX,
/* F */ 1.0,
/* X */ 1.0,
/* D */ 1.0,
/* DX */ 1.0
/* UC */ UCHAR_MAX,
/* C */ SCHAR_MAX,
/* US */ USHRT_MAX,
/* S */ SHRT_MAX,
/* UI */ UINT_MAX,
/* I */ INT_MAX,
/* F */ 1.0,
/* X */ 1.0,
/* D */ 1.0,
/* DX */ 1.0
};
static int

6
libvips/convolution/fastcor.c
View File

@ -200,9 +200,9 @@ vips_fastcor_correlation( VipsCorrelation *correlation,
/* Type promotion for multiplication. Sign and value preserving. Make sure
* these match the case statement in multiply_buffer() above.
*/
static int vips_fastcor_format_table[10] = {
/* UC C US S UI I F X D DX */
UI, UI, UI, UI, UI, UI,F, X, D, DX
static const VipsBandFormat vips_fastcor_format_table[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UI, UI, UI, UI, UI, UI, F, X, D, DX
};
static void

6
libvips/convolution/spcor.c
View File

@ -300,9 +300,9 @@ vips_spcor_correlation( VipsCorrelation *correlation,
#define D VIPS_FORMAT_DOUBLE
#define DX VIPS_FORMAT_DPCOMPLEX
static int vips_spcor_format_table[10] = {
/* UC C US S UI I F X D DX */
F, F, F, F, F, F, F, F, F, F
static const VipsBandFormat vips_spcor_format_table[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ F, F, F, F, F, F, F, F, F, F
};
static void

8
libvips/foreign/cgifsave.c
View File

@ -770,8 +770,12 @@ vips_foreign_save_cgif_build( VipsObject *object )
static const char *vips__save_cgif_suffs[] = { ".gif", NULL };
#define UC VIPS_FORMAT_UCHAR
static int bandfmt_gif[10] = {
UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
/* Type promotion for save ... just always go to uchar.
*/
static VipsBandFormat bandfmt_gif[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
};
static void

6
libvips/foreign/dzsave.c
View File

@ -2681,9 +2681,9 @@ vips_foreign_save_dz_build( VipsObject *object )
#define D VIPS_FORMAT_DOUBLE
#define DX VIPS_FORMAT_DPCOMPLEX
static int bandfmt_dz[10] = {
/* UC C US S UI I F X D DX */
UC, C, US, S, UI, I, F, F, D, D
static VipsBandFormat bandfmt_dz[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, F, F, D, D
};
static const char *dz_suffs[] = { ".dz", ".szi", NULL };

6
libvips/foreign/fitssave.c
View File

@ -109,9 +109,9 @@ vips_foreign_save_fits_build( VipsObject *object )
#define D VIPS_FORMAT_DOUBLE
#define DX VIPS_FORMAT_DPCOMPLEX
static int bandfmt_fits[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, UI, UI, F, X, D, DX
static VipsBandFormat bandfmt_fits[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, UI, UI, F, X, D, DX
};
static void

6
libvips/foreign/foreign.c
View File

@ -1748,9 +1748,9 @@ vips_foreign_save_build( VipsObject *object )
#define D VIPS_FORMAT_DOUBLE
#define DX VIPS_FORMAT_DPCOMPLEX
static int vips_foreign_save_format_table[10] = {
// UC C US S UI I F X D DX
UC, C, US, S, UI, I, F, X, D, DX
static VipsBandFormat vips_foreign_save_format_table[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, F, X, D, DX
};
static void

9
libvips/foreign/heifsave.c
View File

@ -577,9 +577,12 @@ vips_foreign_save_heif_build( VipsObject *object )
#define UC VIPS_FORMAT_UCHAR
#define US VIPS_FORMAT_USHORT
static int vips_heif_bandfmt[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, US, US, US, US, US, US
/* Except for 8-bit inputs, we send everything else to 16. We decide on 8-bit
* vs. 12 bit save based on Type in_build(), see above.
*/
static VipsBandFormat vips_heif_bandfmt[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, US, US, US, US, US, US
};
static void

6
libvips/foreign/jpegsave.c
View File

@ -118,9 +118,9 @@ G_DEFINE_ABSTRACT_TYPE( VipsForeignSaveJpeg, vips_foreign_save_jpeg,
/* Type promotion for save ... just always go to uchar.
*/
static int bandfmt_jpeg[10] = {
/* UC C US S UI I F X D DX */
UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
static VipsBandFormat bandfmt_jpeg[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
};
static int

6
libvips/foreign/jxlsave.c
View File

@ -484,9 +484,9 @@ vips_foreign_save_jxl_build( VipsObject *object )
/* Type promotion for save ... unsigned ints + float + double.
*/
static int bandfmt_jxl[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, F, F, F, F, F, F
static VipsBandFormat bandfmt_jxl[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, F, F, F, F, F, F
};
static void

6
libvips/foreign/matrixsave.c
View File

@ -153,9 +153,9 @@ vips_foreign_save_matrix_build( VipsObject *object )
#define D VIPS_FORMAT_DOUBLE
#define DX VIPS_FORMAT_DPCOMPLEX
static int bandfmt_matrix[10] = {
/* UC C US S UI I F X D DX */
D, D, D, D, D, D, D, D, D, D
static VipsBandFormat bandfmt_matrix[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ D, D, D, D, D, D, D, D, D, D
};
static const char *vips_foreign_save_matrix_suffs[] = {

6
libvips/foreign/niftisave.c
View File

@ -407,9 +407,9 @@ vips_foreign_save_nifti_build( VipsObject *object )
#define D VIPS_FORMAT_DOUBLE
#define DX VIPS_FORMAT_DPCOMPLEX
static int vips_nifti_bandfmt[10] = {
/* UC C US S UI I F X D DX */
UC, C, US, S, UI, I, F, X, D, DX
static VipsBandFormat vips_nifti_bandfmt[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, C, US, S, UI, I, F, X, D, DX
};
static void

6
libvips/foreign/pngsave.c
View File

@ -182,9 +182,9 @@ vips_foreign_save_png_build( VipsObject *object )
/* Except for 8-bit inputs, we send everything else to 16. We decide on png8
* vs. png16 based on Type in_build(), see above.
*/
static int bandfmt_png[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, US, US, US, US, US, US
static VipsBandFormat bandfmt_png[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, US, US, US, US, US, US
};
static void

6
libvips/foreign/ppmsave.c
View File

@ -444,9 +444,9 @@ vips_foreign_save_ppm_build( VipsObject *object )
#define D VIPS_FORMAT_DOUBLE
#define DX VIPS_FORMAT_DPCOMPLEX
static int bandfmt_ppm[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, UI, UI, F, F, F, F
static VipsBandFormat bandfmt_ppm[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, UI, UI, F, F, F, F
};
static void

6
libvips/foreign/radsave.c
View File

@ -76,9 +76,9 @@ G_DEFINE_ABSTRACT_TYPE( VipsForeignSaveRad, vips_foreign_save_rad,
#define D VIPS_FORMAT_DOUBLE
#define DX VIPS_FORMAT_DPCOMPLEX
static int vips_foreign_save_rad_format_table[10] = {
/* UC C US S UI I F X D DX */
F, F, F, F, F, F, F, F, F, F
static VipsBandFormat vips_foreign_save_rad_format_table[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ F, F, F, F, F, F, F, F, F, F
};
static void

13
libvips/foreign/spngsave.c
View File

@ -650,14 +650,15 @@ vips_foreign_save_spng_build( VipsObject *object )
return( 0 );
}
/* Except for 8-bit inputs, we send everything else to 16. We decide on spng8
* vs. spng16 based on Type in_build(), see above.
*/
#define UC VIPS_FORMAT_UCHAR
#define US VIPS_FORMAT_USHORT
static int bandfmt_spng[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, US, US, US, US, US, US
/* Except for 8-bit inputs, we send everything else to 16. We decide on png8
* vs. png16 based on Type in_build(), see above.
*/
static VipsBandFormat bandfmt_spng[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, US, US, US, US, US, US
};
static void

6
libvips/foreign/tiffsave.c
View File

@ -137,9 +137,9 @@ vips_foreign_save_tiff_dispose( GObject *gobject )
/* Type promotion for jpeg-in-tiff save ... just always go to uchar.
*/
static int bandfmt_jpeg[10] = {
/* UC C US S UI I F X D DX */
UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
static VipsBandFormat bandfmt_jpeg[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
};
static int

6
libvips/foreign/vips2magick.c
View File

@ -445,9 +445,9 @@ static const char *vips__save_magick_gif_suffs[] = { ".gif", NULL };
#define F VIPS_FORMAT_FLOAT
#define D VIPS_FORMAT_DOUBLE
static int bandfmt_magick[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, UI, UI, F, F, D, D
static VipsBandFormat bandfmt_magick[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, UI, UI, F, F, D, D
};
static void

6
libvips/foreign/webpsave.c
View File

@ -724,9 +724,9 @@ static const char *vips__save_webp_suffs[] = { ".webp", NULL };
/* Type promotion for save ... just always go to uchar.
*/
static int bandfmt_webp[10] = {
/* UC C US S UI I F X D DX */
UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
static VipsBandFormat bandfmt_webp[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, UC, UC, UC, UC, UC, UC, UC, UC
};
static void

4
libvips/histogram/hist_cum.c
View File

@ -134,8 +134,8 @@ vips_hist_cum_process( VipsHistogram *histogram,
#define DX VIPS_FORMAT_DPCOMPLEX
static const VipsBandFormat vips_hist_cum_format_table[10] = {
/* UC C US S UI I F X D DX */
UI, I, UI, I, UI, I, F, F, D, D
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UI, I, UI, I, UI, I, F, F, D, D
};
static void

6
libvips/histogram/maplut.c
View File

@ -498,9 +498,9 @@ vips_maplut_stop( void *vseq, void *a, void *b )
/* Type mapping: go to uchar / ushort / uint to make an index.
*/
static int bandfmt_maplut[10] = {
/* UC C US S UI I F X D DX */
UC, UC, US, US, UI, UI, UI, UI, UI, UI
static const VipsBandFormat bandfmt_maplut[10] = {
/* Band format: UC C US S UI I F X D DX */
/* Promotion: */ UC, UC, US, US, UI, UI, UI, UI, UI, UI
};
/* Repack lut into a set of band arrays. If we're just passing one band of the