From 84f3fa5b19afaab8e0b3ceba58848296fd7d403b Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 13 Jun 2013 09:36:04 +0100
Subject: [PATCH] move conver_disp to deprecated

---
 libvips/conversion/Makefile.am                |  1 -
 libvips/conversion/conversion.c               | 20 +++++++++++++++++++
 libvips/deprecated/Makefile.am                |  1 +
 .../conver_dispatch.c                         | 20 -------------------
 4 files changed, 21 insertions(+), 21 deletions(-)
 rename libvips/{conversion => deprecated}/conver_dispatch.c (97%)

diff --git a/libvips/conversion/Makefile.am b/libvips/conversion/Makefile.am
index b2537f27..60636a37 100644
--- a/libvips/conversion/Makefile.am
+++ b/libvips/conversion/Makefile.am
@@ -25,7 +25,6 @@ libconversion_la_SOURCES = \
 	gaussnoise.c \
 	rot.c \
 	ifthenelse.c \
-	conver_dispatch.c \
 	im_falsecolour.c \
 	msb.c \
 	grid.c \
diff --git a/libvips/conversion/conversion.c b/libvips/conversion/conversion.c
index 72cee302..171352f1 100644
--- a/libvips/conversion/conversion.c
+++ b/libvips/conversion/conversion.c
@@ -52,6 +52,26 @@
 
 #include "conversion.h"
 
+/** 
+ * SECTION: conversion
+ * @short_description: convert images in some way: change band format, change header, insert, extract, join
+ * @see_also: <link linkend="libvips-resample">resample</link>
+ * @stability: Stable
+ * @include: vips/vips.h
+ *
+ * These operations convert an image in some way. They can be split into a two
+ * main groups.
+ *
+ * The first set of operations change an image's format in some way. You
+ * can change the band format (for example, cast to 32-bit unsigned
+ * int), form complex images from real images, convert images to
+ * matrices and back, change header fields, and a few others.
+ *
+ * The second group move pixels about in some way. You can flip, rotate,
+ * extract, insert and join pairs of images in various ways.
+ *
+ */
+
 G_DEFINE_ABSTRACT_TYPE( VipsConversion, vips_conversion, VIPS_TYPE_OPERATION );
 
 static int
diff --git a/libvips/deprecated/Makefile.am b/libvips/deprecated/Makefile.am
index f1fbfcd8..cc2ba735 100644
--- a/libvips/deprecated/Makefile.am
+++ b/libvips/deprecated/Makefile.am
@@ -68,6 +68,7 @@ libdeprecated_la_SOURCES = \
 	im_vips2png.c \
 	im_vips2ppm.c \
 	im_vips2tiff.c \
+	conver_dispatch.c \
 	im_vips2dz.c \
 	matlab.c \
 	radiance.c \
diff --git a/libvips/conversion/conver_dispatch.c b/libvips/deprecated/conver_dispatch.c
similarity index 97%
rename from libvips/conversion/conver_dispatch.c
rename to libvips/deprecated/conver_dispatch.c
index ed55fceb..a9f3afae 100644
--- a/libvips/conversion/conver_dispatch.c
+++ b/libvips/deprecated/conver_dispatch.c
@@ -37,26 +37,6 @@
 
 #include <vips/vips.h>
 
-/** 
- * SECTION: conversion
- * @short_description: convert images in some way: change band format, change header, insert, extract, join
- * @see_also: <link linkend="libvips-resample">resample</link>
- * @stability: Stable
- * @include: vips/vips.h
- *
- * These operations convert an image in some way. They can be split into a two
- * main groups.
- *
- * The first set of operations change an image's format in some way. You
- * can change the band format (for example, cast to 32-bit unsigned
- * int), form complex images from real images, convert images to
- * matrices and back, change header fields, and a few others.
- *
- * The second group move pixels about in some way. You can flip, rotate,
- * extract, insert and join pairs of images in various ways.
- *
- */
-
 static int
 system_vec( im_object *argv )
 {