more doc tweaks

libvips/foreign/foreign.c

@@ -99,8 +99,8 @@
  * VipsForeignFlags: 
  * @VIPS_FOREIGN_NONE: no flags set
  * @VIPS_FOREIGN_PARTIAL: the image may be read lazilly
- * @VIPS_FOREIGN_SEQUENTIAL: top-to-bottom lazy reading
  * @VIPS_FOREIGN_BIGENDIAN: image pixels are most-significant byte first
+ * @VIPS_FOREIGN_SEQUENTIAL: top-to-bottom lazy reading
  *
  * Some hints about the image loader.
  *

libvips/include/vips/Makefile.am

@@ -35,7 +35,6 @@ pkginclude_HEADERS = \
 	private.h \
 	rect.h \
 	region.h \
-	relational.h \
 	resample.h \
 	semaphore.h \
 	threadpool.h \

libvips/include/vips/colour.h

@@ -97,7 +97,8 @@ typedef enum {
 	VIPS_INTENT_PERCEPTUAL = 0,
 	VIPS_INTENT_RELATIVE,
 	VIPS_INTENT_SATURATION,
-	VIPS_INTENT_ABSOLUTE
+	VIPS_INTENT_ABSOLUTE,
+	VIPS_INTENT_LAST
 } VipsIntent;
 
 typedef enum {

libvips/include/vips/relational.h

@@ -1,46 +0,0 @@
-/* relational.h
- *
- * 23/9/09
- * 	- from proto.h
- */
-
-/*
-
-    This file is part of VIPS.
-
-    VIPS is free software; you can redistribute it and/or modify
-    it under the terms of the GNU Lesser General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301  USA
-
- */
-
-/*
-
-    These files are distributed with VIPS - http://www.vips.ecs.soton.ac.uk
-
- */
-
-#ifndef IM_RELATIONAL_H
-#define IM_RELATIONAL_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif /*__cplusplus*/
-
-
-#ifdef __cplusplus
-}
-#endif /*__cplusplus*/
-
-#endif /*IM_RELATIONAL_H*/

libvips/include/vips/vips.h

@@ -133,7 +133,6 @@ extern "C" {
 #include <vips/enumtypes.h>
 
 #include <vips/arithmetic.h>
-#include <vips/relational.h>
 #include <vips/conversion.h>
 #include <vips/convolution.h>
 #include <vips/morphology.h>

libvips/iofuncs/enumtypes.c

@@ -625,6 +625,7 @@ vips_intent_get_type( void )
 			{VIPS_INTENT_RELATIVE, "VIPS_INTENT_RELATIVE", "relative"},
 			{VIPS_INTENT_SATURATION, "VIPS_INTENT_SATURATION", "saturation"},
 			{VIPS_INTENT_ABSOLUTE, "VIPS_INTENT_ABSOLUTE", "absolute"},
+			{VIPS_INTENT_LAST, "VIPS_INTENT_LAST", "last"},
 			{0, NULL, NULL}
 		};