Merge branch '8.10'
This commit is contained in:
commit
5f3482bff5
@ -26,6 +26,7 @@
|
||||
- fix msb_first default in ppm load and save [ewelot]
|
||||
- force binary mode on win for connection read / write [Alreiber]
|
||||
- better testing for output to target [barryspearce]
|
||||
- ppmload_source was missing is_a [ewelot]
|
||||
|
||||
6/9/20 started 8.10.2
|
||||
- update magicksave/load profile handling [kelilevi]
|
||||
|
@ -267,7 +267,7 @@ static const char *heif_magic[] = {
|
||||
"ftypavif" /* AV1 image format */
|
||||
};
|
||||
|
||||
/* THe API has:
|
||||
/* The API has:
|
||||
*
|
||||
* enum heif_filetype_result result = heif_check_filetype( buf, 12 );
|
||||
*
|
||||
|
@ -786,6 +786,7 @@ vips_foreign_load_ppm_source_class_init( VipsForeignLoadPpmFileClass *class )
|
||||
{
|
||||
GObjectClass *gobject_class = G_OBJECT_CLASS( class );
|
||||
VipsObjectClass *object_class = (VipsObjectClass *) class;
|
||||
VipsForeignLoadClass *load_class = (VipsForeignLoadClass *) class;
|
||||
|
||||
gobject_class->set_property = vips_object_set_property;
|
||||
gobject_class->get_property = vips_object_get_property;
|
||||
@ -793,6 +794,8 @@ vips_foreign_load_ppm_source_class_init( VipsForeignLoadPpmFileClass *class )
|
||||
object_class->nickname = "ppmload_source";
|
||||
object_class->build = vips_foreign_load_ppm_source_build;
|
||||
|
||||
load_class->is_a_source = vips_foreign_load_ppm_is_a_source;
|
||||
|
||||
VIPS_ARG_OBJECT( class, "source", 1,
|
||||
_( "Source" ),
|
||||
_( "Source to load from" ),
|
||||
|
@ -175,7 +175,7 @@ vips_source_custom_class_init( VipsSourceCustomClass *class )
|
||||
*
|
||||
* This signal is emitted to read bytes from the source into @buffer.
|
||||
*
|
||||
* Returns: the number of bytes read.
|
||||
* Returns: the number of bytes read. Return 0 for EOF.
|
||||
*/
|
||||
vips_source_custom_signals[SIG_READ] = g_signal_new( "read",
|
||||
G_TYPE_FROM_CLASS( class ),
|
||||
@ -229,7 +229,8 @@ vips_source_custom_new( void )
|
||||
|
||||
VIPS_DEBUG_MSG( "vips_source_custom_new:\n" );
|
||||
|
||||
source_custom = VIPS_SOURCE_CUSTOM( g_object_new( VIPS_TYPE_SOURCE_CUSTOM, NULL ) );
|
||||
source_custom = VIPS_SOURCE_CUSTOM(
|
||||
g_object_new( VIPS_TYPE_SOURCE_CUSTOM, NULL ) );
|
||||
|
||||
if( vips_object_build( VIPS_OBJECT( source_custom ) ) ) {
|
||||
VIPS_UNREF( source_custom );
|
||||
|
Loading…
Reference in New Issue
Block a user