regenerate cpp binding for new methods

cplusplus/gen-operators.py

@@ -37,6 +37,7 @@ gtype_to_cpp = {
     "gdouble" : "double",
     "gboolean" : "bool",
     "gchararray" : "char *",
+    "VipsArrayInt" : "std::vector<int>",
     "VipsArrayDouble" : "std::vector<double>",
     "VipsArrayImage" : "std::vector<VImage>",
     "VipsBlob" : "VipsBlob *"

cplusplus/include/vips/gen-operators-h.py

@@ -27,6 +27,7 @@ gtype_to_cpp = {
     "gdouble" : "double",
     "gboolean" : "bool",
     "gchararray" : "char *",
+    "VipsArrayInt" : "std::vector<int>",
     "VipsArrayDouble" : "std::vector<double>",
     "VipsArrayImage" : "std::vector<VImage>",
     "VipsBlob" : "VipsBlob *"

cplusplus/include/vips/vips-operators.h

@@ -1,5 +1,5 @@
 // headers for vips operations
-// Mon 13 Mar 13:22:09 GMT 2017
+// Fri  6 Oct 16:31:27 BST 2017
 // this file is generated automatically, do not edit!
 
 static void system( char * cmd_format , VOption *options = 0 );
@@ -40,6 +40,7 @@ VImage project( VImage * rows , VOption *options = 0 );
 VImage profile( VImage * rows , VOption *options = 0 );
 VImage measure( int h , int v , VOption *options = 0 );
 std::vector<double> getpoint( int x , int y , VOption *options = 0 );
+int find_trim( int * top , int * width , int * height , VOption *options = 0 );
 VImage copy( VOption *options = 0 );
 VImage tilecache( VOption *options = 0 );
 VImage linecache( VOption *options = 0 );
@@ -79,6 +80,7 @@ VImage msb( VOption *options = 0 );
 VImage byteswap( VOption *options = 0 );
 VImage falsecolour( VOption *options = 0 );
 VImage gamma( VOption *options = 0 );
+static VImage composite( std::vector<VImage> in , std::vector<int> mode , VOption *options = 0 );
 static VImage black( int width , int height , VOption *options = 0 );
 static VImage gaussnoise( int width , int height , VOption *options = 0 );
 static VImage text( char * text , VOption *options = 0 );
@@ -156,6 +158,7 @@ VipsBlob * tiffsave_buffer( VOption *options = 0 );
 void fitssave( char * filename , VOption *options = 0 );
 static VImage thumbnail( char * filename , int width , VOption *options = 0 );
 static VImage thumbnail_buffer( VipsBlob * buffer , int width , VOption *options = 0 );
+VImage thumbnail_image( int width , VOption *options = 0 );
 VImage mapim( VImage index , VOption *options = 0 );
 VImage shrink( double hshrink , double vshrink , VOption *options = 0 );
 VImage shrinkh( int hshrink , VOption *options = 0 );

cplusplus/vips-operators.cpp

@@ -1,5 +1,5 @@
 // bodies for vips operations
-// Mon 13 Mar 13:22:17 GMT 2017
+// Fri  6 Oct 16:30:42 BST 2017
 // this file is generated automatically, do not edit!
 
 void VImage::system( char * cmd_format , VOption *options )
@@ -487,6 +487,21 @@ std::vector<double> VImage::getpoint( int x , int y , VOption *options )
     return( out_array );
 }
 
+int VImage::find_trim( int * top , int * width , int * height , VOption *options )
+{
+    int left;
+
+    call( "find_trim" ,
+        (options ? options : VImage::option()) ->
+            set( "in", *this ) ->
+            set( "left", &left ) ->
+            set( "top", top ) ->
+            set( "width", width ) ->
+            set( "height", height ) );
+
+    return( left );
+}
+
 VImage VImage::copy( VOption *options )
 {
     VImage out;
@@ -988,6 +1003,19 @@ VImage VImage::gamma( VOption *options )
     return( out );
 }
 
+VImage VImage::composite( std::vector<VImage> in , std::vector<int> mode , VOption *options )
+{
+    VImage out;
+
+    call( "composite" ,
+        (options ? options : VImage::option()) ->
+            set( "in", in ) ->
+            set( "out", &out ) ->
+            set( "mode", mode ) );
+
+    return( out );
+}
+
 VImage VImage::black( int width , int height , VOption *options )
 {
     VImage out;
@@ -1904,6 +1932,19 @@ VImage VImage::thumbnail_buffer( VipsBlob * buffer , int width , VOption *option
     return( out );
 }
 
+VImage VImage::thumbnail_image( int width , VOption *options )
+{
+    VImage out;
+
+    call( "thumbnail_image" ,
+        (options ? options : VImage::option()) ->
+            set( "in", *this ) ->
+            set( "out", &out ) ->
+            set( "width", width ) );
+
+    return( out );
+}
+
 VImage VImage::mapim( VImage index , VOption *options )
 {
     VImage out;

libvips/conversion/composite.cpp

@@ -59,7 +59,7 @@
  */
 #define MAX_BANDS (64)
 
-/* Uncomment to disable vector path ... handy for debugging. 
+/* Uncomment to disable the vector path ... handy for debugging. 
 #undef HAVE_VECTOR_ARITH
  */
 
@@ -93,15 +93,10 @@
  *
  * The various Porter-Duff and PDF blend modes. See vips_composite(), 
  * for example.
- */
-
-/* References:
  *
- * @gasi's composite example https://gist.github.com/jcupitt/abacc012e2991f332e8b
+ * The Cairo docs have a nice explanation of all the blend modes:
  *
- * https://en.wikipedia.org/wiki/Alpha_compositing
- *
- * https://www.cairographics.org/operators/
+ * https://www.cairographics.org/operators
  */
 
 /* We have a vector path with gcc's vector attr.