From c4edd1f621808db5f4df2e17fb97720e2fa852c6 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 30 Mar 2009 12:36:05 +0000
Subject: [PATCH] stuff

---
 ChangeLog                        |  1 +
 TODO                             |  1 +
 configure.in                     |  8 ++------
 libsrc/colour/im_icc_transform.c | 12 ++++++------
 libsrc/format/im_exr2vips.c      |  3 ++-
 libsrc/format/im_jpeg2vips.c     |  3 ++-
 libsrc/format/im_magick2vips.c   |  3 ++-
 libsrc/format/im_png2vips.c      |  3 ++-
 libsrc/format/im_tiff2vips.c     |  3 ++-
 libsrc/format/im_vips2jpeg.c     |  9 ++++++---
 libsrc/format/im_vips2png.c      |  3 ++-
 libsrc/format/im_vips2tiff.c     |  3 ++-
 12 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6b044594..2ba008fe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,7 @@
 - updated vipsmanual
 - revised manpages
 - removed name and "changed" from vipsobject since we don't use them yet
+- explicitly link with stdc++ for nohalo etc stuff
 
 6/3/09 started 7.17.3
 - revised nohalo
diff --git a/TODO b/TODO
index 770de6bb..ffe66fcb 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,4 @@
+
 - writing man page for VipsInterpolate
 
 - wrap im_gauss_mask_line or whatever it's called in C++/Python?
diff --git a/configure.in b/configure.in
index ebc4d65b..833ef7e7 100644
--- a/configure.in
+++ b/configure.in
@@ -451,11 +451,6 @@ AC_ARG_WITH([cimg],
 if test x"$with_cimg" != "xno"; then
   AM_CONDITIONAL(WITH_CIMG, true)
   AC_DEFINE(WITH_CIMG,1,[include cimg package])
-
-  # we have to explicitly link with stdc++ on mingw for some reason, yuk!
-  if test x"$vips_os_win32" = "xyes"; then
-    CIMG_LIBS=-lstdc++
-  fi
   with_cimg=yes
 else
   AM_CONDITIONAL(WITH_CIMG, false)
@@ -472,7 +467,8 @@ do
 done | sort -ru`
 VIPS_CFLAGS=`echo $VIPS_CFLAGS`
 VIPS_INCLUDES="$PNG_INCLUDES $TIFF_INCLUDES $ZIP_INCLUDES $JPEG_INCLUDES $FFTW_INCLUDES $LCMS_INCLUDES" 
-VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $FFTW3_LIBS $FFTW_LIBS $LCMS_LIBS $LIBOIL_LIBS $OPENEXR_LIBS $MATIO_LIBS $EXIF_LIBS -lm $CIMG_LIBS"
+# need -lstdc++ for (eg.) the C++ format loaders
+VIPS_LIBS="$MAGICK_LIBS $PNG_LIBS $TIFF_LIBS $ZIP_LIBS $JPEG_LIBS $GTHREAD_LIBS $REQUIRED_LIBS $PANGOFT2_LIBS $FFTW3_LIBS $FFTW_LIBS $LCMS_LIBS $LIBOIL_LIBS $OPENEXR_LIBS $MATIO_LIBS $EXIF_LIBS -lstdc++ -lm"
 
 AC_SUBST(VIPS_CFLAGS)
 AC_SUBST(VIPS_INCLUDES)
diff --git a/libsrc/colour/im_icc_transform.c b/libsrc/colour/im_icc_transform.c
index 4b481088..ad0086f7 100644
--- a/libsrc/colour/im_icc_transform.c
+++ b/libsrc/colour/im_icc_transform.c
@@ -59,7 +59,7 @@ im_icc_transform( IMAGE *in, IMAGE *out,
 	const char *output_profile_filename,
 	int intent )
 {
-	im_error( "im_icc_transform", 
+	im_error( "im_icc_transform", "%s",
 		_( "lcms library not linked to this VIPS" ) );
 
 	return( -1 );
@@ -69,7 +69,7 @@ int
 im_icc_import( IMAGE *in, IMAGE *out, 
 	const char *input_profile_filename, int intent )
 {
-	im_error( "im_icc_import", 
+	im_error( "im_icc_import", "%s",
 		_( "lmcs library not linked to this VIPS" ) );
 
 	return( -1 );
@@ -78,7 +78,7 @@ im_icc_import( IMAGE *in, IMAGE *out,
 int
 im_icc_import_embedded( IMAGE *in, IMAGE *out, int intent )
 {
-	im_error( "im_icc_import",
+	im_error( "im_icc_import", "%s",
 		_( "lmcs library not linked to this VIPS" ) );
 
 	return( -1 );
@@ -88,7 +88,7 @@ int
 im_icc_export_depth( IMAGE *in, IMAGE *out, int depth,
 	const char *output_profile_filename, int intent )
 {
-	im_error( "im_icc_export_depth", 
+	im_error( "im_icc_export_depth", "%s", 
 		_( "lmcs library not linked to this VIPS" ) );
 
 	return( -1 );
@@ -98,7 +98,7 @@ int
 im_icc_export( IMAGE *in, IMAGE *out, 
 	const char *output_profile_filename, int intent )
 {
-	im_error( "im_icc_export", 
+	im_error( "im_icc_export", "%s", 
 		_( "lmcs library not linked to this VIPS" ) );
 
 	return( -1 );
@@ -107,7 +107,7 @@ im_icc_export( IMAGE *in, IMAGE *out,
 int
 im_icc_ac2rc( IMAGE *in, IMAGE *out, const char *profile_filename )
 {
-	im_error( "im_icc_ac2rc", 
+	im_error( "im_icc_ac2rc", "%s", 
 		_( "lmcs library not linked to this VIPS" ) );
 
 	return( -1 );
diff --git a/libsrc/format/im_exr2vips.c b/libsrc/format/im_exr2vips.c
index 467c3d02..98260b5e 100644
--- a/libsrc/format/im_exr2vips.c
+++ b/libsrc/format/im_exr2vips.c
@@ -65,7 +65,8 @@
 int
 im_exr2vips( const char *name, IMAGE *out )
 {
-	im_error( "im_exr2vips", _( "OpenEXR support disabled" ) );
+	im_error( "im_exr2vips", "%s",
+		_( "OpenEXR support disabled" ) );
 	return( -1 );
 }
 
diff --git a/libsrc/format/im_jpeg2vips.c b/libsrc/format/im_jpeg2vips.c
index aa38963a..9bde61fe 100644
--- a/libsrc/format/im_jpeg2vips.c
+++ b/libsrc/format/im_jpeg2vips.c
@@ -67,7 +67,8 @@
 int
 im_jpeg2vips( const char *name, IMAGE *out )
 {
-	im_error( "im_jpeg2vips", _( "JPEG support disabled" ) );
+	im_error( "im_jpeg2vips", "%s",
+		_( "JPEG support disabled" ) );
 
 	return( -1 );
 }
diff --git a/libsrc/format/im_magick2vips.c b/libsrc/format/im_magick2vips.c
index cc77202e..b187677a 100644
--- a/libsrc/format/im_magick2vips.c
+++ b/libsrc/format/im_magick2vips.c
@@ -68,7 +68,8 @@
 int
 im_magick2vips( const char *filename, IMAGE *im )
 {
-	im_error( "im_magick2vips", _( "libMagick support disabled" ) );
+	im_error( "im_magick2vips", "%s",
+		_( "libMagick support disabled" ) );
 	return( -1 );
 }
 
diff --git a/libsrc/format/im_png2vips.c b/libsrc/format/im_png2vips.c
index 05d260ad..3194f188 100644
--- a/libsrc/format/im_png2vips.c
+++ b/libsrc/format/im_png2vips.c
@@ -58,7 +58,8 @@
 int
 im_png2vips( const char *name, IMAGE *out )
 {
-	im_error( "im_png2vips", _( "PNG support disabled" ) );
+	im_error( "im_png2vips", "%s",
+		_( "PNG support disabled" ) );
 	return( -1 );
 }
 
diff --git a/libsrc/format/im_tiff2vips.c b/libsrc/format/im_tiff2vips.c
index c6b8a692..c298be3e 100644
--- a/libsrc/format/im_tiff2vips.c
+++ b/libsrc/format/im_tiff2vips.c
@@ -150,7 +150,8 @@
 int
 im_tiff2vips( const char *tiffile, IMAGE *im )
 {
-	im_error( "im_tiff2vips", _( "TIFF support disabled" ) );
+	im_error( "im_tiff2vips", "%s",
+		_( "TIFF support disabled" ) );
 	return( -1 );
 }
 
diff --git a/libsrc/format/im_vips2jpeg.c b/libsrc/format/im_vips2jpeg.c
index 47771925..7f746fa5 100644
--- a/libsrc/format/im_vips2jpeg.c
+++ b/libsrc/format/im_vips2jpeg.c
@@ -70,7 +70,8 @@
 int
 im_vips2jpeg( IMAGE *in, const char *filename )
 {
-	im_error( "im_vips2jpeg", _( "JPEG support disabled" ) );
+	im_error( "im_vips2jpeg", "%s",
+		_( "JPEG support disabled" ) );
 
 	return( -1 );
 }
@@ -78,7 +79,8 @@ im_vips2jpeg( IMAGE *in, const char *filename )
 int
 im_vips2bufjpeg( IMAGE *in, IMAGE *out, int qfac, char **obuf, int *olen )
 {
-	im_error( "im_vips2bufjpeg", _( "JPEG support disabled" ) );
+	im_error( "im_vips2bufjpeg", "%s",
+		_( "JPEG support disabled" ) );
 
 	return( -1 );
 }
@@ -86,7 +88,8 @@ im_vips2bufjpeg( IMAGE *in, IMAGE *out, int qfac, char **obuf, int *olen )
 int
 im_vips2mimejpeg( IMAGE *in, int qfac )
 {
-	im_error( "im_vips2mimejpeg", _( "JPEG support disabled" ) );
+	im_error( "im_vips2mimejpeg", "%s",
+		_( "JPEG support disabled" ) );
 
 	return( -1 );
 }
diff --git a/libsrc/format/im_vips2png.c b/libsrc/format/im_vips2png.c
index a6d10eda..4131ebf5 100644
--- a/libsrc/format/im_vips2png.c
+++ b/libsrc/format/im_vips2png.c
@@ -56,7 +56,8 @@
 int
 im_vips2png( IMAGE *in, const char *filename )
 {
-	im_error( "im_vips2png", _( "PNG support disabled" ) );
+	im_error( "im_vips2png", "%s",
+		_( "PNG support disabled" ) );
 	return( -1 );
 }
 
diff --git a/libsrc/format/im_vips2tiff.c b/libsrc/format/im_vips2tiff.c
index d6c3e3e6..288baa21 100644
--- a/libsrc/format/im_vips2tiff.c
+++ b/libsrc/format/im_vips2tiff.c
@@ -150,7 +150,8 @@
 int
 im_vips2tiff( IMAGE *im, const char *filename )
 {
-	im_error( "im_vips2tiff", _( "TIFF support disabled" ) );
+	im_error( "im_vips2tiff", "%s",
+		_( "TIFF support disabled" ) );
 
 	return( -1 );
 }