This commit is contained in:
John Cupitt 2007-09-28 16:59:28 +00:00
parent 4424f23af1
commit 352350e9be
4 changed files with 28 additions and 5 deletions

View File

@ -1,3 +1,6 @@
28/9/07 started 7.13.1
- vips2dj can print RGB images
29/8/07 started 7.13.0 29/8/07 started 7.13.0
- we now have a trunk and the version is 7.13.x, woo! - we now have a trunk and the version is 7.13.x, woo!
- move manpages into a separate man/ dir ... speeds up builds a lot on windows - move manpages into a separate man/ dir ... speeds up builds a lot on windows

3
TODO
View File

@ -1,3 +1,6 @@
- im_scale() on a GREY16 image should change the Type? same for im_clip()?
don't know
Python binding Python binding
============== ==============

View File

@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
# user-visible library versioning # user-visible library versioning
IM_MAJOR_VERSION=7 IM_MAJOR_VERSION=7
IM_MINOR_VERSION=13 IM_MINOR_VERSION=13
IM_MICRO_VERSION=0 IM_MICRO_VERSION=1
IM_VERSION=$IM_MAJOR_VERSION.$IM_MINOR_VERSION.$IM_MICRO_VERSION IM_VERSION=$IM_MAJOR_VERSION.$IM_MINOR_VERSION.$IM_MICRO_VERSION
IM_VERSION_STRING=$IM_VERSION-`date` IM_VERSION_STRING=$IM_VERSION-`date`
@ -21,9 +21,9 @@ PACKAGE=vips
# interface changes backwards compatible?: increment age # interface changes backwards compatible?: increment age
# interface changes not backwards compatible?: reset age to 0 # interface changes not backwards compatible?: reset age to 0
LIBRARY_CURRENT=15 LIBRARY_CURRENT=16
LIBRARY_REVISION=0 LIBRARY_REVISION=0
LIBRARY_AGE=0 LIBRARY_AGE=1
AM_INIT_AUTOMAKE($PACKAGE,$VERSION) AM_INIT_AUTOMAKE($PACKAGE,$VERSION)

View File

@ -51,7 +51,8 @@ PrinterGeometry printer_data[] = {
{ "2500cp", 2592, 2502, 3728, 51, 82 }, { "2500cp", 2592, 2502, 3728, 51, 82 },
{ "3500cp", 3888, 3786, 5212, 51, 82 }, { "3500cp", 3888, 3786, 5212, 51, 82 },
{ "5000ps", 4320, 4280, 5212, 20, 99 }, { "5000ps", 4320, 4280, 5212, 20, 99 },
{ "4600dn", 594, 570, 817, 11, 15 } { "4600dn", 595, 570, 817, 11, 15 },
{ "4700n", 595, 569, 816, 17, 14 }
}; };
/* Print a geo entry. /* Print a geo entry.
@ -213,7 +214,8 @@ main( int argc, char **argv )
printf( printf(
"usage:\n" "usage:\n"
"\t%s [options] <image file>\n" "\t%s [options] <image file>\n"
"convert LAB, CMYK and mono image files to postscript\n" "convert RGB, LAB, CMYK and mono image files to postscript\n"
"\tRGB converted to LAB, assuming sRGB\n"
"\tLAB printed with printer colour management\n" "\tLAB printed with printer colour management\n"
"\tCMYK sent directly as dot percent\n" "\tCMYK sent directly as dot percent\n"
"\tmono prints as K only\n" "\tmono prints as K only\n"
@ -302,6 +304,21 @@ main( int argc, char **argv )
if( im == NULL ) if( im == NULL )
error_exit( "no input image" ); error_exit( "no input image" );
/* Turn 3-band uchar images into LABQ. Yuk! But convenient.
*/
if( im->Coding == IM_CODING_NONE &&
im->Bands == 3 && im->BandFmt == IM_BANDFMT_UCHAR ) {
IMAGE *t[3];
if( im_open_local_array( im, t, 3, "vips2dj", "p" ) ||
im_sRGB2XYZ( im, t[0] ) ||
im_XYZ2Lab( t[0], t[1] ) ||
im_Lab2LabQ( t[1], t[2] ) )
error_exit( "error converting to LAB" );
im = t[2];
}
/* Stop used-before-set complaints on mode. /* Stop used-before-set complaints on mode.
*/ */
mode = "lab"; mode = "lab";