From 76653e9e78277a90915a0580f8adec40fd080fa2 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 4 Dec 2014 21:47:46 +0000
Subject: [PATCH] add notes to logs for @density

---
 ChangeLog                     | 1 +
 libvips/foreign/foreign.c     | 2 +-
 libvips/foreign/magick.h      | 4 ++--
 libvips/foreign/magick2vips.c | 6 ++++--
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b969473d..02e7f729 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,7 @@
 - changed vips_gaussblur() parameters, sorry
 - add .szi as a dzsave zip synonym
 - support tiff XMP metadata
+- support @density arg to magickload [Lovell]
 
 25/7/14 started 7.41.0
 - start working on --disable-deprecated
diff --git a/libvips/foreign/foreign.c b/libvips/foreign/foreign.c
index 74f4f909..322b30d5 100644
--- a/libvips/foreign/foreign.c
+++ b/libvips/foreign/foreign.c
@@ -1646,7 +1646,7 @@ vips_foreign_operation_init( void )
  * Normally it will only load the first image in a many-image sequence (such
  * as a GIF). Set @all_frames to true to read the whole image sequence. 
  *
- * @density is "WxH" in DPI, e.g. "600x300" or "600" (default is "72x72")
+ * @density is "WxH" in DPI, e.g. "600x300" or "600" (default is "72x72"). See
  * http://www.imagemagick.org/script/command-line-options.php#density
  *
  * See also: vips_image_new_from_file().
diff --git a/libvips/foreign/magick.h b/libvips/foreign/magick.h
index 56e868c8..80b98772 100644
--- a/libvips/foreign/magick.h
+++ b/libvips/foreign/magick.h
@@ -36,9 +36,9 @@ extern "C" {
 #endif /*__cplusplus*/
 
 int vips__magick_read( const char *filename, 
-	VipsImage *out, gboolean all_frames, const char* density );
+	VipsImage *out, gboolean all_frames, const char *density );
 int vips__magick_read_header( const char *filename, 
-	VipsImage *out, gboolean all_frames, const char* density );
+	VipsImage *out, gboolean all_frames, const char *density );
 
 #ifdef __cplusplus
 }
diff --git a/libvips/foreign/magick2vips.c b/libvips/foreign/magick2vips.c
index 71615bd2..e2df66ab 100644
--- a/libvips/foreign/magick2vips.c
+++ b/libvips/foreign/magick2vips.c
@@ -40,6 +40,8 @@
  * 	- turn into a set of read fns ready to be called from a class
  * 11/6/13
  * 	- add @all_frames option, off by default
+ * 4/12/14 Lovell
+ * 	- add @density option 
  */
 
 /*
@@ -142,7 +144,7 @@ read_destroy( VipsImage *im, Read *read )
 
 static Read *
 read_new( const char *filename, VipsImage *im, gboolean all_frames,
-	const char* density )
+	const char *density )
 {
 	Read *read;
 	static int inited = 0;
@@ -176,7 +178,7 @@ read_new( const char *filename, VipsImage *im, gboolean all_frames,
 
 	vips_strncpy( read->image_info->filename, filename, MaxTextExtent );
 
-	/* Canvas resolution for rendering vector formats like SVG
+	/* Canvas resolution for rendering vector formats like SVG.
 	 */
 	VIPS_SETSTR( read->image_info->density, density );