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

Merge branch 'master' into add-assignment-overloads

Browse Source
This commit is contained in:
John Cupitt 2016-06-11 20:15:42 +01:00
commit eb7768ff61
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -22,6 +22,7 @@
- VImage::write() implementation was missing - VImage::write() implementation was missing
- VImage::write() return value changed from void to VImage to help chaining - VImage::write() return value changed from void to VImage to help chaining
- added C++ arithmetic assignment overloads, += etc. - added C++ arithmetic assignment overloads, += etc.
- VImage::ifthenelse() with double args was missing =0 on options
18/5/16 started 8.3.2 18/5/16 started 8.3.2
- more robust vips image reading - more robust vips image reading

6
cplusplus/include/vips/VImage8.h
View File

@ -751,19 +751,19 @@ public:
} }
VImage VImage
ifthenelse( double th, VImage el, VOption *options ) ifthenelse( double th, VImage el, VOption *options = 0 )
{ {
return( ifthenelse( to_vector( th ), el, options ) ); return( ifthenelse( to_vector( th ), el, options ) );
} }
VImage VImage
ifthenelse( VImage th, double el, VOption *options ) ifthenelse( VImage th, double el, VOption *options = 0 )
{ {
return( ifthenelse( th, to_vector( el ), options ) ); return( ifthenelse( th, to_vector( el ), options ) );
} }
VImage VImage
ifthenelse( double th, double el, VOption *options ) ifthenelse( double th, double el, VOption *options = 0 )
{ {
return( ifthenelse( to_vector( th ), to_vector( el ), return( ifthenelse( to_vector( th ), to_vector( el ),
options ) ); options ) );