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

Merge branch 'master' of github.com:jcupitt/libvips

Browse Source
This commit is contained in:
John Cupitt 2017-12-04 12:01:08 +00:00
commit 0702a01e60
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/Makefile.am
View File

@ -50,7 +50,7 @@ FIXXREF_OPTIONS=
# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h # e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
HFILE_GLOB=$(top_srcdir)/libvips/include/vips/*.h HFILE_GLOB=$(top_srcdir)/libvips/include/vips/*.h
CFILE_GLOB=$(top_srcdir)/libvips/*/*.c CFILE_GLOB=$(top_srcdir)/libvips/*/*.c $(top_srcdir)/libvips/*/*.cpp
# Extra header to include when scanning, which are not under DOC_SOURCE_DIR # Extra header to include when scanning, which are not under DOC_SOURCE_DIR
# e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h # e.g. EXTRA_HFILES=$(top_srcdir}/contrib/extra.h

1
doc/libvips-docs.xml.in
View File

@ -42,7 +42,6 @@
<xi:include href="xml/How-it-opens-files.xml"/> <xi:include href="xml/How-it-opens-files.xml"/>
<xi:include href="xml/Making-image-pyramids.xml"/> <xi:include href="xml/Making-image-pyramids.xml"/>
<xi:include href="xml/Using-vipsthumbnail.xml"/> <xi:include href="xml/Using-vipsthumbnail.xml"/>
<xi:include href="xml/Cite.xml"/>
<xi:include href="xml/Examples.xml"/> <xi:include href="xml/Examples.xml"/>
<xi:include href="xml/Cite.xml"/> <xi:include href="xml/Cite.xml"/>
</chapter> </chapter>

2
libvips/conversion/composite.cpp
View File

@ -1388,7 +1388,7 @@ vips_composite2_init( VipsComposite2 *composite2 )
* @mode: composite with this blend mode * @mode: composite with this blend mode
* @...: %NULL-terminated list of optional named arguments * @...: %NULL-terminated list of optional named arguments
* *
* Composite @overlay on top of @base with @mode. See vips_composite_base(). * Composite @overlay on top of @base with @mode. See vips_composite().
* *
* Returns: 0 on success, -1 on error * Returns: 0 on success, -1 on error
*/ */