fix compiler warnings

13.10 produces a few new ones

ChangeLog

@@ -1,4 +1,7 @@
-3/10/13	started 7.36.2
+18/10/13	started 7.36.3
+- fix compiler warnings in ubuntu 13.10
+
+10/10/13	started 7.36.2
 - better jpeg startup
 - rename jpeg bool type to reduce confusion between libraries
 

TODO

@@ -2,6 +2,17 @@
 Next version
 ============
 
+- make vips_init() into a macro, check sizes of important structs against size
+  at library compile time
+
+  add a new API call like vips__get_sizeof_image() which returns
+  sizeof(VipsImage) from library compile time, compare that to the application
+  compile-time value
+
+  vips_init() macro then passes control on to vips__init() for real startup
+
+  breaks binary API sadly
+
 - do conv and morph quickly as simple wrappers over the vips7 operations
 
 - do much fancier profiling with timing on all locks saved in memory and

configure.ac

@@ -2,7 +2,7 @@
 
 # also update the version number in the m4 macros below
 
-AC_INIT([vips], [7.36.2], [vipsip@jiscmail.ac.uk])
+AC_INIT([vips], [7.36.3], [vipsip@jiscmail.ac.uk])
 # required for gobject-introspection
 AC_PREREQ(2.62)
 
@@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # user-visible library versioning
 m4_define([vips_major_version], [7])
 m4_define([vips_minor_version], [36])
-m4_define([vips_micro_version], [2])
+m4_define([vips_micro_version], [3])
 m4_define([vips_version],
           [vips_major_version.vips_minor_version.vips_micro_version])
 
@@ -37,7 +37,7 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date`
 #   binary interface changes not backwards compatible?: reset age to 0
 
 LIBRARY_CURRENT=35
-LIBRARY_REVISION=2
+LIBRARY_REVISION=3
 LIBRARY_AGE=0
 
 # patched into include/vips/version.h

libvips/cimg/CImg.h

@@ -17860,8 +17860,11 @@ namespace cimg_library {
     static CImg get_load_pandore(std::FILE *const file, const char *const filename=0) {
       std::FILE *const nfile = file?file:cimg::fopen(filename,"rb");
       typedef unsigned char uchar;
+      /* Don't use these two and they cause warnings.
+       *
       typedef unsigned short ushort;
       typedef unsigned int uint;
+       */
       typedef unsigned long ulong;
       CImg dest;
       char tmp[32];

libvips/foreign/dbh.h

@@ -87,7 +87,14 @@ struct dsr                        /*      dsr              */
     };                     	       /* total=348 */
 
 /* Acceptable values for hdr.dime.datatype */
+
+/*
+ * commented this one out: we don't use it, and dirent.h defines this on some
+ * platforms.
+ *
 #define DT_UNKNOWN			0
+ */
+
 #define DT_BINARY			1
 #define DT_UNSIGNED_CHAR		2
 #define DT_SIGNED_SHORT			4