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

fix matlab block test

Browse Source
This commit is contained in:
John Cupitt 2022-07-30 12:36:56 +01:00
parent cf97ea3ea1
commit d17fd9b640
2 changed files with 115 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libvips/foreign/jp2ksave.c
View File

@ -107,7 +107,7 @@ typedef struct _VipsForeignSaveJp2k {
*/ */
gboolean subsample; gboolean subsample;
/* If we converto RGB to YCC during save. /* If we convert RGB to YCC during save.
*/ */
gboolean save_as_ycc; gboolean save_as_ycc;
@ -722,7 +722,7 @@ vips_foreign_save_jp2k_new_image( VipsImage *im,
return( image ); return( image );
} }
/* Compression profile derived from the BM's recommenadations, see: /* Compression profile derived from the BM's recommendations, see:
* *
* https://purl.pt/24107/1/iPres2013_PDF/An%20Analysis%20of%20Contemporary%20JPEG2000%20Codecs%20for%20Image%20Format%20Migration.pdf * https://purl.pt/24107/1/iPres2013_PDF/An%20Analysis%20of%20Contemporary%20JPEG2000%20Codecs%20for%20Image%20Format%20Migration.pdf
* *
@ -962,7 +962,7 @@ vips_foreign_save_jp2k_class_init( VipsForeignSaveJp2kClass *class )
VIPS_ARGUMENT_OPTIONAL_INPUT, VIPS_ARGUMENT_OPTIONAL_INPUT,
G_STRUCT_OFFSET( VipsForeignSaveJp2k, subsample_mode ), G_STRUCT_OFFSET( VipsForeignSaveJp2k, subsample_mode ),
VIPS_TYPE_FOREIGN_SUBSAMPLE, VIPS_TYPE_FOREIGN_SUBSAMPLE,
VIPS_FOREIGN_SUBSAMPLE_AUTO ); VIPS_FOREIGN_SUBSAMPLE_OFF );
VIPS_ARG_INT( class, "Q", 14, VIPS_ARG_INT( class, "Q", 14,
_( "Q" ), _( "Q" ),
@ -983,7 +983,7 @@ vips_foreign_save_jp2k_init( VipsForeignSaveJp2k *jp2k )
*/ */
jp2k->Q = 48; jp2k->Q = 48;
jp2k->subsample_mode = VIPS_FOREIGN_SUBSAMPLE_AUTO; jp2k->subsample_mode = VIPS_FOREIGN_SUBSAMPLE_OFF;
} }
typedef struct _VipsForeignSaveJp2kFile { typedef struct _VipsForeignSaveJp2kFile {
@ -1433,8 +1433,8 @@ vips__foreign_load_jp2k_compress( VipsRegion *region,
* *
* Use @tile_width and @tile_height to set the tile size. The default is 512. * Use @tile_width and @tile_height to set the tile size. The default is 512.
* *
* Chroma subsampling is normally automatically disabled for Q >= 90. You can * Chroma subsampling is normally disabled for compatibility. Set
* force the subsampling mode with @subsample_mode. * @subsample_mode to auto to enable chroma subsample for Q < 90.
* *
* This operation always writes a pyramid. * This operation always writes a pyramid.
* *

2
test/test_formats.sh
View File

@ -204,7 +204,7 @@ if test_supported matload; then
# test blocked and untrusted # test blocked and untrusted
printf "testing VIPS_BLOCK_UNTRUSTED with matio ... " printf "testing VIPS_BLOCK_UNTRUSTED with matio ... "
export VIPS_BLOCK_UNTRUSTED=1 export VIPS_BLOCK_UNTRUSTED=1
if vips matload $matlab $tmp/block.png; then if $vips copy $matlab $tmp/block.png; then
echo "failed to block matload" echo "failed to block matload"
exit 1 exit 1
fi fi