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

Merge remote-tracking branch 'origin/7.40'

Browse Source 
Conflicts:
	ChangeLog
This commit is contained in:
John Cupitt 2014-10-08 13:12:44 +01:00
commit bf65a024b6
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -17,6 +17,7 @@
8/10/14 started 7.40.11 8/10/14 started 7.40.11
- rework extra band handling for colour functions - rework extra band handling for colour functions
- set interpretation of matlut output more carefully
8/9/14 started 7.40.10 8/9/14 started 7.40.10
- icc_import and icc_transform checks the input profile for compatibility - icc_import and icc_transform checks the input profile for compatibility

7
libvips/histogram/maplut.c
View File

@ -602,6 +602,13 @@ vips_maplut_build( VipsObject *object )
if( lut->Bands != 1 ) if( lut->Bands != 1 )
maplut->out->Bands = lut->Bands; maplut->out->Bands = lut->Bands;
/* The Type comes from the image with many bands. A B_W index image,
* for example, needs to become an RGB image when it goes through a
* three-band LUT.
*/
if( lut->Bands != 1 )
maplut->out->Type = lut->Type;
g_signal_connect( in, "preeval", g_signal_connect( in, "preeval",
G_CALLBACK( vips_maplut_preeval ), maplut ); G_CALLBACK( vips_maplut_preeval ), maplut );
g_signal_connect( in, "posteval", g_signal_connect( in, "posteval",