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

Merge branch 'master' into add-canny

Browse Source
This commit is contained in:
John Cupitt 2018-02-19 15:49:27 +00:00
commit 529c8247a5
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -474,7 +474,7 @@ public:
VipsImage *image; VipsImage *image;
if( !(image = vips_image_new_from_image( this->get_image(), if( !(image = vips_image_new_from_image( this->get_image(),
&pixel[0], pixel.size() )) ) &pixel[0], static_cast<int>( pixel.size() ) )) )
throw( VError() ); throw( VError() );
return( VImage( image ) ); return( VImage( image ) );

13
doc/using-command-line.xml
View File

@ -44,7 +44,7 @@ where:
</programlisting> </programlisting>
There's a straightforward relationship with the C API: compare this to There's a straightforward relationship with the C API: compare this to
the API docs for vips_rot(), for example. the API docs for vips_rot().
</para> </para>
</refsect3> </refsect3>
@ -83,7 +83,7 @@ VipsOperation (operation), operations
<title>Optional arguments</title> <title>Optional arguments</title>
<para> <para>
Many operations take optional arguments. You can supply these as Many operations take optional arguments. You can supply these as
command-line options, for example: command-line options. For example:
<programlisting> <programlisting>
$ vips gamma $ vips gamma
@ -120,10 +120,9 @@ $ vips gamma k2.jpg x.jpg --exponent 0.42
<refsect3 id="using-command-line-array"> <refsect3 id="using-command-line-array">
<title>Array arguments</title> <title>Array arguments</title>
<para> <para>
Some operations take arrays of values as arguments, for example, Some operations take arrays of values as arguments. For example,
vips_affine() needs an array of four numbers for the vips_affine() needs an array of four numbers for the
2x2 transform matrix. You pass arrays as space-separated lists, for 2x2 transform matrix. You pass arrays as space-separated lists:
example:
<programlisting> <programlisting>
$ vips affine k2.jpg x.jpg "2 0 0 1" $ vips affine k2.jpg x.jpg "2 0 0 1"
@ -151,7 +150,7 @@ $ vips bandjoin "k2.jpg k4.jpg" x.tif
$ vips -l foreign $ vips -l foreign
</programlisting> </programlisting>
Then get a list of the options a format supports with, for example: Then get a list of the options a format supports with:
<programlisting> <programlisting>
$ vips jpegsave $ vips jpegsave
@ -160,7 +159,7 @@ $ vips jpegsave
<para> <para>
You can pass options to the implicit load and save operations enclosed You can pass options to the implicit load and save operations enclosed
in square brackets after the filename. For example: in square brackets after the filename:
<programlisting> <programlisting>
vips affine k2.jpg x.jpg[Q=90,strip] "2 0 0 1" vips affine k2.jpg x.jpg[Q=90,strip] "2 0 0 1"