cpl.h		cpl.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/		*/
	/*		/*
	* $Author: lbilbao $		* $Author: lbilbao $
	* $Date: 2009/12/02 10:29:45 $		* $Date: 2009/12/02 10:29:45 $
	* $Revision: 1.31 $		* $Revision: 1.31 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	/* CPLCORE */		/* CPLCORE */
	#include "cpl_bivector.h"		#include "cpl_bivector.h"
	#include "cpl_error.h"		#include "cpl_error.h"
	#include "cpl_errorstate.h"		#include "cpl_errorstate.h"
	#include "cpl_fits.h"		#include "cpl_fits.h"
	#include "cpl_image.h"		#include "cpl_image.h"
	#include "cpl_image_basic.h"		#include "cpl_image_basic.h"
	#include "cpl_image_iqe.h"		#include "cpl_image_iqe.h"
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_apertures.h		cpl_apertures.h
	/* $Id: cpl_apertures.h,v 1.5 2010/11/11 10:32:10 llundin Exp $		/* $Id: cpl_apertures.h,v 1.10 2011/12/20 09:11:42 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 10:32:10 $		* $Date: 2011/12/20 09:11:42 $
	* $Revision: 1.5 $		* $Revision: 1.10 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_APERTURES_H		#ifndef CPL_APERTURES_H
	#define CPL_APERTURES_H		#define CPL_APERTURES_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>		#include <stdio.h>
	skipping to change at line 60		skipping to change at line 60
	/* IO functions */		/* IO functions */
	void cpl_apertures_delete(cpl_apertures *);		void cpl_apertures_delete(cpl_apertures *);
	void cpl_apertures_dump(const cpl_apertures *, FILE *);		void cpl_apertures_dump(const cpl_apertures *, FILE *);
	/* Statistics computation */		/* Statistics computation */
	cpl_apertures * cpl_apertures_new_from_image(const cpl_image *,		cpl_apertures * cpl_apertures_new_from_image(const cpl_image *,
	const cpl_image *) CPL_ATTR_AL LOC;		const cpl_image *) CPL_ATTR_AL LOC;
	/* Accessor functions */		/* Accessor functions */
	int cpl_apertures_get_size(const cpl_apertures *);		cpl_size cpl_apertures_get_size(const cpl_apertures *);
	double cpl_apertures_get_max_x(const cpl_apertures *, int);		double cpl_apertures_get_pos_x(const cpl_apertures *, cpl_size);
	double cpl_apertures_get_max_y(const cpl_apertures *, int);		double cpl_apertures_get_pos_y(const cpl_apertures *, cpl_size);
	double cpl_apertures_get_centroid_x(const cpl_apertures *, int);		double cpl_apertures_get_max_x(const cpl_apertures *, cpl_size)
	double cpl_apertures_get_centroid_y(const cpl_apertures *, int);		CPL_ATTR_DEPRECATED;
	int cpl_apertures_get_npix(const cpl_apertures *, int);		double cpl_apertures_get_max_y(const cpl_apertures *, cpl_size)
	int cpl_apertures_get_left(const cpl_apertures *, int);		CPL_ATTR_DEPRECATED;
	int cpl_apertures_get_left_y(const cpl_apertures *, int);		double cpl_apertures_get_centroid_x(const cpl_apertures *, cpl_size);
	int cpl_apertures_get_right(const cpl_apertures *, int);		double cpl_apertures_get_centroid_y(const cpl_apertures *, cpl_size);
	int cpl_apertures_get_right_y(const cpl_apertures *, int);		cpl_size cpl_apertures_get_maxpos_x(const cpl_apertures *, cpl_size);
	int cpl_apertures_get_top_x(const cpl_apertures *, int);		cpl_size cpl_apertures_get_maxpos_y(const cpl_apertures *, cpl_size);
	int cpl_apertures_get_top(const cpl_apertures *, int);		cpl_size cpl_apertures_get_minpos_x(const cpl_apertures *, cpl_size);
	int cpl_apertures_get_bottom_x(const cpl_apertures *, int);		cpl_size cpl_apertures_get_minpos_y(const cpl_apertures *, cpl_size);
	int cpl_apertures_get_bottom(const cpl_apertures *, int);		cpl_size cpl_apertures_get_npix(const cpl_apertures *, cpl_size);
	double cpl_apertures_get_max(const cpl_apertures *, int);		cpl_size cpl_apertures_get_left(const cpl_apertures *, cpl_size);
	double cpl_apertures_get_min(const cpl_apertures *, int);		cpl_size cpl_apertures_get_left_y(const cpl_apertures *, cpl_size);
	double cpl_apertures_get_mean(const cpl_apertures *, int);		cpl_size cpl_apertures_get_right(const cpl_apertures *, cpl_size);
	double cpl_apertures_get_median(const cpl_apertures *, int);		cpl_size cpl_apertures_get_right_y(const cpl_apertures *, cpl_size);
	double cpl_apertures_get_stdev(const cpl_apertures *, int);		cpl_size cpl_apertures_get_top_x(const cpl_apertures *, cpl_size);
	double cpl_apertures_get_flux(const cpl_apertures *, int);		cpl_size cpl_apertures_get_top(const cpl_apertures *, cpl_size);
			cpl_size cpl_apertures_get_bottom_x(const cpl_apertures *, cpl_size);
			cpl_size cpl_apertures_get_bottom(const cpl_apertures *, cpl_size);
			double cpl_apertures_get_max(const cpl_apertures *, cpl_size);
			double cpl_apertures_get_min(const cpl_apertures *, cpl_size);
			double cpl_apertures_get_mean(const cpl_apertures *, cpl_size);
			double cpl_apertures_get_median(const cpl_apertures *, cpl_size);
			double cpl_apertures_get_stdev(const cpl_apertures *, cpl_size);
			double cpl_apertures_get_flux(const cpl_apertures *, cpl_size);
	/* Sorting functions */		/* Sorting functions */
	cpl_error_code cpl_apertures_sort_by_npix(cpl_apertures *);		cpl_error_code cpl_apertures_sort_by_npix(cpl_apertures *);
	cpl_error_code cpl_apertures_sort_by_max(cpl_apertures *);		cpl_error_code cpl_apertures_sort_by_max(cpl_apertures *);
	cpl_error_code cpl_apertures_sort_by_flux(cpl_apertures *);		cpl_error_code cpl_apertures_sort_by_flux(cpl_apertures *);
	/* Detection functions */		/* Detection functions */
	cpl_apertures * cpl_apertures_extract(const cpl_image *, const cpl_vector * ,		cpl_apertures * cpl_apertures_extract(const cpl_image *, const cpl_vector * ,
	int *) CPL_ATTR_ALLOC;		cpl_size *) CPL_ATTR_ALLOC;
	cpl_apertures * cpl_apertures_extract_window(const cpl_image *,		cpl_apertures * cpl_apertures_extract_window(const cpl_image *,
	const cpl_vector *, int, int,		const cpl_vector *, cpl_size,
	int, int, int *) CPL_ATTR_ALLO		cpl_size, cpl_size,
	C;		cpl_size, cpl_size *)
			CPL_ATTR_ALLOC;
	cpl_apertures * cpl_apertures_extract_sigma(const cpl_image *,		cpl_apertures * cpl_apertures_extract_sigma(const cpl_image *,
	double) CPL_ATTR_ALLOC;		double) CPL_ATTR_ALLOC;
			cpl_bivector* cpl_apertures_get_fwhm(const cpl_image*,
			const cpl_apertures*) CPL_ATTR_DEPRECA
			TED;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 6 change blocks.
	28 lines changed or deleted		41 lines changed or added

	cpl_apertures_img.h		cpl_apertures_img.h
	/* $Id: cpl_apertures_img.h,v 1.3 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_apertures_img.h,v 1.4 2011/04/19 09:05:08 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/04/19 09:05:08 $
	* $Revision: 1.3 $		* $Revision: 1.4 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
			/* Deprecated: Include cpl_apertures.h instead */
	#ifndef CPL_APERTURES_IMG_H		#ifndef CPL_APERTURES_IMG_H
	#define CPL_APERTURES_IMG_H		#define CPL_APERTURES_IMG_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>
	#include <cpl_image.h>
	#include <cpl_bivector.h>
	#include "cpl_apertures.h"		#include "cpl_apertures.h"
	CPL_BEGIN_DECLS
	/*-------------------------------------------------------------------------
	----
	Function prototypes
	--------------------------------------------------------------------------
	---*/
	cpl_bivector * cpl_apertures_get_fwhm(const cpl_image *,
	const cpl_apertures *);
	CPL_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	20 lines changed or deleted		6 lines changed or added

	cpl_array.h		cpl_array.h
	/* $Id: cpl_array.h,v 1.20 2011/01/12 09:28:46 cizzo Exp $		/* $Id: cpl_array.h,v 1.22 2012/02/27 16:12:47 rpalsa Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2006 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US A		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US A
	*/		*/
	/*		/*
	* $Author: cizzo $		* $Author: rpalsa $
	* $Date: 2011/01/12 09:28:46 $		* $Date: 2012/02/27 16:12:47 $
	* $Revision: 1.20 $		* $Revision: 1.22 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_ARRAY_H		#ifndef CPL_ARRAY_H
	#define CPL_ARRAY_H		#define CPL_ARRAY_H
	#include <stdio.h>		#include <stdio.h>
	#include <complex.h>		#include <complex.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include <cpl_type.h>		#include <cpl_type.h>
	#include <cpl_error.h>		#include <cpl_error.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	typedef struct _cpl_array_ cpl_array;		typedef struct _cpl_array_ cpl_array;
	cpl_array *cpl_array_new(int, cpl_type);		cpl_array *cpl_array_new(cpl_size, cpl_type);
	cpl_array *cpl_array_wrap_int(int *, int);		cpl_array *cpl_array_wrap_int(int *, cpl_size);
	cpl_array *cpl_array_wrap_float(float *, int);		cpl_array *cpl_array_wrap_long(long *, cpl_size);
	cpl_array *cpl_array_wrap_double(double *, int);		cpl_array *cpl_array_wrap_long_long(long long *, cpl_size);
			cpl_array *cpl_array_wrap_cplsize(cpl_size *, cpl_size);
			cpl_array *cpl_array_wrap_float(float *, cpl_size);
			cpl_array *cpl_array_wrap_double(double *, cpl_size);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_array *cpl_array_wrap_float_complex(float complex *, int);		cpl_array *cpl_array_wrap_float_complex(float complex *, cpl_size);
	cpl_array *cpl_array_wrap_double_complex(double complex *, int);		cpl_array *cpl_array_wrap_double_complex(double complex *, cpl_size);
	#endif		#endif
	cpl_array *cpl_array_wrap_string(char **, int);		cpl_array *cpl_array_wrap_string(char **, cpl_size);
	cpl_error_code cpl_array_copy_data(cpl_array *, const double *);		cpl_error_code cpl_array_copy_data(cpl_array *, const double *);
	cpl_error_code cpl_array_copy_data_int(cpl_array *, const int *);		cpl_error_code cpl_array_copy_data_int(cpl_array *, const int *);
			cpl_error_code cpl_array_copy_data_long(cpl_array *, const long *);
			cpl_error_code cpl_array_copy_data_long_long(cpl_array *, const long long *
			);
			cpl_error_code cpl_array_copy_data_cplsize(cpl_array *, const cpl_size *);
	cpl_error_code cpl_array_copy_data_float(cpl_array *, const float *);		cpl_error_code cpl_array_copy_data_float(cpl_array *, const float *);
	cpl_error_code cpl_array_copy_data_double(cpl_array *, const double *);		cpl_error_code cpl_array_copy_data_double(cpl_array *, const double *);
	cpl_error_code cpl_array_copy_data_string(cpl_array *, const char **);		cpl_error_code cpl_array_copy_data_string(cpl_array *, const char **);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_array_copy_data_complex(cpl_array *, const double comple x *);		cpl_error_code cpl_array_copy_data_complex(cpl_array *, const double comple x *);
	cpl_error_code cpl_array_copy_data_float_complex(cpl_array *,		cpl_error_code cpl_array_copy_data_float_complex(cpl_array *,
	const float complex *);		const float complex *);
	cpl_error_code cpl_array_copy_data_double_complex(cpl_array *,		cpl_error_code cpl_array_copy_data_double_complex(cpl_array *,
	const double complex *);		const double complex *);
	#endif		#endif
	void cpl_array_delete(cpl_array *);		void cpl_array_delete(cpl_array *);
	void *cpl_array_unwrap(cpl_array *);		void *cpl_array_unwrap(cpl_array *);
	int cpl_array_get_size(const cpl_array *);		cpl_size cpl_array_get_size(const cpl_array *);
	cpl_error_code cpl_array_set_size(cpl_array *, int);		cpl_error_code cpl_array_set_size(cpl_array *, cpl_size);
	cpl_type cpl_array_get_type(const cpl_array *);		cpl_type cpl_array_get_type(const cpl_array *);
	int cpl_array_has_invalid(const cpl_array *);		int cpl_array_has_invalid(const cpl_array *);
	int cpl_array_has_valid(const cpl_array *);		int cpl_array_has_valid(const cpl_array *);
	int cpl_array_is_valid(const cpl_array *, int);		int cpl_array_is_valid(const cpl_array *, cpl_size);
	int cpl_array_count_invalid(const cpl_array *);		cpl_size cpl_array_count_invalid(const cpl_array *);
	int *cpl_array_get_data_int(cpl_array *);		int *cpl_array_get_data_int(cpl_array *);
	const int *cpl_array_get_data_int_const(const cpl_array *);		const int *cpl_array_get_data_int_const(const cpl_array *);
			long *cpl_array_get_data_long(cpl_array *);
			const long *cpl_array_get_data_long_const(const cpl_array *);
			long long *cpl_array_get_data_long_long(cpl_array *);
			const long long *cpl_array_get_data_long_long_const(const cpl_array *);
			cpl_size *cpl_array_get_data_cplsize(cpl_array *);
			const cpl_size *cpl_array_get_data_cplsize_const(const cpl_array *);
	float *cpl_array_get_data_float(cpl_array *);		float *cpl_array_get_data_float(cpl_array *);
	const float *cpl_array_get_data_float_const(const cpl_array *);		const float *cpl_array_get_data_float_const(const cpl_array *);
	double *cpl_array_get_data_double(cpl_array *);		double *cpl_array_get_data_double(cpl_array *);
	const double *cpl_array_get_data_double_const(const cpl_array *);		const double *cpl_array_get_data_double_const(const cpl_array *);
	#ifdef _Complex_I		#ifdef _Complex_I
	float complex *cpl_array_get_data_float_complex(cpl_array *);		float complex *cpl_array_get_data_float_complex(cpl_array *);
	const float complex *cpl_array_get_data_float_complex_const(const cpl_array *);		const float complex *cpl_array_get_data_float_complex_const(const cpl_array *);
	const double complex *cpl_array_get_data_double_complex_const		const double complex *cpl_array_get_data_double_complex_const
	(const cpl_array *);		(const cpl_array *);
	double complex *cpl_array_get_data_double_complex(cpl_array *);		double complex *cpl_array_get_data_double_complex(cpl_array *);
	#endif		#endif
	char **cpl_array_get_data_string(cpl_array *);		char **cpl_array_get_data_string(cpl_array *);
	const char **cpl_array_get_data_string_const(const cpl_array *);		const char **cpl_array_get_data_string_const(const cpl_array *);
	double cpl_array_get(const cpl_array *, int, int *);		double cpl_array_get(const cpl_array *, cpl_size, int *);
	int cpl_array_get_int(const cpl_array *, int, int *);		int cpl_array_get_int(const cpl_array *, cpl_size, int *);
	float cpl_array_get_float(const cpl_array *, int, int *);		long cpl_array_get_long(const cpl_array *, cpl_size, int *);
	double cpl_array_get_double(const cpl_array *, int, int *);		long long cpl_array_get_long_long(const cpl_array *, cpl_size, int *);
	const char *cpl_array_get_string(const cpl_array *, int);		cpl_size cpl_array_get_cplsize(const cpl_array *, cpl_size, int *);
			float cpl_array_get_float(const cpl_array *, cpl_size, int *);
			double cpl_array_get_double(const cpl_array *, cpl_size, int *);
			const char *cpl_array_get_string(const cpl_array *, cpl_size);
	#ifdef _Complex_I		#ifdef _Complex_I
	double complex cpl_array_get_complex(const cpl_array *, int, int *);		double complex cpl_array_get_complex(const cpl_array *, cpl_size, int *);
	float complex cpl_array_get_float_complex(const cpl_array *, int, int *);		float complex cpl_array_get_float_complex(const cpl_array *, cpl_size, int
	double complex cpl_array_get_double_complex(const cpl_array *, int, int *);		*);
			double complex cpl_array_get_double_complex(const cpl_array *, cpl_size, in
			t *);
	#endif		#endif
	cpl_error_code cpl_array_set(cpl_array *array, int, double);		cpl_error_code cpl_array_set(cpl_array *array, cpl_size, double);
	cpl_error_code cpl_array_set_int(cpl_array *, int, int);		cpl_error_code cpl_array_set_int(cpl_array *, cpl_size, int);
	cpl_error_code cpl_array_set_float(cpl_array *, int, float);		cpl_error_code cpl_array_set_long(cpl_array *, cpl_size, long);
	cpl_error_code cpl_array_set_double(cpl_array *, int, double);		cpl_error_code cpl_array_set_long_long(cpl_array *, cpl_size, long long);
	cpl_error_code cpl_array_set_string(cpl_array *, int, const char *);		cpl_error_code cpl_array_set_cplsize(cpl_array *, cpl_size, cpl_size);
	cpl_error_code cpl_array_set_invalid(cpl_array *, int);		cpl_error_code cpl_array_set_float(cpl_array *, cpl_size, float);
			cpl_error_code cpl_array_set_double(cpl_array *, cpl_size, double);
			cpl_error_code cpl_array_set_string(cpl_array *, cpl_size, const char *);
			cpl_error_code cpl_array_set_invalid(cpl_array *, cpl_size);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_array_set_complex(cpl_array *, int, double complex);		cpl_error_code cpl_array_set_complex(cpl_array *, cpl_size, double complex)
	cpl_error_code cpl_array_set_float_complex(cpl_array *, int, float complex)		;
	;		cpl_error_code cpl_array_set_float_complex(cpl_array *, cpl_size, float com
	cpl_error_code cpl_array_set_double_complex(cpl_array *, int, double comple		plex);
	x);		cpl_error_code cpl_array_set_double_complex(cpl_array *, cpl_size, double c
			omplex);
	#endif		#endif
	cpl_error_code cpl_array_fill_window(cpl_array *, int, int, double);		cpl_error_code cpl_array_fill_window(cpl_array *, cpl_size, cpl_size, doubl
	cpl_error_code cpl_array_fill_window_int(cpl_array *, int, int, int);		e);
	cpl_error_code cpl_array_fill_window_float(cpl_array *, int, int, float);		cpl_error_code cpl_array_fill_window_int(cpl_array *, cpl_size, cpl_size, i
	cpl_error_code cpl_array_fill_window_double(cpl_array *, int, int, double);		nt);
	cpl_error_code cpl_array_fill_window_string(cpl_array *, int, int,		cpl_error_code cpl_array_fill_window_long(cpl_array *, cpl_size, cpl_size,
			long);
			cpl_error_code cpl_array_fill_window_long_long(cpl_array *, cpl_size, cpl_s
			ize,
			long long);
			cpl_error_code cpl_array_fill_window_cplsize(cpl_array *, cpl_size, cpl_siz
			e,
			cpl_size);
			cpl_error_code cpl_array_fill_window_float(cpl_array *, cpl_size, cpl_size,
			float);
			cpl_error_code cpl_array_fill_window_double(cpl_array *, cpl_size, cpl_size
			, double);
			cpl_error_code cpl_array_fill_window_string(cpl_array *, cpl_size, cpl_size
			,
	const char *);		const char *);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_array_fill_window_complex(cpl_array *,		cpl_error_code cpl_array_fill_window_complex(cpl_array *,
	int, int, double complex);		cpl_size, cpl_size, double com
	cpl_error_code cpl_array_fill_window_float_complex(cpl_array *, int, int,		plex);
			cpl_error_code cpl_array_fill_window_float_complex(cpl_array *, cpl_size, c
			pl_size,
	float complex);		float complex);
	cpl_error_code cpl_array_fill_window_double_complex(cpl_array *, int, int,		cpl_error_code cpl_array_fill_window_double_complex(cpl_array *, cpl_size, cpl_size,
	double complex);		double complex);
	#endif		#endif
	cpl_error_code cpl_array_fill_window_invalid(cpl_array *, int, int);		cpl_error_code cpl_array_fill_window_invalid(cpl_array *, cpl_size, cpl_siz e);
	cpl_array *cpl_array_duplicate(const cpl_array *);		cpl_array *cpl_array_duplicate(const cpl_array *);
	cpl_array *cpl_array_extract(const cpl_array *, int start, int count);		cpl_array *cpl_array_extract(const cpl_array *, cpl_size start, cpl_size co unt);
	cpl_array *cpl_array_extract_real(cpl_array *);		cpl_array *cpl_array_extract_real(cpl_array *);
	cpl_array *cpl_array_extract_imag(cpl_array *);		cpl_array *cpl_array_extract_imag(cpl_array *);
	cpl_error_code cpl_array_insert_window(cpl_array *, int start, int count);		cpl_error_code cpl_array_insert_window(cpl_array *, cpl_size start, cpl_siz
	cpl_error_code cpl_array_erase_window(cpl_array *, int start, int count);		e count);
	cpl_error_code cpl_array_insert(cpl_array *, const cpl_array *, int);		cpl_error_code cpl_array_erase_window(cpl_array *, cpl_size start, cpl_size
			count);
			cpl_error_code cpl_array_insert(cpl_array *, const cpl_array *, cpl_size);
	cpl_error_code cpl_array_add(cpl_array *, const cpl_array *);		cpl_error_code cpl_array_add(cpl_array *, const cpl_array *);
	cpl_error_code cpl_array_subtract(cpl_array *, const cpl_array *);		cpl_error_code cpl_array_subtract(cpl_array *, const cpl_array *);
	cpl_error_code cpl_array_multiply(cpl_array *, const cpl_array *);		cpl_error_code cpl_array_multiply(cpl_array *, const cpl_array *);
	cpl_error_code cpl_array_divide(cpl_array *, const cpl_array *);		cpl_error_code cpl_array_divide(cpl_array *, const cpl_array *);
	cpl_error_code cpl_array_add_scalar(cpl_array *, double);		cpl_error_code cpl_array_add_scalar(cpl_array *, double);
	cpl_error_code cpl_array_subtract_scalar(cpl_array *, double);		cpl_error_code cpl_array_subtract_scalar(cpl_array *, double);
	cpl_error_code cpl_array_multiply_scalar(cpl_array *, double);		cpl_error_code cpl_array_multiply_scalar(cpl_array *, double);
	cpl_error_code cpl_array_divide_scalar(cpl_array *, double);		cpl_error_code cpl_array_divide_scalar(cpl_array *, double);
	cpl_error_code cpl_array_abs(cpl_array *);		cpl_error_code cpl_array_abs(cpl_array *);
	skipping to change at line 161		skipping to change at line 184
	#ifdef _Complex_I		#ifdef _Complex_I
	double complex cpl_array_get_mean_complex(const cpl_array *);		double complex cpl_array_get_mean_complex(const cpl_array *);
	#endif		#endif
	double cpl_array_get_mean(const cpl_array *);		double cpl_array_get_mean(const cpl_array *);
	double cpl_array_get_median(const cpl_array *);		double cpl_array_get_median(const cpl_array *);
	double cpl_array_get_stdev(const cpl_array *);		double cpl_array_get_stdev(const cpl_array *);
	double cpl_array_get_max(const cpl_array *);		double cpl_array_get_max(const cpl_array *);
	double cpl_array_get_min(const cpl_array *);		double cpl_array_get_min(const cpl_array *);
	cpl_error_code cpl_array_get_maxpos(const cpl_array *, int *);		cpl_error_code cpl_array_get_maxpos(const cpl_array *, cpl_size *);
	cpl_error_code cpl_array_get_minpos(const cpl_array *, int *);		cpl_error_code cpl_array_get_minpos(const cpl_array *, cpl_size *);
	void cpl_array_dump_structure(const cpl_array *, FILE *);		void cpl_array_dump_structure(const cpl_array *, FILE *);
	void cpl_array_dump(const cpl_array *, int start, int count, FILE *);		void cpl_array_dump(const cpl_array *, cpl_size start, cpl_size count, FILE *);
	cpl_array *cpl_array_cast(cpl_array *, cpl_type);		cpl_array *cpl_array_cast(cpl_array *, cpl_type);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
	/* end of cpl_array.h */		/* end of cpl_array.h */
End of changes. 21 change blocks.
	51 lines changed or deleted		90 lines changed or added

	cpl_bivector.h		cpl_bivector.h
	/* $Id: cpl_bivector.h,v 1.14 2010/12/14 17:25:08 llundin Exp $		/* $Id: cpl_bivector.h,v 1.15 2011/02/28 15:45:20 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/12/14 17:25:08 $		* $Date: 2011/02/28 15:45:20 $
	* $Revision: 1.14 $		* $Revision: 1.15 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_BIVECTOR_H		#ifndef CPL_BIVECTOR_H
	#define CPL_BIVECTOR_H		#define CPL_BIVECTOR_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_macros.h>		#include <cpl_macros.h>
	skipping to change at line 58		skipping to change at line 58
	typedef enum {		typedef enum {
	CPL_SORT_BY_X,		CPL_SORT_BY_X,
	CPL_SORT_BY_Y		CPL_SORT_BY_Y
	} cpl_sort_mode;		} cpl_sort_mode;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Constructors and destructors */		/* Constructors and destructors */
	cpl_bivector * cpl_bivector_new(int) CPL_ATTR_ALLOC;		cpl_bivector * cpl_bivector_new(cpl_size) CPL_ATTR_ALLOC;
	cpl_bivector * cpl_bivector_wrap_vectors(cpl_vector *,		cpl_bivector * cpl_bivector_wrap_vectors(cpl_vector *,
	cpl_vector *) CPL_ATTR_ALLOC;		cpl_vector *) CPL_ATTR_ALLOC;
	cpl_bivector * cpl_bivector_duplicate(const cpl_bivector *) CPL_ATTR_ALLOC;		cpl_bivector * cpl_bivector_duplicate(const cpl_bivector *) CPL_ATTR_ALLOC;
	void cpl_bivector_delete(cpl_bivector *);		void cpl_bivector_delete(cpl_bivector *);
	void cpl_bivector_unwrap_vectors(cpl_bivector *);		void cpl_bivector_unwrap_vectors(cpl_bivector *);
	void cpl_bivector_dump(const cpl_bivector *, FILE *);		void cpl_bivector_dump(const cpl_bivector *, FILE *);
	cpl_bivector * cpl_bivector_read(const char *) CPL_ATTR_ALLOC;		cpl_bivector * cpl_bivector_read(const char *) CPL_ATTR_ALLOC;
	cpl_error_code cpl_bivector_copy(cpl_bivector *, const cpl_bivector *);		cpl_error_code cpl_bivector_copy(cpl_bivector *, const cpl_bivector *);
	/* Accessors functions */		/* Accessors functions */
	int cpl_bivector_get_size(const cpl_bivector *);		cpl_size cpl_bivector_get_size(const cpl_bivector *);
	cpl_vector * cpl_bivector_get_x(cpl_bivector *);		cpl_vector * cpl_bivector_get_x(cpl_bivector *);
	cpl_vector * cpl_bivector_get_y(cpl_bivector *);		cpl_vector * cpl_bivector_get_y(cpl_bivector *);
	const cpl_vector * cpl_bivector_get_x_const(const cpl_bivector *);		const cpl_vector * cpl_bivector_get_x_const(const cpl_bivector *);
	const cpl_vector * cpl_bivector_get_y_const(const cpl_bivector *);		const cpl_vector * cpl_bivector_get_y_const(const cpl_bivector *);
	double * cpl_bivector_get_x_data(cpl_bivector *);		double * cpl_bivector_get_x_data(cpl_bivector *);
	double * cpl_bivector_get_y_data(cpl_bivector *);		double * cpl_bivector_get_y_data(cpl_bivector *);
	const double * cpl_bivector_get_x_data_const(const cpl_bivector *);		const double * cpl_bivector_get_x_data_const(const cpl_bivector *);
	const double * cpl_bivector_get_y_data_const(const cpl_bivector *);		const double * cpl_bivector_get_y_data_const(const cpl_bivector *);
	/* Basic functionalities */		/* Basic functionalities */
End of changes. 4 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cpl_detector.h		cpl_detector.h
	/* $Id: cpl_detector.h,v 1.5 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_detector.h,v 1.8 2011/07/29 12:04:06 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/07/29 12:04:06 $
	* $Revision: 1.5 $		* $Revision: 1.8 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_DETECTOR_H		#ifndef CPL_DETECTOR_H
	#define CPL_DETECTOR_H		#define CPL_DETECTOR_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_error.h>		#include <cpl_error.h>
	skipping to change at line 47		skipping to change at line 47
	#include <cpl_imagelist.h>		#include <cpl_imagelist.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Noise computation */		/* Noise computation */
	cpl_error_code cpl_flux_get_noise_window(const cpl_image *, const int *, in		cpl_error_code cpl_flux_get_noise_window(const cpl_image *, const cpl_size
	t, int,		*,
	double *, double *) ;		cpl_size, cpl_size,
	cpl_error_code cpl_flux_get_bias_window(const cpl_image *, const int *, int		double *, double *);
	, int,		cpl_error_code cpl_flux_get_bias_window(const cpl_image *, const cpl_size *
	double *, double *) ;		,
	cpl_error_code cpl_flux_get_noise_ring(const cpl_image *, const double *, i		cpl_size, cpl_size, double *, doubl
	nt,		e *);
	int, double *, double *) ;		cpl_error_code cpl_flux_get_noise_ring(const cpl_image *, const double *,
			cpl_size, cpl_size, double *, double
			*);
	/* Bad pixels cleaning */		/* Bad pixels cleaning */
	cpl_error_code cpl_detector_interpolate_rejected(cpl_image *) ;		cpl_error_code cpl_detector_interpolate_rejected(cpl_image *);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 4 change blocks.
	14 lines changed or deleted		16 lines changed or added

	cpl_dfs.h		cpl_dfs.h
	/* $Id: cpl_dfs.h,v 1.16 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_dfs.h,v 1.17 2011/04/01 09:57:38 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/04/01 09:57:38 $
	* $Revision: 1.16 $		* $Revision: 1.17 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_DFS_H		#ifndef CPL_DFS_H
	#define CPL_DFS_H		#define CPL_DFS_H
	#include <cpl_imagelist.h>		#include <cpl_imagelist.h>
	#include <cpl_table.h>		#include <cpl_table.h>
	#include <cpl_frameset.h>		#include <cpl_frameset.h>
	#include <cpl_propertylist.h>		#include <cpl_propertylist.h>
	#include <cpl_parameterlist.h>		#include <cpl_parameterlist.h>
	skipping to change at line 99		skipping to change at line 99
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	cpl_error_code cpl_dfs_save_image(cpl_frameset *,		cpl_error_code cpl_dfs_save_image(cpl_frameset *,
	cpl_propertylist *,		cpl_propertylist *,
	const cpl_parameterlist *,		const cpl_parameterlist *,
	const cpl_frameset *,		const cpl_frameset *,
	const cpl_frame *,		const cpl_frame *,
	const cpl_image *,		const cpl_image *,
	cpl_type_bpp,		cpl_type,
	const char *,		const char *,
	const cpl_propertylist *,		const cpl_propertylist *,
	const char *,		const char *,
	const char *,		const char *,
	const char *);		const char *);
	cpl_error_code cpl_dfs_save_propertylist(cpl_frameset *,		cpl_error_code cpl_dfs_save_propertylist(cpl_frameset *,
	cpl_propertylist *,		cpl_propertylist *,
	const cpl_parameterlist *,		const cpl_parameterlist *,
	const cpl_frameset *,		const cpl_frameset *,
	skipping to change at line 123		skipping to change at line 123
	const char *,		const char *,
	const char *,		const char *,
	const char *);		const char *);
	cpl_error_code cpl_dfs_save_imagelist(cpl_frameset *,		cpl_error_code cpl_dfs_save_imagelist(cpl_frameset *,
	cpl_propertylist *,		cpl_propertylist *,
	const cpl_parameterlist *,		const cpl_parameterlist *,
	const cpl_frameset *,		const cpl_frameset *,
	const cpl_frame *,		const cpl_frame *,
	const cpl_imagelist *,		const cpl_imagelist *,
	cpl_type_bpp,		cpl_type,
	const char *,		const char *,
	const cpl_propertylist *,		const cpl_propertylist *,
	const char *,		const char *,
	const char *,		const char *,
	const char *);		const char *);
	cpl_error_code cpl_dfs_save_table(cpl_frameset *,		cpl_error_code cpl_dfs_save_table(cpl_frameset *,
	cpl_propertylist *,		cpl_propertylist *,
	const cpl_parameterlist *,		const cpl_parameterlist *,
	const cpl_frameset *,		const cpl_frameset *,
End of changes. 4 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cpl_error.h		cpl_error.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/12 14:28:01 $		* $Date: 2010/11/12 14:28:01 $
	* $Revision: 1.79 $		* $Revision: 1.79 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_ERROR_H		#ifndef CPL_ERROR_H
	#define CPL_ERROR_H		#define CPL_ERROR_H
	#include <stdlib.h>		#include <stdlib.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include <cpl_func.h>		#include <cpl_func.h>
	#include <cxutils.h>		#include <cxutils.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_errorstate.h		cpl_errorstate.h
	/* $Id: cpl_errorstate.h,v 1.7 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_errorstate.h,v 1.8 2011/11/30 15:59:22 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/11/30 15:59:22 $
	* $Revision: 1.7 $		* $Revision: 1.8 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_ERRORSTATE_H		#ifndef CPL_ERRORSTATE_H
	#define CPL_ERRORSTATE_H		#define CPL_ERRORSTATE_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include <cpl_type.h>		#include <cpl_type.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	skipping to change at line 60		skipping to change at line 60
	cpl_errorstate cpl_errorstate_get(void) CPL_ATTR_PURE;		cpl_errorstate cpl_errorstate_get(void) CPL_ATTR_PURE;
	void cpl_errorstate_set(cpl_errorstate);		void cpl_errorstate_set(cpl_errorstate);
	cpl_boolean cpl_errorstate_is_equal(cpl_errorstate) CPL_ATTR_PURE;		cpl_boolean cpl_errorstate_is_equal(cpl_errorstate) CPL_ATTR_PURE;
	void cpl_errorstate_dump(cpl_errorstate,		void cpl_errorstate_dump(cpl_errorstate,
	cpl_boolean,		cpl_boolean,
	void (*)(unsigned, unsigned, unsigned));		void (*)(unsigned, unsigned, unsigned));
	void cpl_errorstate_dump_one(unsigned, unsigned, unsigned);		void cpl_errorstate_dump_one(unsigned, unsigned, unsigned);
			void cpl_errorstate_dump_one_warning(unsigned, unsigned, unsigned);
			void cpl_errorstate_dump_one_info(unsigned, unsigned, unsigned);
			void cpl_errorstate_dump_one_debug(unsigned, unsigned, unsigned);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
	/* end of cpl_errorstate.h */		/* end of cpl_errorstate.h */
End of changes. 3 change blocks.
	4 lines changed or deleted		7 lines changed or added

	cpl_fft.h		cpl_fft.h
	/* $Id: cpl_fft.h,v 1.3 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_fft.h,v 1.6 2012/03/12 08:51:03 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2005 European Southern Observatory		* Copyright (C) 2001-2005 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 24		skipping to change at line 24
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#ifndef CPL_FFT_H		#ifndef CPL_FFT_H
	#define CPL_FFT_H		#define CPL_FFT_H
	#define CPL_FFT_FORWARD ((unsigned)1 << 1)		/*-------------------------------------------------------------------------
	#define CPL_FFT_BACKWARD ((unsigned)1 << 2)		----
			Includes
			--------------------------------------------------------------------------
			---*/
	/* Function prototypes */		#include "cpl_imagelist.h"
	cpl_error_code cpl_fft_image(cpl_image *, const cpl_image *, unsigned);		CPL_BEGIN_DECLS
			/*-------------------------------------------------------------------------
			----
			New types
			--------------------------------------------------------------------------
			---*/
			/**
			* @ingroup cpl_fft
			* @brief The supported values of the CPL fft mode.
			*/
			enum _cpl_fft_mode_ {
			/**
			* The forward transform
			* @hideinitializer
			*/
			CPL_FFT_FORWARD = 1 << 1,
			/**
			* The backward transform
			* @hideinitializer
			*/
			CPL_FFT_BACKWARD = 1 << 2,
			/**
			* Transform without scaling (has no effect on forward transform)
			* @hideinitializer
			*/
			CPL_FFT_NOSCALE = 1 << 3
			};
			/**
			* @ingroup cpl_fft
			* @brief The CPL fft mode.
			*/
			typedef enum _cpl_fft_mode_ cpl_fft_mode;
			/*-------------------------------------------------------------------------
			----
			Function prototypes
			--------------------------------------------------------------------------
			---*/
			cpl_error_code cpl_fft_image(cpl_image *, const cpl_image *, cpl_fft_mode);
	cpl_error_code cpl_fft_imagelist(cpl_imagelist *, const cpl_imagelist *,		cpl_error_code cpl_fft_imagelist(cpl_imagelist *, const cpl_imagelist *,
	unsigned);		cpl_fft_mode);
			CPL_END_DECLS
	#endif /* CPL_FFT_H */		#endif /* CPL_FFT_H */
End of changes. 5 change blocks.
	6 lines changed or deleted		55 lines changed or added

	cpl_filter.h		cpl_filter.h
	/* $Id: cpl_filter.h,v 1.19 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_filter.h,v 1.21 2011/08/17 16:33:48 cgarcia Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: cgarcia $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/08/17 16:33:48 $
	* $Revision: 1.19 $		* $Revision: 1.21 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_FILTER_H		#ifndef CPL_FILTER_H
	#define CPL_FILTER_H		#define CPL_FILTER_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
	skipping to change at line 73		skipping to change at line 73
	* such border pixels.		* such border pixels.
	*		*
	*/		*/
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
	enum _cpl_border_mode_		enum _cpl_border_mode_
	{		{
	CPL_BORDER_FILTER,		CPL_BORDER_FILTER,
	/**<		/**<
	Filter the border using the reduced number of pixels. If in median		Filter the border using the reduced number of pixels. If in median
	filtering the number of pixels is even choose any one of the two		filtering the number of pixels is even choose the mean of the two
	central values.		central values, after the borders have been filled with a chess-li
			ke
			pattern of +- inf
	*/		*/
	CPL_BORDER_ZERO,		CPL_BORDER_ZERO,
	/**<		/**<
	Set the border of the filtered image/mask to zero.		Set the border of the filtered image/mask to zero.
	*/		*/
	CPL_BORDER_CROP,		CPL_BORDER_CROP,
	/**<		/**<
	Crop the filtered image/mask.		Crop the filtered image/mask.
	skipping to change at line 181		skipping to change at line 182
	/**<		/**<
	The same as CPL_FILTER_AVERAGE, except that it uses a running		The same as CPL_FILTER_AVERAGE, except that it uses a running
	average, which will lead to a significant loss of precision if		average, which will lead to a significant loss of precision if
	there are large differences in the magnitudes of the input pixels.		there are large differences in the magnitudes of the input pixels.
	The cost per pixel is O(1) if all elements in the kernel are used,		The cost per pixel is O(1) if all elements in the kernel are used,
	otherwise the filtering is done as for CPL_FILTER_AVERAGE.		otherwise the filtering is done as for CPL_FILTER_AVERAGE.
	*/		*/
	CPL_FILTER_MEDIAN,		CPL_FILTER_MEDIAN,
	/**<		/**<
	A median filter (for a @c cpl_image). The pixel types of the input		A median filter (for a @c cpl_image). The pixel types of the input
	and		and output images must be identical.
	output images must be identical. All border modes are supported.
	*/		*/
	CPL_FILTER_STDEV,		CPL_FILTER_STDEV,
	/**<		/**<
	The filtered value is the standard deviation of the included		The filtered value is the standard deviation of the included
	input pixels.		input pixels.
	@verbatim		@verbatim
	Kernel Image ...		Kernel Image ...
	1 0 1 ... 1.0 2.0 3.0 ...		1 0 1 ... 1.0 2.0 3.0 ...
	skipping to change at line 208		skipping to change at line 209
	The pixel with value 5.0 will have a filtered value of:		The pixel with value 5.0 will have a filtered value of:
	std_dev(1.0, 3.0, 5.0, 7.0, 9.0)		std_dev(1.0, 3.0, 5.0, 7.0, 9.0)
	*/		*/
	CPL_FILTER_STDEV_FAST,		CPL_FILTER_STDEV_FAST,
	/**<		/**<
	The same as CPL_FILTER_STDEV, except that it uses the same running		The same as CPL_FILTER_STDEV, except that it uses the same running
	method employed in CPL_FILTER_AVERAGE_FAST, which will lead to a		method employed in CPL_FILTER_AVERAGE_FAST, which will lead to a
	significant loss of precision if there are large differences in th e		significant loss of precision if there are large differences in th e
	magnitudes of the input pixels. As for CPL_FILTER_AVERAGE_FAST, th		magnitudes of the input pixels. As for CPL_FILTER_AVERAGE_FAST, th
	e cost		e
	per pixel is O(1) if all elements are used, otherwise the filterin		cost per pixel is O(1) if all elements are used, otherwise the
	g is		filtering is done as for CPL_FILTER_STDEV.
	done as for CPL_FILTER_STDEV.
	*/		*/
	CPL_FILTER_MORPHO		CPL_FILTER_MORPHO
	/**<		/**<
	A morphological filter (for a @c cpl_image). The kernel elements a		A morphological filter (for a @c cpl_image). The kernel elements
	re		are used as weights on the sorted values covered by the kernel:
	used as weights on the sorted values covered by the kernel:
	@verbatim		@verbatim
	Kernel Image ...		Kernel Image ...
	1 2 3 ... 4.0 6.0 5.0 ...		1 2 3 ... 4.0 6.0 5.0 ...
	4 5 6 ... 3.0 1.0 2.0 ...		4 5 6 ... 3.0 1.0 2.0 ...
	7 8 9 ... 7.0 8.0 9.0 ...		7 8 9 ... 7.0 8.0 9.0 ...
	...		...
	@endverbatim		@endverbatim
	The filtered value corresponding to the pixel whose value is 5.0 i s:		The filtered value corresponding to the pixel whose value is 5.0 i s:
End of changes. 6 change blocks.
	18 lines changed or deleted		17 lines changed or added

	cpl_fit.h		cpl_fit.h
	/* $Id: cpl_fit.h,v 1.7 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_fit.h,v 1.10 2011/07/27 14:18:36 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/07/27 14:18:36 $
	* $Revision: 1.7 $		* $Revision: 1.10 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_FIT_H		#ifndef CPL_FIT_H
	#define CPL_FIT_H		#define CPL_FIT_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_vector.h>		#include <cpl_vector.h>
	skipping to change at line 74		skipping to change at line 74
	#ifndef CPL_FIT_LVMQ_MAXITER		#ifndef CPL_FIT_LVMQ_MAXITER
	#define CPL_FIT_LVMQ_MAXITER 1000		#define CPL_FIT_LVMQ_MAXITER 1000
	#endif		#endif
	/* Should be >> 1 */		/* Should be >> 1 */
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	cpl_error_code cpl_fit_lvmq(const cpl_matrix *x, const cpl_matrix *sigma_x,		cpl_error_code cpl_fit_lvmq(const cpl_matrix*, const cpl_matrix*,
	const cpl_vector *y, const cpl_vector *sigma_y,		const cpl_vector*, const cpl_vector*,
	cpl_vector *a, const int ia[],		cpl_vector*, const int[],
	int (*f)(const double x[],		int (*)(const double[],
	const double a[], double *result),		const double[], double*),
	int (*dfda)(const double x[],		int (*)(const double[],
	const double a[], double result[]),		const double[], double[]),
	double relative_tolerance,		double, int, int, double*, double*, cpl_matrix*
	int tolerance_count,		*);
	int max_iterations,
	double *mse,
	double *red_chisq,
	cpl_matrix **covariance);
	cpl_imagelist * cpl_fit_imagelist_polynomial(const cpl_vector *,		cpl_imagelist* cpl_fit_imagelist_polynomial(const cpl_vector*,
	const cpl_imagelist *,		const cpl_imagelist*,
	int, int, cpl_boolean,		cpl_size, cpl_size, cpl_boolean
	cpl_type, cpl_image *);		,
			cpl_type, cpl_image*)
			CPL_ATTR_ALLOC;
	cpl_imagelist * cpl_fit_imagelist_polynomial_window(const cpl_vector *,		cpl_imagelist* cpl_fit_imagelist_polynomial_window(const cpl_vector*,
	const cpl_imagelist *,		const cpl_imagelist*,
	int, int, int, int,		cpl_size, cpl_size,
	int, int, cpl_boolean,		cpl_size, cpl_size,
	cpl_type, cpl_image *);		cpl_size, cpl_size,
			cpl_boolean,
			cpl_type, cpl_image*)
			CPL_ATTR_ALLOC;
	cpl_error_code cpl_fit_image_gaussian(const cpl_image *, const cpl_image *,		cpl_error_code cpl_fit_image_gaussian(const cpl_image*, const cpl_image*,
	int , int , int , int		cpl_size, cpl_size,
	,		cpl_size, cpl_size,
	cpl_array *, cpl_array *, const cpl_array *, double		cpl_array*, cpl_array*,
	*,		const cpl_array*, double*,
	double *, cpl_matrix **, double *, double		double*, cpl_matrix**,
	*,		double*, double*,
	double *, cpl_matrix **);		double*, cpl_matrix**);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
	/* end of cpl_fit.h */		/* end of cpl_fit.h */
End of changes. 6 change blocks.
	34 lines changed or deleted		35 lines changed or added

	cpl_fits.h		cpl_fits.h
	/* $Id: cpl_fits.h,v 1.6 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_fits.h,v 1.7 2011/07/21 08:11:22 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/07/21 08:11:22 $
	* $Revision: 1.6 $		* $Revision: 1.7 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_FITS_H		#ifndef CPL_FITS_H
	#define CPL_FITS_H		#define CPL_FITS_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_macros.h>		#include <cpl_macros.h>
			#include <cpl_type.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	int cpl_fits_count_extensions(const char *);		cpl_size cpl_fits_count_extensions(const char *);
	int cpl_fits_get_nb_extensions(const char *) CPL_ATTR_DEPRECATED;		int cpl_fits_get_nb_extensions(const char *) CPL_ATTR_DEPRECATED;
	int cpl_fits_find_extension(const char *, const char *);		cpl_size cpl_fits_find_extension(const char *, const char *);
	int cpl_fits_get_extension_nb(const char *, const char *) CPL_ATTR_DEPRECAT ED;		int cpl_fits_get_extension_nb(const char *, const char *) CPL_ATTR_DEPRECAT ED;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	6 lines changed or deleted		7 lines changed or added

	cpl_frame.h		cpl_frame.h
	/* $Id: cpl_frame.h,v 1.18 2010/11/11 10:31:52 llundin Exp $		/* $Id: cpl_frame.h,v 1.19 2012/01/11 13:38:29 rpalsa Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2005 European Southern Observatory		* Copyright (C) 2001-2005 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2010/11/11 10:31:52 $		* $Date: 2012/01/11 13:38:29 $
	* $Revision: 1.18 $		* $Revision: 1.19 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_FRAME_H		#ifndef CPL_FRAME_H
	#define CPL_FRAME_H		#define CPL_FRAME_H
	#include <stdio.h>		#include <stdio.h>
			#include <cpl_type.h>
	#include <cpl_error.h>		#include <cpl_error.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/**		/**
	* @ingroup cpl_frame		* @ingroup cpl_frame
	*		*
	* @brief		* @brief
	* The frame data type.		* The frame data type.
	*/		*/
	skipping to change at line 267		skipping to change at line 269
	cpl_error_code cpl_frame_set_filename(cpl_frame *self, const char *filename );		cpl_error_code cpl_frame_set_filename(cpl_frame *self, const char *filename );
	cpl_error_code cpl_frame_set_tag(cpl_frame *self, const char *tag);		cpl_error_code cpl_frame_set_tag(cpl_frame *self, const char *tag);
	cpl_error_code cpl_frame_set_type(cpl_frame *self, cpl_frame_type type);		cpl_error_code cpl_frame_set_type(cpl_frame *self, cpl_frame_type type);
	cpl_error_code cpl_frame_set_group(cpl_frame *self, cpl_frame_group group);		cpl_error_code cpl_frame_set_group(cpl_frame *self, cpl_frame_group group);
	cpl_error_code cpl_frame_set_level(cpl_frame *self, cpl_frame_level level);		cpl_error_code cpl_frame_set_level(cpl_frame *self, cpl_frame_level level);
	/*		/*
	* Others		* Others
	*/		*/
	int cpl_frame_get_nextensions(const cpl_frame *self);		cpl_size cpl_frame_get_nextensions(const cpl_frame *self);
	void cpl_frame_dump(const cpl_frame *frame, FILE *stream);		void cpl_frame_dump(const cpl_frame *frame, FILE *stream);
	CPL_END_DECLS		CPL_END_DECLS
	#endif /* CPL_FRAME_H */		#endif /* CPL_FRAME_H */
End of changes. 4 change blocks.
	6 lines changed or deleted		8 lines changed or added

	cpl_framedata.h		cpl_framedata.h
	/* $Id: cpl_framedata.h,v 1.3 2010/11/11 10:31:52 llundin Exp $		/* $Id: cpl_framedata.h,v 1.4 2012/01/11 13:38:29 rpalsa Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2006 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2010/11/11 10:31:52 $		* $Date: 2012/01/11 13:38:29 $
	* $Revision: 1.3 $		* $Revision: 1.4 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_FRAMEDATA_H		#ifndef CPL_FRAMEDATA_H
	#define CPL_FRAMEDATA_H		#define CPL_FRAMEDATA_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
			#include <cpl_type.h>
	#include <cpl_error.h>		#include <cpl_error.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/**		/**
	* @ingroup cpl_framedata		* @ingroup cpl_framedata
	*		*
	* @brief		* @brief
	* The frame data object type.		* The frame data object type.
	*/		*/
	skipping to change at line 74		skipping to change at line 75
	*/		*/
	const char* tag;		const char* tag;
	/**		/**
	* The minimum number of frames of the kind given by the @em tag,		* The minimum number of frames of the kind given by the @em tag,
	* the recipe requires in input. A value of @c -1 means that the		* the recipe requires in input. A value of @c -1 means that the
	* minimum number of frames is unspecified.		* minimum number of frames is unspecified.
	*/		*/
	int min_count;		cpl_size min_count;
	/**		/**
	* The maximum number of frames of the kind given by the @em tag,		* The maximum number of frames of the kind given by the @em tag,
	* the recipe requires in input. A value of @c -1 means that the		* the recipe requires in input. A value of @c -1 means that the
	* maximum number of frames is unspecified.		* maximum number of frames is unspecified.
	*/		*/
	int max_count;		cpl_size max_count;
	};		};
	/*		/*
	* Create, copy and destroy operations		* Create, copy and destroy operations
	*/		*/
	cpl_framedata* cpl_framedata_new(void) CPL_ATTR_ALLOC;		cpl_framedata* cpl_framedata_new(void) CPL_ATTR_ALLOC;
	cpl_framedata* cpl_framedata_create(const char* tag, int min_count,		cpl_framedata* cpl_framedata_create(const char* tag, cpl_size min_count,
	int max_count) CPL_ATTR_ALLOC;		cpl_size max_count) CPL_ATTR_ALLOC;
	cpl_framedata* cpl_framedata_duplicate(const cpl_framedata* other)		cpl_framedata* cpl_framedata_duplicate(const cpl_framedata* other)
	CPL_ATTR_ALLOC;		CPL_ATTR_ALLOC;
	void cpl_framedata_clear(cpl_framedata* self);		void cpl_framedata_clear(cpl_framedata* self);
	void cpl_framedata_delete(cpl_framedata* self);		void cpl_framedata_delete(cpl_framedata* self);
	/*		/*
	* Non modifying operations		* Non modifying operations
	*/		*/
	const char* cpl_framedata_get_tag(const cpl_framedata* self);		const char* cpl_framedata_get_tag(const cpl_framedata* self);
	int cpl_framedata_get_min_count(const cpl_framedata* self);		cpl_size cpl_framedata_get_min_count(const cpl_framedata* self);
	int cpl_framedata_get_max_count(const cpl_framedata* self);		cpl_size cpl_framedata_get_max_count(const cpl_framedata* self);
	/*		/*
	* Assignment operations		* Assignment operations
	*/		*/
	cpl_error_code cpl_framedata_set_tag(cpl_framedata* self, const char* tag);		cpl_error_code cpl_framedata_set_tag(cpl_framedata* self, const char* tag);
	cpl_error_code cpl_framedata_set_min_count(cpl_framedata* self,		cpl_error_code cpl_framedata_set_min_count(cpl_framedata* self,
	int min_count);		cpl_size min_count);
	cpl_error_code cpl_framedata_set_max_count(cpl_framedata* self,		cpl_error_code cpl_framedata_set_max_count(cpl_framedata* self,
	int max_count);		cpl_size max_count);
	cpl_error_code cpl_framedata_set(cpl_framedata* self, const char* tag,		cpl_error_code cpl_framedata_set(cpl_framedata* self, const char* tag,
	int min_count, int max_count);		cpl_size min_count, cpl_size max_count);
	CPL_END_DECLS		CPL_END_DECLS
	#endif /* CPL_FRAMEDATA_H */		#endif /* CPL_FRAMEDATA_H */
End of changes. 10 change blocks.
	14 lines changed or deleted		15 lines changed or added

	cpl_frameset.h		cpl_frameset.h
	/* $Id: cpl_frameset.h,v 1.19 2010/11/11 10:31:52 llundin Exp $		/* $Id: cpl_frameset.h,v 1.20 2012/01/11 13:38:29 rpalsa Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2005 European Southern Observatory		* Copyright (C) 2001-2005 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2010/11/11 10:31:52 $		* $Date: 2012/01/11 13:38:29 $
	* $Revision: 1.19 $		* $Revision: 1.20 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_FRAMESET_H		#ifndef CPL_FRAMESET_H
	#define CPL_FRAMESET_H		#define CPL_FRAMESET_H
	#include <stdio.h>		#include <stdio.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
			#include <cpl_type.h>
	#include <cpl_frame.h>		#include <cpl_frame.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/**		/**
	* @ingroup cpl_frameset		* @ingroup cpl_frameset
	*		*
	* @brief		* @brief
	* The frame set data type.		* The frame set data type.
	*		*
	skipping to change at line 61		skipping to change at line 62
	*/		*/
	cpl_frameset *cpl_frameset_new(void) CPL_ATTR_ALLOC;		cpl_frameset *cpl_frameset_new(void) CPL_ATTR_ALLOC;
	cpl_frameset *cpl_frameset_duplicate(const cpl_frameset *other) CPL_ATTR_AL LOC;		cpl_frameset *cpl_frameset_duplicate(const cpl_frameset *other) CPL_ATTR_AL LOC;
	void cpl_frameset_delete(cpl_frameset *self);		void cpl_frameset_delete(cpl_frameset *self);
	/*		/*
	* Non modifying operations		* Non modifying operations
	*/		*/
	int cpl_frameset_get_size(const cpl_frameset *self);		cpl_size cpl_frameset_get_size(const cpl_frameset *self);
	int cpl_frameset_is_empty(const cpl_frameset *self);		int cpl_frameset_is_empty(const cpl_frameset *self);
	int cpl_frameset_count_tags(const cpl_frameset *self, const char *tag);		int cpl_frameset_count_tags(const cpl_frameset *self, const char *tag);
	/*		/*
	* Search operations		* Search operations
	*/		*/
	const cpl_frame *cpl_frameset_find_const(const cpl_frameset *self,		const cpl_frame *cpl_frameset_find_const(const cpl_frameset *self,
	const char *tag);		const char *tag);
	cpl_frame *cpl_frameset_find(cpl_frameset *self, const char *tag);		cpl_frame *cpl_frameset_find(cpl_frameset *self, const char *tag);
	skipping to change at line 88		skipping to change at line 89
	cpl_frame *cpl_frameset_get_first(cpl_frameset *self);		cpl_frame *cpl_frameset_get_first(cpl_frameset *self);
	const cpl_frame *cpl_frameset_get_next_const(const cpl_frameset *self);		const cpl_frame *cpl_frameset_get_next_const(const cpl_frameset *self);
	cpl_frame *cpl_frameset_get_next(cpl_frameset *self);		cpl_frame *cpl_frameset_get_next(cpl_frameset *self);
	/*		/*
	* Inserting and removing elements		* Inserting and removing elements
	*/		*/
	cpl_error_code cpl_frameset_insert(cpl_frameset *self, cpl_frame *frame);		cpl_error_code cpl_frameset_insert(cpl_frameset *self, cpl_frame *frame);
	int cpl_frameset_erase(cpl_frameset *self, const char *tag);		cpl_size cpl_frameset_erase(cpl_frameset *self, const char *tag);
	cpl_error_code cpl_frameset_erase_frame(cpl_frameset *self, cpl_frame *fram e);		cpl_error_code cpl_frameset_erase_frame(cpl_frameset *self, cpl_frame *fram e);
	/*		/*
	* Element access		* Element access
	*/		*/
	const cpl_frame *cpl_frameset_get_frame_const(const cpl_frameset *self, int		const cpl_frame *cpl_frameset_get_frame_const(const cpl_frameset *self,
	position);		cpl_size position);
	cpl_frame *cpl_frameset_get_frame(cpl_frameset *self, int position);		cpl_frame *cpl_frameset_get_frame(cpl_frameset *self, cpl_size position);
	/*		/*
	* Miscellaneous functions		* Miscellaneous functions
	*/		*/
	int *cpl_frameset_labelise(const cpl_frameset *self,		cpl_size *
	int (*compare)(const cpl_frame *, const cpl_fram		cpl_frameset_labelise(const cpl_frameset *self,
	e *),		int (*compare)(const cpl_frame *, const cpl_frame *),
	int *nb_labels);		cpl_size *nb_labels);
	cpl_frameset *cpl_frameset_extract(const cpl_frameset *self, const int *lab
	els,		cpl_frameset *cpl_frameset_extract(const cpl_frameset *self,
	int desired_label) CPL_ATTR_ALLOC;		const cpl_size *labels,
			cpl_size desired_label) CPL_ATTR_ALLOC;
	void cpl_frameset_dump(const cpl_frameset *self, FILE *stream);		void cpl_frameset_dump(const cpl_frameset *self, FILE *stream);
	CPL_END_DECLS		CPL_END_DECLS
	#endif /* CPL_FRAMESET_H */		#endif /* CPL_FRAMESET_H */
End of changes. 7 change blocks.
	17 lines changed or deleted		19 lines changed or added

	cpl_frameset_io.h		cpl_frameset_io.h
	/* $Id: cpl_frameset_io.h,v 1.5 2010/11/11 10:31:52 llundin Exp $		/* $Id: cpl_frameset_io.h,v 1.6 2011/07/21 07:36:33 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 10:31:52 $		* $Date: 2011/07/21 07:36:33 $
	* $Revision: 1.5 $		* $Revision: 1.6 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_FRAMESET_IO_H		#ifndef CPL_FRAMESET_IO_H
	#define CPL_FRAMESET_IO_H		#define CPL_FRAMESET_IO_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include <cpl_frameset.h>		#include <cpl_frameset.h>
	#include <cpl_imagelist.h>		#include <cpl_imagelist.h>
	#include <cpl_type.h>		#include <cpl_type.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/* Convert a frame set to an image list */		/* Load an image list from a frame set */
	cpl_imagelist * cpl_imagelist_load_frameset(const cpl_frameset *, cpl_type,		cpl_imagelist * cpl_imagelist_load_frameset(const cpl_frameset *, cpl_type,
	int, int) CPL_ATTR_ALLOC;		cpl_size, cpl_size) CPL_ATTR_AL LOC;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 4 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cpl_geom_img.h		cpl_geom_img.h
	/* $Id: cpl_geom_img.h,v 1.5 2010/11/11 10:47:01 llundin Exp $		/* $Id: cpl_geom_img.h,v 1.8 2011/11/15 12:41:28 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 10:47:01 $		* $Date: 2011/11/15 12:41:28 $
	* $Revision: 1.5 $		* $Revision: 1.8 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_GEOM_IMG_H		#ifndef CPL_GEOM_IMG_H
	#define CPL_GEOM_IMG_H		#define CPL_GEOM_IMG_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_image.h>		#include <cpl_image.h>
	skipping to change at line 68		skipping to change at line 68
	} cpl_geom_combine;		} cpl_geom_combine;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Offsets detection and frames recombination */		/* Offsets detection and frames recombination */
	cpl_bivector * cpl_geom_img_offset_fine(const cpl_imagelist *,		cpl_bivector * cpl_geom_img_offset_fine(const cpl_imagelist *,
	const cpl_bivector *,		const cpl_bivector *,
	const cpl_bivector *,		const cpl_bivector *,
	int, int, int, int,		cpl_size, cpl_size, cpl_size, cpl_s ize,
	cpl_vector *) CPL_ATTR_ALLOC;		cpl_vector *) CPL_ATTR_ALLOC;
	cpl_image ** cpl_geom_img_offset_saa(const cpl_imagelist *,		cpl_image ** cpl_geom_img_offset_saa(const cpl_imagelist *,
	const cpl_bivector *,		const cpl_bivector *,
	cpl_kernel, int, int, cpl_geom_combine		cpl_kernel, cpl_size,
	,		cpl_size, cpl_geom_combine,
	double *, double *) CPL_ATTR_ALLOC;		double *, double *) CPL_ATTR_ALLOC;
	cpl_image ** cpl_geom_img_offset_combine(cpl_imagelist *, const cpl_bivecto		cpl_image ** cpl_geom_img_offset_combine(const cpl_imagelist *,
	r *,		const cpl_bivector *, int,
	int, const cpl_bivector *,		const cpl_bivector *,
	const cpl_vector *, int *,		const cpl_vector *, cpl_size *,
	int, int, int, int, int, int,		cpl_size, cpl_size, cpl_size,
			cpl_size, cpl_size, cpl_size,
	cpl_geom_combine) CPL_ATTR_ALLOC;		cpl_geom_combine) CPL_ATTR_ALLOC;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	12 lines changed or deleted		13 lines changed or added

	cpl_image.h		cpl_image.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2010/11/11 09:23:18 $
	* $Revision: 1.51 $		* $Revision: 1.51 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGE_H		#ifndef CPL_IMAGE_H
	#define CPL_IMAGE_H		#define CPL_IMAGE_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_image_io.h"		#include "cpl_image_io.h"
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_image_basic.h		cpl_image_basic.h
	/* $Id: cpl_image_basic.h,v 1.47 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_image_basic.h,v 1.49 2011/07/20 08:49:07 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/07/20 08:49:07 $
	* $Revision: 1.47 $		* $Revision: 1.49 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGE_BASIC_H		#ifndef CPL_IMAGE_BASIC_H
	#define CPL_IMAGE_BASIC_H		#define CPL_IMAGE_BASIC_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_image.h"		#include "cpl_image.h"
	skipping to change at line 69		skipping to change at line 69
	CPL_NORM_ABSFLUX		CPL_NORM_ABSFLUX
	};		};
	typedef enum _cpl_norm_ cpl_norm;		typedef enum _cpl_norm_ cpl_norm;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Basic operations */		/* Basic operations */
	cpl_image * cpl_image_add_create(const cpl_image *, const cpl_image *);		cpl_image * cpl_image_add_create(const cpl_image *, const cpl_image *)
	cpl_image * cpl_image_subtract_create(const cpl_image *, const cpl_image *)		CPL_ATTR_ALLOC;
	;		cpl_image * cpl_image_subtract_create(const cpl_image *, const cpl_image *)
	cpl_image * cpl_image_multiply_create(const cpl_image *, const cpl_image *)		CPL_ATTR_ALLOC;
	;		cpl_image * cpl_image_multiply_create(const cpl_image *, const cpl_image *)
	cpl_image * cpl_image_divide_create(const cpl_image *, const cpl_image *);		CPL_ATTR_ALLOC;
			cpl_image * cpl_image_divide_create(const cpl_image *, const cpl_image *)
			CPL_ATTR_ALLOC;
	cpl_error_code cpl_image_add(cpl_image *, const cpl_image *);		cpl_error_code cpl_image_add(cpl_image *, const cpl_image *);
	cpl_error_code cpl_image_subtract(cpl_image *, const cpl_image *);		cpl_error_code cpl_image_subtract(cpl_image *, const cpl_image *);
	cpl_error_code cpl_image_multiply(cpl_image *, const cpl_image *);		cpl_error_code cpl_image_multiply(cpl_image *, const cpl_image *);
	cpl_error_code cpl_image_divide(cpl_image *, const cpl_image *);		cpl_error_code cpl_image_divide(cpl_image *, const cpl_image *);
	cpl_error_code cpl_image_add_scalar(cpl_image *, double);		cpl_error_code cpl_image_add_scalar(cpl_image *, double);
	cpl_error_code cpl_image_subtract_scalar(cpl_image *, double);		cpl_error_code cpl_image_subtract_scalar(cpl_image *, double);
	cpl_error_code cpl_image_multiply_scalar(cpl_image *, double);		cpl_error_code cpl_image_multiply_scalar(cpl_image *, double);
	cpl_error_code cpl_image_divide_scalar(cpl_image *, double);		cpl_error_code cpl_image_divide_scalar(cpl_image *, double);
	cpl_error_code cpl_image_power(cpl_image *, double);		cpl_error_code cpl_image_power(cpl_image *, double);
	cpl_error_code cpl_image_exponential(cpl_image *, double);		cpl_error_code cpl_image_exponential(cpl_image *, double);
	cpl_error_code cpl_image_logarithm(cpl_image *, double);		cpl_error_code cpl_image_logarithm(cpl_image *, double);
	cpl_error_code cpl_image_normalise(cpl_image *, cpl_norm);		cpl_error_code cpl_image_normalise(cpl_image *, cpl_norm);
	cpl_error_code cpl_image_abs(cpl_image *);		cpl_error_code cpl_image_abs(cpl_image *);
	cpl_image * cpl_image_add_scalar_create(const cpl_image *, double);		cpl_image * cpl_image_add_scalar_create(const cpl_image *, double)
	cpl_image * cpl_image_subtract_scalar_create(const cpl_image *, double);		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_multiply_scalar_create(const cpl_image *, double);		cpl_image * cpl_image_subtract_scalar_create(const cpl_image *, double)
	cpl_image * cpl_image_divide_scalar_create(const cpl_image *, double);		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_power_create(const cpl_image *, double);		cpl_image * cpl_image_multiply_scalar_create(const cpl_image *, double)
	cpl_image * cpl_image_exponential_create(const cpl_image *, double);		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_logarithm_create(const cpl_image *, double);		cpl_image * cpl_image_divide_scalar_create(const cpl_image *, double)
	cpl_image * cpl_image_normalise_create(const cpl_image *, cpl_norm);		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_abs_create(const cpl_image *);		cpl_image * cpl_image_power_create(const cpl_image *, double)
			CPL_ATTR_ALLOC;
			cpl_image * cpl_image_exponential_create(const cpl_image *, double)
			CPL_ATTR_ALLOC;
			cpl_image * cpl_image_logarithm_create(const cpl_image *, double)
			CPL_ATTR_ALLOC;
			cpl_image * cpl_image_normalise_create(const cpl_image *, cpl_norm)
			CPL_ATTR_ALLOC;
			cpl_image * cpl_image_abs_create(const cpl_image *)
			CPL_ATTR_ALLOC;
	cpl_error_code cpl_image_threshold(cpl_image *, double, double, double, dou ble);		cpl_error_code cpl_image_threshold(cpl_image *, double, double, double, dou ble);
	cpl_image * cpl_image_average_create(const cpl_image *, const cpl_image *);		cpl_image * cpl_image_average_create(const cpl_image *, const cpl_image *)
			CPL_ATTR_ALLOC;
	/* Collapse functions */		/* Collapse functions */
	cpl_image * cpl_image_collapse_window_create(const cpl_image *, int, int, i		cpl_image * cpl_image_collapse_window_create(const cpl_image *, cpl_size,
	nt,		cpl_size, cpl_size,
	int, int);		cpl_size, int)
	cpl_image * cpl_image_collapse_create(const cpl_image *, int);		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_collapse_median_create(const cpl_image *, int, int, i		cpl_image * cpl_image_collapse_create(const cpl_image *, int)
	nt);		CPL_ATTR_ALLOC;
			cpl_image * cpl_image_collapse_median_create(const cpl_image *, int,
			cpl_size, cpl_size)
			CPL_ATTR_ALLOC;
	/* Extraction function */		/* Extraction function */
	cpl_image * cpl_image_extract(const cpl_image *, int, int, int, int);		cpl_image * cpl_image_extract(const cpl_image *, cpl_size, cpl_size,
	cpl_vector * cpl_vector_new_from_image_row(const cpl_image *, int);		cpl_size, cpl_size) CPL_ATTR_ALLOC;
	cpl_vector * cpl_vector_new_from_image_column(const cpl_image *, int);		cpl_vector * cpl_vector_new_from_image_row(const cpl_image *, cpl_size)
			CPL_ATTR_ALLOC;
			cpl_vector * cpl_vector_new_from_image_column(const cpl_image *, cpl_size)
			CPL_ATTR_ALLOC;
	/* Rotation and Shift */		/* Rotation and Shift */
	cpl_error_code cpl_image_turn(cpl_image *, int);		cpl_error_code cpl_image_turn(cpl_image *, int);
	cpl_error_code cpl_image_shift(cpl_image *, int, int);		cpl_error_code cpl_image_shift(cpl_image *, cpl_size, cpl_size);
	/* Insert an image in an other one */		/* Insert an image in an other one */
	cpl_error_code cpl_image_copy(cpl_image *, const cpl_image *, int, int);		cpl_error_code cpl_image_copy(cpl_image *, const cpl_image *,
			cpl_size, cpl_size);
	/* Symmetry function */		/* Symmetry function */
	cpl_error_code cpl_image_flip(cpl_image *, int);		cpl_error_code cpl_image_flip(cpl_image *, int);
	/* Pixels re-organization */		/* Pixels re-organization */
	cpl_error_code cpl_image_move(cpl_image *, int, const int *);		cpl_error_code cpl_image_move(cpl_image *, cpl_size, const cpl_size *);
	/* Gaussian fit of an image zone */		/* Gaussian fit of an image zone */
	cpl_error_code		cpl_error_code
	cpl_image_fit_gaussian(const cpl_image *, int, int, int,		cpl_image_fit_gaussian(const cpl_image *, cpl_size, cpl_size, cpl_size,
	double *, double *, double *, double *,		double *, double *, double *, double *,
	double *, double *, double *) CPL_ATTR_DEPRECATED;		double *, double *, double *) CPL_ATTR_DEPRECATED;
	/* FWHM computation on a local maximum */		/* FWHM computation on a local maximum */
	cpl_error_code cpl_image_get_fwhm(const cpl_image *, int, int, double *,		cpl_error_code cpl_image_get_fwhm(const cpl_image *, cpl_size, cpl_size,
	double *);		double *, double *);
	/* FFT computation */		/* FFT computation */
	cpl_error_code cpl_image_fft(cpl_image *, cpl_image *, unsigned);		cpl_error_code cpl_image_fft(cpl_image *, cpl_image *, unsigned);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 12 change blocks.
	35 lines changed or deleted		54 lines changed or added

	cpl_image_bpm.h		cpl_image_bpm.h
	/* $Id: cpl_image_bpm.h,v 1.18 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_image_bpm.h,v 1.19 2011/07/19 14:37:27 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/07/19 14:37:27 $
	* $Revision: 1.18 $		* $Revision: 1.19 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGE_BPM_H		#ifndef CPL_IMAGE_BPM_H
	#define CPL_IMAGE_BPM_H		#define CPL_IMAGE_BPM_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_image.h"		#include "cpl_image.h"
	#include "cpl_bivector.h"		#include "cpl_bivector.h"
	#include "cpl_mask.h"		#include "cpl_mask.h"
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Info on the bad pixels */		/* Info on the bad pixels */
	int cpl_image_count_rejected(const cpl_image *);		cpl_size cpl_image_count_rejected(const cpl_image *);
	int cpl_image_is_rejected(const cpl_image *, int, int);		int cpl_image_is_rejected(const cpl_image *, cpl_size, cpl_size);
	/* To modify an image's bad pixel map */		/* To modify an image's bad pixel map */
	cpl_error_code cpl_image_reject(cpl_image *, int, int);		cpl_error_code cpl_image_reject(cpl_image *, cpl_size, cpl_size);
	cpl_error_code cpl_image_accept(cpl_image *, int, int);		cpl_error_code cpl_image_accept(cpl_image *, cpl_size, cpl_size);
	cpl_error_code cpl_image_accept_all(cpl_image *);		cpl_error_code cpl_image_accept_all(cpl_image *);
	cpl_error_code cpl_image_reject_from_mask(cpl_image *, const cpl_mask *);		cpl_error_code cpl_image_reject_from_mask(cpl_image *, const cpl_mask *);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 4 change blocks.
	8 lines changed or deleted		8 lines changed or added

	cpl_image_filter.h		cpl_image_filter.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2010/11/11 09:23:18 $
	* $Revision: 1.25 $		* $Revision: 1.25 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGE_FILTER_H		#ifndef CPL_IMAGE_FILTER_H
	#define CPL_IMAGE_FILTER_H		#define CPL_IMAGE_FILTER_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_image.h"		#include "cpl_image.h"
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_image_gen.h		cpl_image_gen.h
	/* $Id: cpl_image_gen.h,v 1.19 2010/11/11 15:28:46 llundin Exp $		/* $Id: cpl_image_gen.h,v 1.20 2011/07/21 08:03:53 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 15:28:46 $		* $Date: 2011/07/21 08:03:53 $
	* $Revision: 1.19 $		* $Revision: 1.20 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGE_GEN_H		#ifndef CPL_IMAGE_GEN_H
	#define CPL_IMAGE_GEN_H		#define CPL_IMAGE_GEN_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_image.h"		#include "cpl_image.h"
	#include "cpl_polynomial.h"		#include "cpl_polynomial.h"
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	cpl_error_code cpl_image_fill_noise_uniform(cpl_image *, double, double);		cpl_error_code cpl_image_fill_noise_uniform(cpl_image *, double, double);
	cpl_error_code cpl_image_fill_gaussian(cpl_image *, double, double, double,		cpl_error_code cpl_image_fill_gaussian(cpl_image *, double, double, double,
	double, double);		double, double);
	cpl_error_code cpl_image_fill_polynomial(cpl_image *,		cpl_error_code cpl_image_fill_polynomial(cpl_image *, const cpl_polynomial
	const cpl_polynomial *, double, double, double, double);		*,
	cpl_image * cpl_image_fill_test_create(int, int) CPL_ATTR_ALLOC;		double, double, double, double);
			cpl_image * cpl_image_fill_test_create(cpl_size, cpl_size) CPL_ATTR_ALLOC;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 3 change blocks.
	8 lines changed or deleted		9 lines changed or added

	cpl_image_io.h		cpl_image_io.h
	/* $Id: cpl_image_io.h,v 1.72 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_image_io.h,v 1.78 2012/03/13 09:31:59 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2012/03/13 09:31:59 $
	* $Revision: 1.72 $		* $Revision: 1.78 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGE_IO_H		#ifndef CPL_IMAGE_IO_H
	#define CPL_IMAGE_IO_H		#define CPL_IMAGE_IO_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	New types		New types
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	typedef struct _cpl_image_ cpl_image;		typedef struct _cpl_image_ cpl_image;
	skipping to change at line 54		skipping to change at line 54
	#include <stdio.h>		#include <stdio.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Image constructors */		/* Image constructors */
	cpl_image * cpl_image_new(int, int, cpl_type) CPL_ATTR_ALLOC;		cpl_image * cpl_image_new(cpl_size, cpl_size, cpl_type) CPL_ATTR_ALLOC;
	cpl_image * cpl_image_wrap(int, int, cpl_type, void *) CPL_ATTR_ALLOC;		cpl_image * cpl_image_wrap(cpl_size, cpl_size, cpl_type, void *) CPL_ATTR_A
	cpl_image * cpl_image_wrap_double(int, int, double *) CPL_ATTR_ALLOC;		LLOC;
	cpl_image * cpl_image_wrap_float(int, int, float *) CPL_ATTR_ALLOC;		cpl_image * cpl_image_wrap_double(cpl_size, cpl_size, double *) CPL_ATTR_AL
	cpl_image * cpl_image_wrap_int(int, int, int *) CPL_ATTR_ALLOC;		LOC;
			cpl_image * cpl_image_wrap_float(cpl_size, cpl_size, float *) CPL_ATTR_ALLO
			C;
			cpl_image * cpl_image_wrap_int(cpl_size, cpl_size, int *) CPL_ATTR_ALLOC;
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_image * cpl_image_wrap_double_complex(int, int,		cpl_image * cpl_image_wrap_double_complex(cpl_size, cpl_size,
	double complex *) CPL_ATTR_ALLOC;		double complex *) CPL_ATTR_ALLOC;
	cpl_image * cpl_image_wrap_float_complex(int, int,		cpl_image * cpl_image_wrap_float_complex(cpl_size, cpl_size,
	float complex *) CPL_ATTR_ALLOC;		float complex *) CPL_ATTR_ALLOC;
	#endif		#endif
	cpl_image * cpl_image_load(const char *, cpl_type, int, int) CPL_ATTR_ALLOC		cpl_image * cpl_image_load(const char *, cpl_type, cpl_size, cpl_size)
	;		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_load_window(const char *, cpl_type, int, int,		cpl_image * cpl_image_load_window(const char *, cpl_type, cpl_size, cpl_siz
	int, int, int, int) CPL_ATTR_ALLOC;		e,
			cpl_size, cpl_size, cpl_size, cpl_size)
			CPL_ATTR_ALLOC;
	cpl_image * cpl_image_new_from_mask(const cpl_mask *) CPL_ATTR_ALLOC;		cpl_image * cpl_image_new_from_mask(const cpl_mask *) CPL_ATTR_ALLOC;
	cpl_image * cpl_image_labelise_mask_create(const cpl_mask *,		cpl_image * cpl_image_labelise_mask_create(const cpl_mask *,
	int *) CPL_ATTR_ALLOC;		cpl_size *) CPL_ATTR_ALLOC;
	/* Get functions */		/* Get functions */
	cpl_type cpl_image_get_type(const cpl_image *);		cpl_type cpl_image_get_type(const cpl_image *);
	int cpl_image_get_size_x(const cpl_image *);		cpl_size cpl_image_get_size_x(const cpl_image *);
	int cpl_image_get_size_y(const cpl_image *);		cpl_size cpl_image_get_size_y(const cpl_image *);
	double cpl_image_get(const cpl_image *, int, int, int *);		double cpl_image_get(const cpl_image *, cpl_size, cpl_size, int *);
	#ifdef _Complex_I		#ifdef _Complex_I
	double complex cpl_image_get_complex(const cpl_image *, int, int, int *);		double complex cpl_image_get_complex(const cpl_image *, cpl_size, cpl_size,
	cpl_error_code cpl_image_set_complex(cpl_image *, int, int, double complex)		int *);
	;		cpl_error_code cpl_image_set_complex(cpl_image *, cpl_size, cpl_size,
			double complex);
	#endif		#endif
	cpl_mask * cpl_image_unset_bpm(cpl_image *);		cpl_mask * cpl_image_unset_bpm(cpl_image *);
	cpl_mask * cpl_image_get_bpm(cpl_image *);		cpl_mask * cpl_image_get_bpm(cpl_image *);
	const cpl_mask * cpl_image_get_bpm_const(const cpl_image *);		const cpl_mask * cpl_image_get_bpm_const(const cpl_image *);
	void * cpl_image_get_data(cpl_image *);		void * cpl_image_get_data(cpl_image *);
	const void * cpl_image_get_data_const(const cpl_image *);		const void * cpl_image_get_data_const(const cpl_image *);
	double * cpl_image_get_data_double(cpl_image *);		double * cpl_image_get_data_double(cpl_image *);
	const double * cpl_image_get_data_double_const(const cpl_image *);		const double * cpl_image_get_data_double_const(const cpl_image *);
	float * cpl_image_get_data_float(cpl_image *);		float * cpl_image_get_data_float(cpl_image *);
	const float * cpl_image_get_data_float_const(const cpl_image *);		const float * cpl_image_get_data_float_const(const cpl_image *);
	int * cpl_image_get_data_int(cpl_image *);		int * cpl_image_get_data_int(cpl_image *);
	const int * cpl_image_get_data_int_const(const cpl_image *);		const int * cpl_image_get_data_int_const(const cpl_image *);
	#ifdef _Complex_I		#ifdef _Complex_I
	double complex * cpl_image_get_data_double_complex(cpl_image *);		double complex * cpl_image_get_data_double_complex(cpl_image *);
	const double complex * cpl_image_get_data_double_complex_const(const cpl_im age *);		const double complex * cpl_image_get_data_double_complex_const(const cpl_im age *);
	float complex * cpl_image_get_data_float_complex(cpl_image *);		float complex * cpl_image_get_data_float_complex(cpl_image *);
	const float complex * cpl_image_get_data_float_complex_const(const cpl_imag e *);		const float complex * cpl_image_get_data_float_complex_const(const cpl_imag e *);
	#endif		#endif
			cpl_error_code cpl_image_conjugate(cpl_image *, const cpl_image *);
			cpl_error_code cpl_image_fill_re_im(cpl_image *, cpl_image *,
			const cpl_image *);
			cpl_error_code cpl_image_fill_abs_arg(cpl_image *, cpl_image *,
			const cpl_image *);
	/* Set functions */		/* Set functions */
	cpl_error_code cpl_image_set(cpl_image *, int, int, double);		cpl_error_code cpl_image_set(cpl_image *, cpl_size, cpl_size, double);
	cpl_error_code cpl_image_fill_rejected(cpl_image *, double);		cpl_error_code cpl_image_fill_rejected(cpl_image *, double);
	/* Image destructor */		/* Image destructor */
	void cpl_image_delete(cpl_image *);		void cpl_image_delete(cpl_image *);
	void * cpl_image_unwrap(cpl_image *);		void * cpl_image_unwrap(cpl_image *);
	/* Debugging functions */		/* Debugging functions */
	cpl_error_code cpl_image_dump_structure(const cpl_image *, FILE *);		cpl_error_code cpl_image_dump_structure(const cpl_image *, FILE *);
	cpl_error_code cpl_image_dump_window(const cpl_image *, int, int, int, int,		cpl_error_code cpl_image_dump_window(const cpl_image *, cpl_size, cpl_size,
	FILE *);		cpl_size, cpl_size, FILE *);
	/* Others */		/* Others */
	cpl_image * cpl_image_duplicate(const cpl_image *) CPL_ATTR_ALLOC;		cpl_image * cpl_image_duplicate(const cpl_image *) CPL_ATTR_ALLOC;
	cpl_image * cpl_image_cast(const cpl_image *, cpl_type) CPL_ATTR_ALLOC;		cpl_image * cpl_image_cast(const cpl_image *, cpl_type) CPL_ATTR_ALLOC;
	/* Saving function */		/* Saving function */
	cpl_error_code cpl_image_save(const cpl_image *, const char *, cpl_type_bpp ,		cpl_error_code cpl_image_save(const cpl_image *, const char *, cpl_type,
	const cpl_propertylist *, unsigned);		const cpl_propertylist *, unsigned);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 13 change blocks.
	26 lines changed or deleted		38 lines changed or added

	cpl_image_iqe.h		cpl_image_iqe.h
	/* $Id: cpl_image_iqe.h,v 1.5 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_image_iqe.h,v 1.6 2011/07/20 08:49:08 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/07/20 08:49:08 $
	* $Revision: 1.5 $		* $Revision: 1.6 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGE_IQE_H		#ifndef CPL_IMAGE_IQE_H
	#define CPL_IMAGE_IQE_H		#define CPL_IMAGE_IQE_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_image.h"		#include "cpl_image.h"
	#include "cpl_bivector.h"		#include "cpl_bivector.h"
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	cpl_bivector * cpl_image_iqe(const cpl_image *, int, int, int, int) ;		cpl_bivector * cpl_image_iqe(const cpl_image *, cpl_size, cpl_size, cpl_siz
			e,
			cpl_size) CPL_ATTR_ALLOC;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 3 change blocks.
	5 lines changed or deleted		7 lines changed or added

	cpl_image_resample.h		cpl_image_resample.h
	/* $Id: cpl_image_resample.h,v 1.18 2010/11/11 15:28:46 llundin Exp $		/* $Id: cpl_image_resample.h,v 1.19 2011/07/20 11:20:40 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 15:28:46 $		* $Date: 2011/07/20 11:20:40 $
	* $Revision: 1.18 $		* $Revision: 1.19 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGE_RESAMPLE_H		#ifndef CPL_IMAGE_RESAMPLE_H
	#define CPL_IMAGE_RESAMPLE_H		#define CPL_IMAGE_RESAMPLE_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>		#include <stdio.h>
	skipping to change at line 57		skipping to change at line 57
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	cpl_error_code cpl_image_warp_polynomial(cpl_image *, const cpl_image *,		cpl_error_code cpl_image_warp_polynomial(cpl_image *, const cpl_image *,
	const cpl_polynomial *,		const cpl_polynomial *,
	const cpl_polynomial *,		const cpl_polynomial *,
	const cpl_vector *, double,		const cpl_vector *, double,
	const cpl_vector *, double);		const cpl_vector *, double);
	cpl_error_code cpl_image_warp(cpl_image *, const cpl_image *,		cpl_error_code cpl_image_warp(cpl_image *, const cpl_image *,
	const cpl_image *,		const cpl_image *,
	const cpl_image *,		const cpl_image *,
	const cpl_vector *, double,		const cpl_vector *, double,
	const cpl_vector *, double);		const cpl_vector *, double);
	cpl_error_code cpl_image_fill_jacobian_polynomial(cpl_image *,		cpl_error_code cpl_image_fill_jacobian_polynomial(cpl_image *,
	const cpl_polynomial *pol y_x,		const cpl_polynomial *pol y_x,
	const cpl_polynomial *pol y_y);		const cpl_polynomial *pol y_y);
	cpl_error_code cpl_image_fill_jacobian(cpl_image *,		cpl_error_code cpl_image_fill_jacobian(cpl_image *,
	const cpl_image *deltax,		const cpl_image *deltax,
	const cpl_image *deltay);		const cpl_image *deltay);
	cpl_image *cpl_image_extract_subsample(const cpl_image *,		cpl_image *cpl_image_extract_subsample(const cpl_image *,
	int, int) CPL_ATTR_ALLOC;		cpl_size, cpl_size) CPL_ATTR_ALLOC;
	cpl_image *cpl_image_rebin(const cpl_image *, int, int,		cpl_image *cpl_image_rebin(const cpl_image *, cpl_size, cpl_size,
	int, int) CPL_ATTR_ALLOC;		cpl_size, cpl_size) CPL_ATTR_ALLOC;
	double cpl_image_get_interpolated(const cpl_image *, double, double,		double cpl_image_get_interpolated(const cpl_image *, double, double,
	const cpl_vector *, double,		const cpl_vector *, double,
	const cpl_vector *, double, double *);		const cpl_vector *, double, double *);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	11 lines changed or deleted		11 lines changed or added

	cpl_image_stats.h		cpl_image_stats.h
	/* $Id: cpl_image_stats.h,v 1.27 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_image_stats.h,v 1.28 2011/07/20 09:40:05 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/07/20 09:40:05 $
	* $Revision: 1.27 $		* $Revision: 1.28 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGE_STATS_H		#ifndef CPL_IMAGE_STATS_H
	#define CPL_IMAGE_STATS_H		#define CPL_IMAGE_STATS_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_image.h"		#include "cpl_image.h"
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	double cpl_image_get_min(const cpl_image *);		double cpl_image_get_min(const cpl_image *);
	double cpl_image_get_min_window(const cpl_image *, int, int, int, int);		double cpl_image_get_min_window(const cpl_image *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	double cpl_image_get_max(const cpl_image *);		double cpl_image_get_max(const cpl_image *);
	double cpl_image_get_max_window(const cpl_image *, int, int, int, int);		double cpl_image_get_max_window(const cpl_image *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	double cpl_image_get_mean(const cpl_image *);		double cpl_image_get_mean(const cpl_image *);
	double cpl_image_get_mean_window(const cpl_image *, int, int, int, int);		double cpl_image_get_mean_window(const cpl_image *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	double cpl_image_get_median(const cpl_image *);		double cpl_image_get_median(const cpl_image *);
	double cpl_image_get_median_window(const cpl_image *, int, int, int, int);		double cpl_image_get_median_window(const cpl_image *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	double cpl_image_get_stdev(const cpl_image *);		double cpl_image_get_stdev(const cpl_image *);
	double cpl_image_get_stdev_window(const cpl_image *, int, int, int, int);		double cpl_image_get_stdev_window(const cpl_image *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	double cpl_image_get_flux(const cpl_image *);		double cpl_image_get_flux(const cpl_image *);
	double cpl_image_get_flux_window(const cpl_image *, int, int, int, int);		double cpl_image_get_flux_window(const cpl_image *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	double cpl_image_get_absflux(const cpl_image *);		double cpl_image_get_absflux(const cpl_image *);
	double cpl_image_get_absflux_window(const cpl_image *, int, int, int, int);		double cpl_image_get_absflux_window(const cpl_image *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	double cpl_image_get_sqflux(const cpl_image *);		double cpl_image_get_sqflux(const cpl_image *);
	double cpl_image_get_sqflux_window(const cpl_image *, int, int, int, int);		double cpl_image_get_sqflux_window(const cpl_image *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	double cpl_image_get_centroid_x(const cpl_image *);		double cpl_image_get_centroid_x(const cpl_image *);
	double cpl_image_get_centroid_x_window(const cpl_image *, int, int, int, in		double cpl_image_get_centroid_x_window(const cpl_image *, cpl_size, cpl_siz
	t);		e,
			cpl_size, cpl_size);
	double cpl_image_get_centroid_y(const cpl_image *);		double cpl_image_get_centroid_y(const cpl_image *);
	double cpl_image_get_centroid_y_window(const cpl_image *, int, int, int, in		double cpl_image_get_centroid_y_window(const cpl_image *, cpl_size, cpl_siz
	t);		e,
			cpl_size, cpl_size);
	cpl_error_code cpl_image_get_minpos(const cpl_image *, int *, int *);		cpl_error_code cpl_image_get_minpos(const cpl_image *, cpl_size *, cpl_size
	cpl_error_code cpl_image_get_minpos_window(const cpl_image *, int, int,		*);
	int, int, int *, int *);		cpl_error_code cpl_image_get_minpos_window(const cpl_image *, cpl_size,
	cpl_error_code cpl_image_get_maxpos(const cpl_image *, int *, int *);		cpl_size, cpl_size, cpl_size,
	cpl_error_code cpl_image_get_maxpos_window(const cpl_image *, int, int,		cpl_size *, cpl_size *);
	int, int, int *, int *);		cpl_error_code cpl_image_get_maxpos(const cpl_image *, cpl_size *, cpl_size
			*);
			cpl_error_code cpl_image_get_maxpos_window(const cpl_image *, cpl_size,
			cpl_size, cpl_size, cpl_size,
			cpl_size *, cpl_size *);
	double cpl_image_get_median_dev(const cpl_image *, double *);		double cpl_image_get_median_dev(const cpl_image *, double *);
	double cpl_image_get_median_dev_window(const cpl_image *, int, int, int, in		double cpl_image_get_median_dev_window(const cpl_image *, cpl_size, cpl_siz
	t,		e,
	double *);		cpl_size, cpl_size, double *);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 14 change blocks.
	25 lines changed or deleted		39 lines changed or added

	cpl_imagelist.h		cpl_imagelist.h
	/* $Id: cpl_imagelist.h,v 1.6 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_imagelist.h,v 1.7 2011/04/08 08:43:28 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/04/08 08:43:28 $
	* $Revision: 1.6 $		* $Revision: 1.7 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGELIST_H		#ifndef CPL_IMAGELIST_H
	#define CPL_IMAGELIST_H		#define CPL_IMAGELIST_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	New types		New types
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	typedef struct _cpl_imagelist_ cpl_imagelist ;		typedef struct _cpl_imagelist_ cpl_imagelist;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_imagelist_io.h"		#include "cpl_imagelist_io.h"
	#include "cpl_imagelist_basic.h"		#include "cpl_imagelist_basic.h"
			/*-------------------------------------------------------------------------
			---*/
			/**
			* @defgroup cpl_imagelist Imagelists
			*
			* This module provides functions to create, use, and destroy a
			* @em cpl_imagelist.
			* A @em cpl_imagelist is an ordered list of cpl_images. All images in a li
			st
			* must have the same pixel-type and the same dimensions.
			*
			* @par Synopsis:
			* @code
			* #include "cpl_imagelist.h"
			* @endcode
			*/
			/*-------------------------------------------------------------------------
			---*/
	#endif		#endif
End of changes. 4 change blocks.
	5 lines changed or deleted		24 lines changed or added

	cpl_imagelist_basic.h		cpl_imagelist_basic.h
	/* $Id: cpl_imagelist_basic.h,v 1.22 2010/11/11 15:28:46 llundin Exp $		/* $Id: cpl_imagelist_basic.h,v 1.25 2011/07/20 14:32:39 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 15:28:46 $		* $Date: 2011/07/20 14:32:39 $
	* $Revision: 1.22 $		* $Revision: 1.25 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGELIST_BASIC_H		#ifndef CPL_IMAGELIST_BASIC_H
	#define CPL_IMAGELIST_BASIC_H		#define CPL_IMAGELIST_BASIC_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_image.h"
	#include "cpl_imagelist.h"		#include "cpl_imagelist.h"
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Defines		Defines
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	enum _cpl_swap_axis_ {		enum _cpl_swap_axis_ {
	CPL_SWAP_AXIS_XZ,		CPL_SWAP_AXIS_XZ,
	CPL_SWAP_AXIS_YZ		CPL_SWAP_AXIS_YZ
	};		};
	typedef enum _cpl_swap_axis_ cpl_swap_axis;		typedef enum _cpl_swap_axis_ cpl_swap_axis;
	#define CPL_COLLAPSE_MEAN ((unsigned)1 << 1)		typedef enum {
	#define CPL_COLLAPSE_MEDIAN ((unsigned)1 << 2)		CPL_COLLAPSE_MEAN,
			CPL_COLLAPSE_MEDIAN,
			CPL_COLLAPSE_MEDIAN_MEAN
			} cpl_collapse_mode;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Imagelist modifying functions */		/* Imagelist modifying functions */
	cpl_error_code cpl_imagelist_add(cpl_imagelist *, const cpl_imagelist *);		cpl_error_code cpl_imagelist_add(cpl_imagelist *, const cpl_imagelist *);
	cpl_error_code cpl_imagelist_subtract(cpl_imagelist *, const cpl_imagelist *);		cpl_error_code cpl_imagelist_subtract(cpl_imagelist *, const cpl_imagelist *);
	cpl_error_code cpl_imagelist_multiply(cpl_imagelist *, const cpl_imagelist *);		cpl_error_code cpl_imagelist_multiply(cpl_imagelist *, const cpl_imagelist *);
	cpl_error_code cpl_imagelist_divide(cpl_imagelist *, const cpl_imagelist *) ;		cpl_error_code cpl_imagelist_divide(cpl_imagelist *, const cpl_imagelist *) ;
	skipping to change at line 89		skipping to change at line 91
	double, double);		double, double);
	cpl_imagelist * cpl_imagelist_swap_axis_create(const cpl_imagelist *,		cpl_imagelist * cpl_imagelist_swap_axis_create(const cpl_imagelist *,
	cpl_swap_axis) CPL_ATTR_ALLO C;		cpl_swap_axis) CPL_ATTR_ALLO C;
	/* Imagelist to image functions */		/* Imagelist to image functions */
	cpl_image * cpl_image_new_from_accepted(const cpl_imagelist *) CPL_ATTR_ALL OC;		cpl_image * cpl_image_new_from_accepted(const cpl_imagelist *) CPL_ATTR_ALL OC;
	cpl_image * cpl_imagelist_collapse_create(const cpl_imagelist *) CPL_ATTR_A LLOC;		cpl_image * cpl_imagelist_collapse_create(const cpl_imagelist *) CPL_ATTR_A LLOC;
	cpl_image * cpl_imagelist_collapse_median_create(const cpl_imagelist *)		cpl_image * cpl_imagelist_collapse_median_create(const cpl_imagelist *)
	CPL_ATTR_ALLOC;		CPL_ATTR_ALLOC;
	cpl_image * cpl_imagelist_collapse_minmax_create(const cpl_imagelist *,		cpl_image * cpl_imagelist_collapse_minmax_create(const cpl_imagelist *,
	int, int) CPL_ATTR_ALLOC;		cpl_size, cpl_size)
	cpl_image * cpl_imagelist_collapse_sigclip_create(const cpl_imagelist *, do		CPL_ATTR_ALLOC;
	uble,		cpl_image * cpl_imagelist_collapse_sigclip_create(const cpl_imagelist *,
	double, double, unsigned,		double, double, double,
			cpl_collapse_mode,
	cpl_image *) CPL_ATTR_ALL OC;		cpl_image *) CPL_ATTR_ALL OC;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	11 lines changed or deleted		14 lines changed or added

	cpl_imagelist_io.h		cpl_imagelist_io.h
	/* $Id: cpl_imagelist_io.h,v 1.24 2010/11/11 15:28:46 llundin Exp $		/* $Id: cpl_imagelist_io.h,v 1.28 2011/08/12 11:31:37 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 15:28:46 $		* $Date: 2011/08/12 11:31:37 $
	* $Revision: 1.24 $		* $Revision: 1.28 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IMAGELIST_IO_H		#ifndef CPL_IMAGELIST_IO_H
	#define CPL_IMAGELIST_IO_H		#define CPL_IMAGELIST_IO_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_image.h"		#include "cpl_image.h"
	skipping to change at line 47		skipping to change at line 47
	#include "cpl_vector.h"		#include "cpl_vector.h"
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Imagelist constructors */		/* Imagelist constructors */
	cpl_imagelist * cpl_imagelist_new(void) CPL_ATTR_ALLOC;		cpl_imagelist * cpl_imagelist_new(void) CPL_ATTR_ALLOC;
	cpl_imagelist * cpl_imagelist_load(const char *, cpl_type, int) CPL_ATTR_AL		cpl_imagelist * cpl_imagelist_load(const char *, cpl_type, cpl_size)
	LOC;		CPL_ATTR_ALLOC;
	cpl_imagelist * cpl_imagelist_load_window(const char *, cpl_type, int, int,		cpl_imagelist * cpl_imagelist_load_window(const char *, cpl_type, cpl_size,
	int, int, int) CPL_ATTR_ALLOC;		cpl_size, cpl_size, cpl_size,
			cpl_size) CPL_ATTR_ALLOC;
	/* Imagelist accessors */		/* Imagelist accessors */
	int cpl_imagelist_get_size(const cpl_imagelist *);		cpl_size cpl_imagelist_get_size(const cpl_imagelist *);
	cpl_image * cpl_imagelist_get(cpl_imagelist *, int);		cpl_image * cpl_imagelist_get(cpl_imagelist *, cpl_size);
	const cpl_image * cpl_imagelist_get_const(const cpl_imagelist *, int);		const cpl_image * cpl_imagelist_get_const(const cpl_imagelist *, cpl_size);
	cpl_error_code cpl_imagelist_set(cpl_imagelist *, cpl_image *, int);		cpl_error_code cpl_imagelist_set(cpl_imagelist *, cpl_image *, cpl_size);
	cpl_image * cpl_imagelist_unset(cpl_imagelist *, int);		cpl_image * cpl_imagelist_unset(cpl_imagelist *, cpl_size);
	/* Imagelist destructor */		/* Imagelist destructor */
	void cpl_imagelist_delete(cpl_imagelist *);		void cpl_imagelist_delete(cpl_imagelist *);
			void cpl_imagelist_empty(cpl_imagelist *);
	/* Others */		/* Others */
	cpl_imagelist * cpl_imagelist_duplicate(const cpl_imagelist *) CPL_ATTR_ALL OC;		cpl_imagelist * cpl_imagelist_duplicate(const cpl_imagelist *) CPL_ATTR_ALL OC;
	cpl_error_code cpl_imagelist_erase(cpl_imagelist *, const cpl_vector *);		cpl_error_code cpl_imagelist_erase(cpl_imagelist *, const cpl_vector *);
	int cpl_imagelist_is_uniform(const cpl_imagelist *);		int cpl_imagelist_is_uniform(const cpl_imagelist *);
	cpl_error_code cpl_imagelist_dump_structure(const cpl_imagelist *, FILE *);		cpl_error_code cpl_imagelist_dump_structure(const cpl_imagelist *, FILE *);
	cpl_error_code cpl_imagelist_dump_window(const cpl_imagelist *,		cpl_error_code cpl_imagelist_dump_window(const cpl_imagelist *,
	int, int, int, int, FILE *);		cpl_size, cpl_size, cpl_size, cpl_size, FILE *);
	/* Saving function */		/* Saving function */
	cpl_error_code cpl_imagelist_save(const cpl_imagelist *, const char *,		cpl_error_code cpl_imagelist_save(const cpl_imagelist *, const char *,
	cpl_type_bpp, const cpl_propertylist *,		cpl_type, const cpl_propertylist *,
	unsigned);		unsigned);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 7 change blocks.
	15 lines changed or deleted		18 lines changed or added

	cpl_init.h		cpl_init.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2010/11/11 09:23:18 $
	* $Revision: 1.9 $		* $Revision: 1.9 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_INIT_H		#ifndef CPL_INIT_H
	#define CPL_INIT_H		#define CPL_INIT_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	#define CPL_INIT_DEFAULT 0		#define CPL_INIT_DEFAULT 0
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_io.h		cpl_io.h
	/* $Id: cpl_io.h,v 1.16 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_io.h,v 1.17 2011/04/01 09:57:38 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/04/01 09:57:38 $
	* $Revision: 1.16 $		* $Revision: 1.17 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_IO_H		#ifndef CPL_IO_H
	#define CPL_IO_H		#define CPL_IO_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_macros.h>		#include <cpl_macros.h>
	skipping to change at line 103		skipping to change at line 103
	};		};
	/**		/**
	* @brief		* @brief
	* The file I/O modes.		* The file I/O modes.
	*/		*/
	typedef enum _cpl_io_type_ cpl_io_type;		typedef enum _cpl_io_type_ cpl_io_type;
	/*------------------------------------------------------------------------- ---*/
	/**		/**
	*		@deprecated Use CPL_TYPE_UCHAR
	* @brief These are the pixel types that can be used for saving.		*/
	*/		#define CPL_BPP_8_UNSIGNED CPL_TYPE_UCHAR
	/*-------------------------------------------------------------------------
	---*/
	enum _cpl_type_bpp_ {
	/** @hideinitializer */
	CPL_BPP_8_UNSIGNED = 8,
	/**< 8-bit unsigned integer */
	/** @hideinitializer */
	CPL_BPP_16_SIGNED = 16,
	/**< 16-bit signed integer */
	/** @hideinitializer */
	CPL_BPP_16_UNSIGNED = 20,
	/**< 16-bit unsigned integer */
	/** @hideinitializer */
	CPL_BPP_32_SIGNED = 32,
	/**< 32-bit signed integer */
	/** @hideinitializer */		/**
	CPL_BPP_IEEE_FLOAT = -32,		@deprecated Use CPL_TYPE_SHORT
	/**< 32-bit floating point */		*/
			#define CPL_BPP_16_SIGNED CPL_TYPE_SHORT
	/** @hideinitializer */		/**
	CPL_BPP_IEEE_DOUBLE = -64		@deprecated Use CPL_TYPE_USHORT
	/**< 64-bit floating point */		*/
			#define CPL_BPP_16_UNSIGNED CPL_TYPE_USHORT
	};		/**
			@deprecated Use CPL_TYPE_INT
			*/
			#define CPL_BPP_32_SIGNED CPL_TYPE_INT
	/**		/**
	* @brief		@deprecated Use CPL_TYPE_FLOAT
	* The pixel types that can be used for saving.		*/
	*/		#define CPL_BPP_IEEE_FLOAT CPL_TYPE_FLOAT
	typedef enum _cpl_type_bpp_ cpl_type_bpp;		/**
			@deprecated Use CPL_TYPE_DOUBLE
			*/
			#define CPL_BPP_IEEE_DOUBLE CPL_TYPE_DOUBLE
			/**
			@deprecated Use cpl_type
			*/
			#define cpl_type_bpp cpl_type
	/**@}*/		/**@}*/
	CPL_END_DECLS		CPL_END_DECLS
	#endif /* CPL_IO_H */		#endif /* CPL_IO_H */
End of changes. 9 change blocks.
	38 lines changed or deleted		30 lines changed or added

	cpl_macros.h		cpl_macros.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2011/01/11 12:26:35 $		* $Date: 2011/01/11 12:26:35 $
	* $Revision: 1.9 $		* $Revision: 1.9 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	/*		/*
	* This file must not include any other file than cxmacros.h		* This file must not include any other file than cxmacros.h
	*/		*/
	#ifndef CPL_MACROS_H		#ifndef CPL_MACROS_H
	#define CPL_MACROS_H		#define CPL_MACROS_H
	#include <cxmacros.h>		#include <cxmacros.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_mask.h		cpl_mask.h
	/* $Id: cpl_mask.h,v 1.29 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_mask.h,v 1.33 2011/08/11 11:08:33 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/08/11 11:08:33 $
	* $Revision: 1.29 $		* $Revision: 1.33 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_MASK_H		#ifndef CPL_MASK_H
	#define CPL_MASK_H		#define CPL_MASK_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	New types		New types
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	typedef struct _cpl_mask_ cpl_mask;		typedef struct _cpl_mask_ cpl_mask;
	skipping to change at line 65		skipping to change at line 65
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#define CPL_BINARY_1 (cpl_binary)1		#define CPL_BINARY_1 (cpl_binary)1
	#define CPL_BINARY_0 (cpl_binary)0		#define CPL_BINARY_0 (cpl_binary)0
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* IO operations */		/* IO operations */
	cpl_mask * cpl_mask_new(int, int) CPL_ATTR_ALLOC;		cpl_mask * cpl_mask_new(cpl_size, cpl_size) CPL_ATTR_ALLOC;
	cpl_mask * cpl_mask_wrap(int, int, cpl_binary *) CPL_ATTR_ALLOC;		cpl_mask * cpl_mask_wrap(cpl_size, cpl_size, cpl_binary *) CPL_ATTR_ALLOC;
	cpl_mask * cpl_mask_duplicate(const cpl_mask *) CPL_ATTR_ALLOC;		cpl_mask * cpl_mask_duplicate(const cpl_mask *) CPL_ATTR_ALLOC;
	void cpl_mask_delete(cpl_mask *);		void cpl_mask_delete(cpl_mask *);
	void * cpl_mask_unwrap(cpl_mask *);		void * cpl_mask_unwrap(cpl_mask *);
	cpl_error_code cpl_mask_dump_window(const cpl_mask *, int, int,		cpl_error_code cpl_mask_dump_window(const cpl_mask *, cpl_size, cpl_size,
	int, int, FILE *);		cpl_size, cpl_size, FILE *);
			cpl_mask * cpl_mask_load(const char *, cpl_size, cpl_size) CPL_ATTR_ALLOC;
			cpl_mask * cpl_mask_load_window(const char *, cpl_size, cpl_size, cpl_size,
			cpl_size, cpl_size, cpl_size) CPL_ATTR_ALLO
			C;
			cpl_error_code cpl_mask_save(const cpl_mask *, const char *,
			const cpl_propertylist *, unsigned);
	/* Accessor functions */		/* Accessor functions */
	cpl_binary * cpl_mask_get_data(cpl_mask *);		cpl_binary * cpl_mask_get_data(cpl_mask *);
	const cpl_binary * cpl_mask_get_data_const(const cpl_mask *);		const cpl_binary * cpl_mask_get_data_const(const cpl_mask *);
	cpl_binary cpl_mask_get(const cpl_mask *, int, int);		cpl_binary cpl_mask_get(const cpl_mask *, cpl_size, cpl_size);
	cpl_error_code cpl_mask_set(cpl_mask *, int, int, cpl_binary);		cpl_error_code cpl_mask_set(cpl_mask *, cpl_size, cpl_size, cpl_binary);
	int cpl_mask_get_size_x(const cpl_mask *);		cpl_size cpl_mask_get_size_x(const cpl_mask *);
	int cpl_mask_get_size_y(const cpl_mask *);		cpl_size cpl_mask_get_size_y(const cpl_mask *);
	/* Basic operations */		/* Basic operations */
	cpl_boolean cpl_mask_is_empty(const cpl_mask *);		cpl_boolean cpl_mask_is_empty(const cpl_mask *);
	cpl_boolean cpl_mask_is_empty_window(const cpl_mask *, int, int, int, int);		cpl_boolean cpl_mask_is_empty_window(const cpl_mask *, cpl_size, cpl_size,
	int cpl_mask_count(const cpl_mask *);		cpl_size, cpl_size);
	int cpl_mask_count_window(const cpl_mask *, int, int, int, int);		cpl_size cpl_mask_count(const cpl_mask *);
			cpl_size cpl_mask_count_window(const cpl_mask *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	cpl_error_code cpl_mask_and(cpl_mask *, const cpl_mask *);		cpl_error_code cpl_mask_and(cpl_mask *, const cpl_mask *);
	cpl_error_code cpl_mask_or(cpl_mask *, const cpl_mask *);		cpl_error_code cpl_mask_or(cpl_mask *, const cpl_mask *);
	cpl_error_code cpl_mask_xor(cpl_mask *, const cpl_mask *);		cpl_error_code cpl_mask_xor(cpl_mask *, const cpl_mask *);
	cpl_error_code cpl_mask_not(cpl_mask *);		cpl_error_code cpl_mask_not(cpl_mask *);
	cpl_mask * cpl_mask_collapse_create(const cpl_mask *, int) CPL_ATTR_ALLOC;		cpl_mask * cpl_mask_collapse_create(const cpl_mask *, int) CPL_ATTR_ALLOC;
	cpl_mask * cpl_mask_extract(const cpl_mask *, int, int,		cpl_mask * cpl_mask_extract(const cpl_mask *, cpl_size, cpl_size,
	int, int) CPL_ATTR_ALLOC;		cpl_size, cpl_size) CPL_ATTR_ALLOC;
	cpl_error_code cpl_mask_turn(cpl_mask *, int);		cpl_error_code cpl_mask_turn(cpl_mask *, int);
	cpl_error_code cpl_mask_shift(cpl_mask *, int, int);		cpl_error_code cpl_mask_shift(cpl_mask *, cpl_size, cpl_size);
	cpl_error_code cpl_mask_copy(cpl_mask *, const cpl_mask *, int, int);		cpl_error_code cpl_mask_copy(cpl_mask *, const cpl_mask *, cpl_size, cpl_si
			ze);
	cpl_error_code cpl_mask_flip(cpl_mask *, int);		cpl_error_code cpl_mask_flip(cpl_mask *, int);
	cpl_error_code cpl_mask_move(cpl_mask *, int, const int *);		cpl_error_code cpl_mask_move(cpl_mask *, cpl_size, const cpl_size *);
	cpl_mask * cpl_mask_extract_subsample(const cpl_mask *,		cpl_mask * cpl_mask_extract_subsample(const cpl_mask *,
	int, int) CPL_ATTR_ALLOC;		cpl_size, cpl_size) CPL_ATTR_ALLOC;
	/* Morphological operations */		/* Morphological operations */
	cpl_error_code cpl_mask_filter(cpl_mask *, const cpl_mask *, const cpl_mask *,		cpl_error_code cpl_mask_filter(cpl_mask *, const cpl_mask *, const cpl_mask *,
	cpl_filter_mode, cpl_border_mode);		cpl_filter_mode, cpl_border_mode);
	cpl_error_code cpl_mask_closing(cpl_mask *,		cpl_error_code cpl_mask_closing(cpl_mask *,
	const cpl_matrix *) CPL_ATTR_DEPRECATED;		const cpl_matrix *) CPL_ATTR_DEPRECATED;
	cpl_error_code cpl_mask_opening(cpl_mask *,		cpl_error_code cpl_mask_opening(cpl_mask *,
	const cpl_matrix *) CPL_ATTR_DEPRECATED;		const cpl_matrix *) CPL_ATTR_DEPRECATED;
	cpl_error_code cpl_mask_erosion(cpl_mask *,		cpl_error_code cpl_mask_erosion(cpl_mask *,
	const cpl_matrix *) CPL_ATTR_DEPRECATED;		const cpl_matrix *) CPL_ATTR_DEPRECATED;
	cpl_error_code cpl_mask_dilation(cpl_mask *,		cpl_error_code cpl_mask_dilation(cpl_mask *,
	const cpl_matrix *) CPL_ATTR_DEPRECATED;		const cpl_matrix *) CPL_ATTR_DEPRECATED;
	/* Zones selection */		/* Zones selection */
			cpl_error_code cpl_mask_threshold_image(cpl_mask *, const cpl_image *,
			double, double, cpl_binary);
	cpl_mask * cpl_mask_threshold_image_create(const cpl_image *,		cpl_mask * cpl_mask_threshold_image_create(const cpl_image *,
	double, double) CPL_ATTR_ALLOC;		double, double) CPL_ATTR_ALLOC;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 11 change blocks.
	21 lines changed or deleted		33 lines changed or added

	cpl_math_const.h		cpl_math_const.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2010/11/11 09:23:18 $
	* $Revision: 1.9 $		* $Revision: 1.9 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_MATH_CONST_H		#ifndef CPL_MATH_CONST_H
	#define CPL_MATH_CONST_H		#define CPL_MATH_CONST_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/**		/**
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_matrix.h		cpl_matrix.h
	/* $Id: cpl_matrix.h,v 1.37 2010/11/23 11:02:06 llundin Exp $		/* $Id: cpl_matrix.h,v 1.40 2011/07/29 12:40:08 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/23 11:02:06 $		* $Date: 2011/07/29 12:40:08 $
	* $Revision: 1.37 $		* $Revision: 1.40 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_MATRIX_H		#ifndef CPL_MATRIX_H
	#define CPL_MATRIX_H		#define CPL_MATRIX_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
			#include <cpl_type.h>
	#include <cpl_error.h>		#include <cpl_error.h>
			#include <cpl_array.h>
			#include <stdio.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Typedefs		Typedefs
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	typedef struct _cpl_matrix_ cpl_matrix;		typedef struct _cpl_matrix_ cpl_matrix;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/*		/*
	* IO methods		* IO methods
	*/		*/
	cpl_matrix *cpl_matrix_new(int, int) CPL_ATTR_ALLOC;		cpl_matrix *cpl_matrix_new(cpl_size, cpl_size) CPL_ATTR_ALLOC;
	cpl_matrix *cpl_matrix_wrap(int, int, double *) CPL_ATTR_ALLOC;		cpl_matrix *cpl_matrix_wrap(cpl_size, cpl_size, double *) CPL_ATTR_ALLOC;
	void cpl_matrix_delete(cpl_matrix *);		void cpl_matrix_delete(cpl_matrix *);
	void *cpl_matrix_unwrap(cpl_matrix *);		void *cpl_matrix_unwrap(cpl_matrix *);
	void cpl_matrix_dump(const cpl_matrix *, FILE *);		void cpl_matrix_dump(const cpl_matrix *, FILE *);
	/*		/*
	* Accessors		* Accessors
	*/		*/
	int cpl_matrix_get_nrow(const cpl_matrix *);		cpl_size cpl_matrix_get_nrow(const cpl_matrix *);
	int cpl_matrix_get_ncol(const cpl_matrix *);		cpl_size cpl_matrix_get_ncol(const cpl_matrix *);
	double *cpl_matrix_get_data(cpl_matrix *);		double *cpl_matrix_get_data(cpl_matrix *);
	const double *cpl_matrix_get_data_const(const cpl_matrix *);		const double *cpl_matrix_get_data_const(const cpl_matrix *);
	double cpl_matrix_get(const cpl_matrix *, int, int);		double cpl_matrix_get(const cpl_matrix *, cpl_size, cpl_size);
	cpl_error_code cpl_matrix_set(cpl_matrix *, int, int, double);		cpl_error_code cpl_matrix_set(cpl_matrix *, cpl_size, cpl_size, double);
	/*		/*
	* Copying methods		* Copying methods
	*/		*/
	cpl_matrix *cpl_matrix_duplicate(const cpl_matrix *) CPL_ATTR_ALLOC;		cpl_matrix *cpl_matrix_duplicate(const cpl_matrix *) CPL_ATTR_ALLOC;
	cpl_matrix *cpl_matrix_extract(const cpl_matrix *,		cpl_matrix *cpl_matrix_extract(const cpl_matrix *,
	int, int, int, int, int, int) CPL_ATTR_ALLOC		cpl_size, cpl_size, cpl_size, cpl_size,
	;		cpl_size, cpl_size) CPL_ATTR_ALLOC;
	cpl_matrix *cpl_matrix_extract_row(const cpl_matrix *, int) CPL_ATTR_ALLOC;		cpl_matrix *cpl_matrix_extract_row(const cpl_matrix *, cpl_size) CPL_ATTR_A
	cpl_matrix *cpl_matrix_extract_column(const cpl_matrix *, int) CPL_ATTR_ALL		LLOC;
	OC;		cpl_matrix *cpl_matrix_extract_column(const cpl_matrix *, cpl_size)
	cpl_matrix *cpl_matrix_extract_diagonal(const cpl_matrix *, int) CPL_ATTR_A		CPL_ATTR_ALLOC;
	LLOC;		cpl_matrix *cpl_matrix_extract_diagonal(const cpl_matrix *, cpl_size)
			CPL_ATTR_ALLOC;
	/*		/*
	* Writing methods		* Writing methods
	*/		*/
	cpl_error_code cpl_matrix_copy(cpl_matrix *, const cpl_matrix *, int, int);		cpl_error_code cpl_matrix_copy(cpl_matrix *, const cpl_matrix *,
			cpl_size, cpl_size);
	cpl_error_code cpl_matrix_fill(cpl_matrix *, double);		cpl_error_code cpl_matrix_fill(cpl_matrix *, double);
	cpl_error_code cpl_matrix_fill_row(cpl_matrix *, double, int);		cpl_error_code cpl_matrix_fill_row(cpl_matrix *, double, cpl_size);
	cpl_error_code cpl_matrix_fill_column(cpl_matrix *, double, int);		cpl_error_code cpl_matrix_fill_column(cpl_matrix *, double, cpl_size);
	cpl_error_code cpl_matrix_fill_diagonal(cpl_matrix *, double, int);		cpl_error_code cpl_matrix_fill_diagonal(cpl_matrix *, double, cpl_size);
	cpl_error_code cpl_matrix_fill_window(cpl_matrix *, double,		cpl_error_code cpl_matrix_fill_window(cpl_matrix *, double,
	int, int, int, int);		cpl_size, cpl_size, cpl_size, cpl_siz e);
	/*		/*
	* Test methods		* Test methods
	*/		*/
	int cpl_matrix_is_zero(const cpl_matrix *, double);		int cpl_matrix_is_zero(const cpl_matrix *, double);
	int cpl_matrix_is_diagonal(const cpl_matrix *, double);		int cpl_matrix_is_diagonal(const cpl_matrix *, double);
	int cpl_matrix_is_identity(const cpl_matrix *, double);		int cpl_matrix_is_identity(const cpl_matrix *, double);
	/*		/*
	skipping to change at line 116		skipping to change at line 122
	*/		*/
	cpl_error_code cpl_matrix_sort_rows(cpl_matrix *, int);		cpl_error_code cpl_matrix_sort_rows(cpl_matrix *, int);
	cpl_error_code cpl_matrix_sort_columns(cpl_matrix *, int);		cpl_error_code cpl_matrix_sort_columns(cpl_matrix *, int);
	/*		/*
	* Handling methods		* Handling methods
	*/		*/
	cpl_error_code cpl_matrix_threshold_small(cpl_matrix *, double);		cpl_error_code cpl_matrix_threshold_small(cpl_matrix *, double);
	cpl_error_code cpl_matrix_swap_rows(cpl_matrix *, int, int);		cpl_error_code cpl_matrix_swap_rows(cpl_matrix *, cpl_size, cpl_size);
	cpl_error_code cpl_matrix_swap_columns(cpl_matrix *, int, int);		cpl_error_code cpl_matrix_swap_columns(cpl_matrix *, cpl_size, cpl_size);
	cpl_error_code cpl_matrix_swap_rowcolumn(cpl_matrix *, int);		cpl_error_code cpl_matrix_swap_rowcolumn(cpl_matrix *, cpl_size);
	cpl_error_code cpl_matrix_flip_rows(cpl_matrix *);		cpl_error_code cpl_matrix_flip_rows(cpl_matrix *);
	cpl_error_code cpl_matrix_flip_columns(cpl_matrix *);		cpl_error_code cpl_matrix_flip_columns(cpl_matrix *);
	cpl_error_code cpl_matrix_erase_rows(cpl_matrix *, int, int);		cpl_error_code cpl_matrix_erase_rows(cpl_matrix *, cpl_size, cpl_size);
	cpl_error_code cpl_matrix_erase_columns(cpl_matrix *, int, int);		cpl_error_code cpl_matrix_erase_columns(cpl_matrix *, cpl_size, cpl_size);
	cpl_error_code cpl_matrix_set_size(cpl_matrix *, int, int);		cpl_error_code cpl_matrix_set_size(cpl_matrix *, cpl_size, cpl_size);
	cpl_error_code cpl_matrix_resize(cpl_matrix *, int, int, int, int);		cpl_error_code cpl_matrix_resize(cpl_matrix *, cpl_size, cpl_size,
			cpl_size, cpl_size);
	cpl_error_code cpl_matrix_append(cpl_matrix *, const cpl_matrix *, int);		cpl_error_code cpl_matrix_append(cpl_matrix *, const cpl_matrix *, int);
	/*		/*
	* Basic operations		* Basic operations
	*/		*/
	cpl_error_code cpl_matrix_shift(cpl_matrix *, int, int);		cpl_error_code cpl_matrix_shift(cpl_matrix *, cpl_size, cpl_size);
	cpl_error_code cpl_matrix_add(cpl_matrix *, const cpl_matrix *);		cpl_error_code cpl_matrix_add(cpl_matrix *, const cpl_matrix *);
	cpl_error_code cpl_matrix_subtract(cpl_matrix *, const cpl_matrix *);		cpl_error_code cpl_matrix_subtract(cpl_matrix *, const cpl_matrix *);
	cpl_error_code cpl_matrix_multiply(cpl_matrix *, const cpl_matrix *);		cpl_error_code cpl_matrix_multiply(cpl_matrix *, const cpl_matrix *);
	cpl_error_code cpl_matrix_divide(cpl_matrix *, const cpl_matrix *);		cpl_error_code cpl_matrix_divide(cpl_matrix *, const cpl_matrix *);
	cpl_error_code cpl_matrix_add_scalar(cpl_matrix *, double);		cpl_error_code cpl_matrix_add_scalar(cpl_matrix *, double);
	cpl_error_code cpl_matrix_subtract_scalar(cpl_matrix *, double);		cpl_error_code cpl_matrix_subtract_scalar(cpl_matrix *, double);
	cpl_error_code cpl_matrix_multiply_scalar(cpl_matrix *, double);		cpl_error_code cpl_matrix_multiply_scalar(cpl_matrix *, double);
	cpl_error_code cpl_matrix_divide_scalar(cpl_matrix *, double);		cpl_error_code cpl_matrix_divide_scalar(cpl_matrix *, double);
	cpl_error_code cpl_matrix_logarithm(cpl_matrix *, double);		cpl_error_code cpl_matrix_logarithm(cpl_matrix *, double);
	skipping to change at line 159		skipping to change at line 166
	* More complex operations		* More complex operations
	*/		*/
	double cpl_matrix_get_determinant(const cpl_matrix *);		double cpl_matrix_get_determinant(const cpl_matrix *);
	cpl_matrix *cpl_matrix_solve(const cpl_matrix *,		cpl_matrix *cpl_matrix_solve(const cpl_matrix *,
	const cpl_matrix *) CPL_ATTR_ALLOC;		const cpl_matrix *) CPL_ATTR_ALLOC;
	cpl_matrix *cpl_matrix_solve_normal(const cpl_matrix *,		cpl_matrix *cpl_matrix_solve_normal(const cpl_matrix *,
	const cpl_matrix *) CPL_ATTR_ALLOC;		const cpl_matrix *) CPL_ATTR_ALLOC;
	cpl_matrix *cpl_matrix_invert_create(const cpl_matrix *) CPL_ATTR_ALLOC;		cpl_matrix *cpl_matrix_invert_create(const cpl_matrix *) CPL_ATTR_ALLOC;
	cpl_error_code cpl_matrix_decomp_lu(cpl_matrix *, int *, int *);		cpl_error_code cpl_matrix_decomp_lu(cpl_matrix *, cpl_array *, int *);
	cpl_error_code cpl_matrix_solve_lu(const cpl_matrix *, cpl_matrix *,		cpl_error_code cpl_matrix_solve_lu(const cpl_matrix *, cpl_matrix *,
	const int *);		const cpl_array *);
	cpl_error_code cpl_matrix_decomp_chol(cpl_matrix *);		cpl_error_code cpl_matrix_decomp_chol(cpl_matrix *);
	cpl_error_code cpl_matrix_solve_chol(const cpl_matrix *, cpl_matrix *);		cpl_error_code cpl_matrix_solve_chol(const cpl_matrix *, cpl_matrix *);
	/*		/*
	* Stats methods		* Stats methods
	*/		*/
	double cpl_matrix_get_mean(const cpl_matrix *);		double cpl_matrix_get_mean(const cpl_matrix *);
	double cpl_matrix_get_median(const cpl_matrix *);		double cpl_matrix_get_median(const cpl_matrix *);
	double cpl_matrix_get_stdev(const cpl_matrix *);		double cpl_matrix_get_stdev(const cpl_matrix *);
	double cpl_matrix_get_min(const cpl_matrix *);		double cpl_matrix_get_min(const cpl_matrix *);
	double cpl_matrix_get_max(const cpl_matrix *);		double cpl_matrix_get_max(const cpl_matrix *);
	cpl_error_code cpl_matrix_get_minpos(const cpl_matrix *, int *, int *);		cpl_error_code cpl_matrix_get_minpos(const cpl_matrix *, cpl_size *,
	cpl_error_code cpl_matrix_get_maxpos(const cpl_matrix *, int *, int *);		cpl_size *);
			cpl_error_code cpl_matrix_get_maxpos(const cpl_matrix *, cpl_size *,
			cpl_size *);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
	/* end of cpl_matrix.h */		/* end of cpl_matrix.h */
End of changes. 18 change blocks.
	36 lines changed or deleted		43 lines changed or added

	cpl_memory.h		cpl_memory.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2010/11/11 09:23:18 $
	* $Revision: 1.22 $		* $Revision: 1.22 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_MEMORY_H		#ifndef CPL_MEMORY_H
	#define CPL_MEMORY_H		#define CPL_MEMORY_H
	#include <sys/types.h>		#include <sys/types.h>
	#include <stdarg.h>		#include <stdarg.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_msg.h		cpl_msg.h
	/* $Id: cpl_msg.h,v 1.15 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_msg.h,v 1.17 2012/03/06 10:36:18 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2012/03/06 10:36:18 $
	* $Revision: 1.15 $		* $Revision: 1.17 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_MSG_H		#ifndef CPL_MSG_H
	#define CPL_MSG_H		#define CPL_MSG_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
			#include <cpl_type.h>
	#include <cpl_error.h>		#include <cpl_error.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/**		/**
	* @ingroup cpl_messaging		* @ingroup cpl_messaging
	* @brief		* @brief
	* Messaging verbosity		* Messaging verbosity
	*		*
	* Messages may be printed with any of the functions @c cpl_msg_debug(),		* Messages may be printed with any of the functions @c cpl_msg_debug(),
	skipping to change at line 54		skipping to change at line 55
	* message. The messaging system can then be set to display just messages		* message. The messaging system can then be set to display just messages
	* having a high enough severity. The highest verbosity level of the		* having a high enough severity. The highest verbosity level of the
	* messaging system is @c CPL_MSG_DEBUG, that would ensure that @em all		* messaging system is @c CPL_MSG_DEBUG, that would ensure that @em all
	* the messages would be printed. The verbosity would progressively		* the messages would be printed. The verbosity would progressively
	* decrease through the levels @c CPL_MSG_INFO, @c CPL_MSG_WARNING, and		* decrease through the levels @c CPL_MSG_INFO, @c CPL_MSG_WARNING, and
	* @c CPL_MSG_ERROR, where only messages served by the @c cpl_msg_error()		* @c CPL_MSG_ERROR, where only messages served by the @c cpl_msg_error()
	* function would be printed. The lowest verbosity level, @c CPL_MSG_OFF,		* function would be printed. The lowest verbosity level, @c CPL_MSG_OFF,
	* would inhibit the printing of any message to the terminal.		* would inhibit the printing of any message to the terminal.
	*/		*/
	#define CPL_MAX_MSG_LENGTH (1024)		#ifndef CPL_MAX_MSG_LENGTH
	#define CPL_MAX_FUNCTION_NAME (50)		#define CPL_MAX_MSG_LENGTH 1024
	#define CPL_MAX_DOMAIN_NAME (40)		#endif
	#define CPL_MAX_LOGFILE_NAME (52)		#ifndef CPL_MAX_FUNCTION_NAME
			#define CPL_MAX_FUNCTION_NAME 50
			#endif
			#ifndef CPL_MAX_DOMAIN_NAME
			#define CPL_MAX_DOMAIN_NAME 40
			#endif
			#ifndef CPL_MAX_LOGFILE_NAME
			#define CPL_MAX_LOGFILE_NAME 72
			#endif
	enum _cpl_msg_severity_ {		enum _cpl_msg_severity_ {
	CPL_MSG_DEBUG = 0,		CPL_MSG_DEBUG = 0,
	CPL_MSG_INFO,		CPL_MSG_INFO,
	CPL_MSG_WARNING,		CPL_MSG_WARNING,
	CPL_MSG_ERROR,		CPL_MSG_ERROR,
	CPL_MSG_OFF		CPL_MSG_OFF
	};		};
	typedef enum _cpl_msg_severity_ cpl_msg_severity;		typedef enum _cpl_msg_severity_ cpl_msg_severity;
End of changes. 4 change blocks.
	8 lines changed or deleted		17 lines changed or added

	cpl_parameter.h		cpl_parameter.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 10:31:52 $		* $Date: 2010/11/11 10:31:52 $
	* $Revision: 1.15 $		* $Revision: 1.15 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PARAMETER_H		#ifndef CPL_PARAMETER_H
	#define CPL_PARAMETER_H		#define CPL_PARAMETER_H
	#include <stdio.h>		#include <stdio.h>
	#include <cpl_error.h>		#include <cpl_error.h>
	#include <cpl_type.h>		#include <cpl_type.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_parameterlist.h		cpl_parameterlist.h
	/* $Id: cpl_parameterlist.h,v 1.9 2010/11/11 10:31:52 llundin Exp $		/* $Id: cpl_parameterlist.h,v 1.10 2012/01/11 13:38:29 rpalsa Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2005 European Southern Observatory		* Copyright (C) 2001-2005 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2010/11/11 10:31:52 $		* $Date: 2012/01/11 13:38:29 $
	* $Revision: 1.9 $		* $Revision: 1.10 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PARAMETERLIST_H		#ifndef CPL_PARAMETERLIST_H
	#define CPL_PARAMETERLIST_H		#define CPL_PARAMETERLIST_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
			#include <cpl_type.h>
	#include <cpl_parameter.h>		#include <cpl_parameter.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/**		/**
	* @ingroup cpl_parameterlist		* @ingroup cpl_parameterlist
	*		*
	* @brief		* @brief
	* The opaque parameter list data type.		* The opaque parameter list data type.
	*/		*/
	skipping to change at line 56		skipping to change at line 57
	* Create, copy and destroy operations		* Create, copy and destroy operations
	*/		*/
	cpl_parameterlist *cpl_parameterlist_new(void) CPL_ATTR_ALLOC;		cpl_parameterlist *cpl_parameterlist_new(void) CPL_ATTR_ALLOC;
	void cpl_parameterlist_delete(cpl_parameterlist *self);		void cpl_parameterlist_delete(cpl_parameterlist *self);
	/*		/*
	* Non modifying operations		* Non modifying operations
	*/		*/
	int cpl_parameterlist_get_size(const cpl_parameterlist *self);		cpl_size cpl_parameterlist_get_size(const cpl_parameterlist *self);
	/*		/*
	* Element insertion.		* Element insertion.
	*/		*/
	cpl_error_code cpl_parameterlist_append(cpl_parameterlist *self,		cpl_error_code cpl_parameterlist_append(cpl_parameterlist *self,
	cpl_parameter *parameter);		cpl_parameter *parameter);
	/*		/*
	* Element access		* Element access
End of changes. 4 change blocks.
	6 lines changed or deleted		7 lines changed or added

	cpl_photom.h		cpl_photom.h
	/* $Id: cpl_photom.h,v 1.3 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_photom.h,v 1.4 2011/07/21 09:45:24 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/07/21 09:45:24 $
	* $Revision: 1.3 $		* $Revision: 1.4 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PHOTOM_H		#ifndef CPL_PHOTOM_H
	#define CPL_PHOTOM_H		#define CPL_PHOTOM_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include "cpl_error.h"
	#include "cpl_vector.h"		#include "cpl_vector.h"
	/* This include will change with cpl_phys_const.h */		/* This include will change with cpl_phys_const.h */
	#include "cpl_phys_const.h"		#include "cpl_phys_const.h"
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	cpl_error_code cpl_photom_fill_blackbody(cpl_vector *, cpl_unit,		cpl_error_code cpl_photom_fill_blackbody(cpl_vector *, cpl_unit,
	const cpl_vector *, cpl_unit,		const cpl_vector *, cpl_unit, doub
	double);		le);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 5 change blocks.
	8 lines changed or deleted		6 lines changed or added

	cpl_phys_const.h		cpl_phys_const.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2010/11/11 09:23:18 $
	* $Revision: 1.9 $		* $Revision: 1.9 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PHYS_CONST_H		#ifndef CPL_PHYS_CONST_H
	#define CPL_PHYS_CONST_H		#define CPL_PHYS_CONST_H
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Defines		Defines
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_plot.h		cpl_plot.h
	/* $Id: cpl_plot.h,v 1.9 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_plot.h,v 1.11 2011/07/21 08:35:14 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/07/21 08:35:14 $
	* $Revision: 1.9 $		* $Revision: 1.11 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PLOT_H		#ifndef CPL_PLOT_H
	#define CPL_PLOT_H		#define CPL_PLOT_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_error.h"		#include "cpl_error.h"
	skipping to change at line 52		skipping to change at line 52
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	cpl_error_code cpl_plot_vector(const char *, const char *, const char *,		cpl_error_code cpl_plot_vector(const char *, const char *, const char *,
	const cpl_vector *);		const cpl_vector *);
	cpl_error_code cpl_plot_vectors(const char *, const char *, const char *,		cpl_error_code cpl_plot_vectors(const char *, const char *, const char *,
	const cpl_vector **, int);		const cpl_vector **, cpl_size);
	cpl_error_code cpl_plot_bivector(const char *, const char *, const char *,		cpl_error_code cpl_plot_bivector(const char *, const char *, const char *,
	const cpl_bivector *);		const cpl_bivector *);
	cpl_error_code cpl_plot_bivectors(const char *, const char **, const char * ,		cpl_error_code cpl_plot_bivectors(const char *, const char **, const char * ,
	const cpl_bivector **, int);		const cpl_bivector **, cpl_size);
	cpl_error_code cpl_plot_mask(const char *, const char *, const char *,		cpl_error_code cpl_plot_mask(const char *, const char *, const char *,
	const cpl_mask *);		const cpl_mask *);
	cpl_error_code cpl_plot_image(const char *, const char *, const char *,		cpl_error_code cpl_plot_image(const char *, const char *, const char *,
	const cpl_image *);		const cpl_image *);
	cpl_error_code cpl_plot_image_row(const char *, const char *, const char *,		cpl_error_code cpl_plot_image_row(const char *, const char *, const char *,
	const cpl_image *, int, int, int);		const cpl_image *, cpl_size, cpl_size,
			cpl_size);
	cpl_error_code cpl_plot_image_col(const char *, const char *, const char *,		cpl_error_code cpl_plot_image_col(const char *, const char *, const char *,
	const cpl_image *, int, int, int);		const cpl_image *, cpl_size, cpl_size,
			cpl_size);
	cpl_error_code cpl_plot_column(const char *, const char *, const char *,		cpl_error_code cpl_plot_column(const char *, const char *, const char *,
	const cpl_table *, const char *, const char *);		const cpl_table *, const char *, const char *);
	cpl_error_code cpl_plot_columns(const char *, const char *, const char *,		cpl_error_code cpl_plot_columns(const char *, const char *, const char *,
	const cpl_table *, const char **, int);		const cpl_table *, const char **, cpl_size) ;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 7 change blocks.
	9 lines changed or deleted		11 lines changed or added

	cpl_plugin.h		cpl_plugin.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2011/01/11 10:33:18 $		* $Date: 2011/01/11 10:33:18 $
	* $Revision: 1.14 $		* $Revision: 1.14 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PLUGIN_H		#ifndef CPL_PLUGIN_H
	#define CPL_PLUGIN_H		#define CPL_PLUGIN_H
	#include <stdio.h>		#include <stdio.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include <cpl_error.h>		#include <cpl_error.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_plugininfo.h		cpl_plugininfo.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2010/11/11 09:23:18 $
	* $Revision: 1.5 $		* $Revision: 1.5 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PLUGININFO_H		#ifndef CPL_PLUGININFO_H
	#define CPL_PLUGININFO_H		#define CPL_PLUGININFO_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include <cpl_pluginlist.h>		#include <cpl_pluginlist.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_pluginlist.h		cpl_pluginlist.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 10:31:52 $		* $Date: 2010/11/11 10:31:52 $
	* $Revision: 1.8 $		* $Revision: 1.8 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PLUGINLIST_H		#ifndef CPL_PLUGINLIST_H
	#define CPL_PLUGINLIST_H		#define CPL_PLUGINLIST_H
	#include <stdio.h>		#include <stdio.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include <cpl_error.h>		#include <cpl_error.h>
	#include <cpl_plugin.h>		#include <cpl_plugin.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_polynomial.h		cpl_polynomial.h
	/* $Id: cpl_polynomial.h,v 1.37 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_polynomial.h,v 1.40 2011/12/14 12:29:06 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2011/12/14 12:29:06 $
	* $Revision: 1.37 $		* $Revision: 1.40 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_POLYNOMIAL_H		#ifndef CPL_POLYNOMIAL_H
	#define CPL_POLYNOMIAL_H		#define CPL_POLYNOMIAL_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>		#include <stdio.h>
	skipping to change at line 54		skipping to change at line 54
	New types		New types
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	typedef struct _cpl_polynomial_ cpl_polynomial;		typedef struct _cpl_polynomial_ cpl_polynomial;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* cpl_polynomial handling */		/* cpl_polynomial handling */
	cpl_polynomial * cpl_polynomial_new(int) CPL_ATTR_ALLOC;		cpl_polynomial * cpl_polynomial_new(cpl_size) CPL_ATTR_ALLOC;
	void cpl_polynomial_delete(cpl_polynomial *);		void cpl_polynomial_delete(cpl_polynomial *);
	cpl_error_code cpl_polynomial_dump(const cpl_polynomial *, FILE *);		cpl_error_code cpl_polynomial_dump(const cpl_polynomial *, FILE *);
	cpl_polynomial * cpl_polynomial_duplicate(const cpl_polynomial *)		cpl_polynomial * cpl_polynomial_duplicate(const cpl_polynomial *)
	CPL_ATTR_ALLOC;		CPL_ATTR_ALLOC;
	cpl_error_code cpl_polynomial_copy(cpl_polynomial *, const cpl_polynomial * );		cpl_error_code cpl_polynomial_copy(cpl_polynomial *, const cpl_polynomial * );
	/* Accessor functions */		/* Accessor functions */
	double cpl_polynomial_get_coeff(const cpl_polynomial *, const int *);		double cpl_polynomial_get_coeff(const cpl_polynomial *, const cpl_size *);
	cpl_error_code cpl_polynomial_set_coeff(cpl_polynomial *, const int *, doub		cpl_error_code cpl_polynomial_set_coeff(cpl_polynomial *, const cpl_size *,
	le);		double);
	/* Basic operations */		/* Basic operations */
	int cpl_polynomial_compare(const cpl_polynomial *, const cpl_polynomial *,		int cpl_polynomial_compare(const cpl_polynomial *, const cpl_polynomial *,
	double tol);		double tol);
	int cpl_polynomial_get_dimension(const cpl_polynomial *);		cpl_size cpl_polynomial_get_dimension(const cpl_polynomial *);
	int cpl_polynomial_get_degree(const cpl_polynomial *);		cpl_size cpl_polynomial_get_degree(const cpl_polynomial *);
	double cpl_polynomial_eval(const cpl_polynomial *, const cpl_vector *);		double cpl_polynomial_eval(const cpl_polynomial *, const cpl_vector *);
	cpl_polynomial * cpl_polynomial_extract(const cpl_polynomial *, int,		cpl_polynomial * cpl_polynomial_extract(const cpl_polynomial *, cpl_size,
	const cpl_polynomial *) CPL_ATTR_AL LOC;		const cpl_polynomial *) CPL_ATTR_AL LOC;
	cpl_error_code cpl_polynomial_derivative(cpl_polynomial *, int);		cpl_error_code cpl_polynomial_add(cpl_polynomial *,
			const cpl_polynomial *,
			const cpl_polynomial *);
			cpl_error_code cpl_polynomial_subtract(cpl_polynomial *,
			const cpl_polynomial *,
			const cpl_polynomial *);
			cpl_error_code cpl_polynomial_multiply_scalar(cpl_polynomial *,
			const cpl_polynomial *, doubl
			e);
			cpl_error_code cpl_polynomial_derivative(cpl_polynomial *, cpl_size);
	cpl_error_code cpl_polynomial_fit(cpl_polynomial *,		cpl_error_code cpl_polynomial_fit(cpl_polynomial *,
	const cpl_matrix *,		const cpl_matrix *,
	const cpl_boolean *,		const cpl_boolean *,
	const cpl_vector *,		const cpl_vector *,
	const cpl_vector *,		const cpl_vector *,
	cpl_boolean ,		cpl_boolean ,
	const int *,		const cpl_size *,
	const int *);		const cpl_size *);
	cpl_error_code cpl_vector_fill_polynomial_fit_residual(cpl_vector *,		cpl_error_code cpl_vector_fill_polynomial_fit_residual(cpl_vector *,
	const cpl_vector *,		const cpl_vector *,
	const cpl_vector *,		const cpl_vector *,
	const cpl_polynomial *,		const cpl_polynomial *,
	const cpl_matrix *,		const cpl_matrix *,
	double *);		double *);
	/* Basic operations on 1d-polynomials */		/* Basic operations on 1d-polynomials */
	double cpl_polynomial_eval_1d(const cpl_polynomial *, double, double *);		double cpl_polynomial_eval_1d(const cpl_polynomial *, double, double *);
	double cpl_polynomial_eval_1d_diff(const cpl_polynomial *, double, double,		double cpl_polynomial_eval_1d_diff(const cpl_polynomial *, double, double,
	double *);		double *);
	cpl_error_code cpl_vector_fill_polynomial(cpl_vector *, const cpl_polynomia l *,		cpl_error_code cpl_vector_fill_polynomial(cpl_vector *, const cpl_polynomia l *,
	double, double);		double, double);
	cpl_error_code cpl_polynomial_solve_1d(const cpl_polynomial *, double, doub le *,		cpl_error_code cpl_polynomial_solve_1d(const cpl_polynomial *, double, doub le *,
	int);		cpl_size);
	cpl_error_code cpl_polynomial_shift_1d(cpl_polynomial *, int, double);		cpl_error_code cpl_polynomial_shift_1d(cpl_polynomial *, cpl_size, double);
	cpl_polynomial * cpl_polynomial_fit_1d_create(const cpl_vector *,		cpl_polynomial * cpl_polynomial_fit_1d_create(const cpl_vector *,
	const cpl_vector *, int,		const cpl_vector *, cpl_size,
	double *) CPL_ATTR_DEPRECATED ;		double *) CPL_ATTR_DEPRECATED ;
	/* Basic operations on 2d-polynomials */		/* Basic operations on 2d-polynomials */
	cpl_polynomial * cpl_polynomial_fit_2d_create(cpl_bivector *, cpl_vector *,		cpl_polynomial * cpl_polynomial_fit_2d_create(cpl_bivector *, cpl_vector *,
	int,		cpl_size, double *)
	double *) CPL_ATTR_DEPRECATED		CPL_ATTR_DEPRECATED;
	;
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 12 change blocks.
	21 lines changed or deleted		32 lines changed or added

	cpl_ppm.h		cpl_ppm.h
	/* $Id: cpl_ppm.h,v 1.9 2008/07/21 11:13:25 llundin Exp $		/* $Id: cpl_ppm.h,v 1.10 2011/08/02 11:59:57 rpalsa Exp $
	*		*
	* This file is part of the VIMOS Pipeline		* This file is part of the VIMOS Pipeline
	* Copyright (C) 2002-2006 European Southern Observatory		* Copyright (C) 2002-2006 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US A		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US A
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2008/07/21 11:13:25 $		* $Date: 2011/08/02 11:59:57 $
	* $Revision: 1.9 $		* $Revision: 1.10 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PPM_H		#ifndef CPL_PPM_H
	#define CPL_PPM_H		#define CPL_PPM_H
	#include <cpl_bivector.h>		#include <cpl_bivector.h>
	#include <cpl_array.h>		#include <cpl_array.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	cpl_bivector *cpl_ppm_match_positions(const cpl_vector *, const cpl_vector *,		cpl_bivector *cpl_ppm_match_positions(const cpl_vector *, const cpl_vector *,
	double, double, double,		double, double, double,
	cpl_array **, cpl_array **);		cpl_array **, cpl_array **);
	cpl_array *cpl_ppm_match_points(const cpl_matrix *, int, double,		cpl_array *cpl_ppm_match_points(const cpl_matrix *, cpl_size, double,
	const cpl_matrix *, int, double,		const cpl_matrix *, cpl_size, double,
	double, double,		double, double,
	cpl_matrix **, cpl_matrix **,		cpl_matrix **, cpl_matrix **,
	double *, double *);		double *, double *);
	CPL_END_DECLS		CPL_END_DECLS
	#endif /* CPL_PPM_H */		#endif /* CPL_PPM_H */
End of changes. 3 change blocks.
	7 lines changed or deleted		7 lines changed or added

	cpl_property.h		cpl_property.h
	/* $Id: cpl_property.h,v 1.13 2010/12/22 11:32:12 llundin Exp $		/* $Id: cpl_property.h,v 1.14 2011/03/18 14:29:59 rpalsa Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2005 European Southern Observatory		* Copyright (C) 2001-2005 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2010/12/22 11:32:12 $		* $Date: 2011/03/18 14:29:59 $
	* $Revision: 1.13 $		* $Revision: 1.14 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PROPERTY_H		#ifndef CPL_PROPERTY_H
	#define CPL_PROPERTY_H		#define CPL_PROPERTY_H
	#include <cpl_error.h>		#include <cpl_error.h>
	#include <cpl_type.h>		#include <cpl_type.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	skipping to change at line 52		skipping to change at line 52
	typedef struct _cpl_property_ cpl_property;		typedef struct _cpl_property_ cpl_property;
	/*		/*
	* Create, copy and destroy operations.		* Create, copy and destroy operations.
	*/		*/
	cpl_property *cpl_property_new(const char *name,		cpl_property *cpl_property_new(const char *name,
	cpl_type type) CPL_ATTR_ALLOC;		cpl_type type) CPL_ATTR_ALLOC;
	cpl_property *cpl_property_new_array(const char *name, cpl_type type,		cpl_property *cpl_property_new_array(const char *name, cpl_type type,
	int size) CPL_ATTR_ALLOC;		cpl_size size) CPL_ATTR_ALLOC;
	cpl_property *cpl_property_duplicate(const cpl_property *other) CPL_ATTR_AL LOC;		cpl_property *cpl_property_duplicate(const cpl_property *other) CPL_ATTR_AL LOC;
	void cpl_property_delete(cpl_property *self);		void cpl_property_delete(cpl_property *self);
	/*		/*
	* Non modifying operations		* Non modifying operations
	*/		*/
	long cpl_property_get_size(const cpl_property *self);		cpl_size cpl_property_get_size(const cpl_property *self);
	cpl_type cpl_property_get_type(const cpl_property *self);		cpl_type cpl_property_get_type(const cpl_property *self);
	/*		/*
	* Assignment operations		* Assignment operations
	*/		*/
	cpl_error_code cpl_property_set_name(cpl_property *self, const char *name);		cpl_error_code cpl_property_set_name(cpl_property *self, const char *name);
	cpl_error_code cpl_property_set_comment(cpl_property *self,		cpl_error_code cpl_property_set_comment(cpl_property *self,
	const char *comment);		const char *comment);
	cpl_error_code cpl_property_set_char(cpl_property *self, char value);		cpl_error_code cpl_property_set_char(cpl_property *self, char value);
	cpl_error_code cpl_property_set_bool(cpl_property *self, int value);		cpl_error_code cpl_property_set_bool(cpl_property *self, int value);
	cpl_error_code cpl_property_set_int(cpl_property *self, int value);		cpl_error_code cpl_property_set_int(cpl_property *self, int value);
	cpl_error_code cpl_property_set_long(cpl_property *self, long value);		cpl_error_code cpl_property_set_long(cpl_property *self, long value);
			cpl_error_code cpl_property_set_long_long(cpl_property *self, long long val ue);
	cpl_error_code cpl_property_set_float(cpl_property *self, float value);		cpl_error_code cpl_property_set_float(cpl_property *self, float value);
	cpl_error_code cpl_property_set_double(cpl_property *self, double value);		cpl_error_code cpl_property_set_double(cpl_property *self, double value);
	cpl_error_code cpl_property_set_string(cpl_property *self, const char *valu e);		cpl_error_code cpl_property_set_string(cpl_property *self, const char *valu e);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_property_set_double_complex(cpl_property *self,		cpl_error_code cpl_property_set_double_complex(cpl_property *self,
	double complex value);		double complex value);
	cpl_error_code cpl_property_set_float_complex(cpl_property *self,		cpl_error_code cpl_property_set_float_complex(cpl_property *self,
	float complex value);		float complex value);
	#endif		#endif
	/*		/*
	* Element access		* Element access
	*/		*/
	const char *cpl_property_get_name(const cpl_property *self);		const char *cpl_property_get_name(const cpl_property *self);
	const char *cpl_property_get_comment(const cpl_property *self);		const char *cpl_property_get_comment(const cpl_property *self);
	char cpl_property_get_char(const cpl_property *self);		char cpl_property_get_char(const cpl_property *self);
	int cpl_property_get_bool(const cpl_property *self);		int cpl_property_get_bool(const cpl_property *self);
	int cpl_property_get_int(const cpl_property *self);		int cpl_property_get_int(const cpl_property *self);
	long cpl_property_get_long(const cpl_property *self);		long cpl_property_get_long(const cpl_property *self);
			long long cpl_property_get_long_long(const cpl_property *self);
	float cpl_property_get_float(const cpl_property *self);		float cpl_property_get_float(const cpl_property *self);
	double cpl_property_get_double(const cpl_property *self);		double cpl_property_get_double(const cpl_property *self);
	const char *cpl_property_get_string(const cpl_property *self);		const char *cpl_property_get_string(const cpl_property *self);
	#ifdef _Complex_I		#ifdef _Complex_I
	float complex cpl_property_get_float_complex(const cpl_property *self);		float complex cpl_property_get_float_complex(const cpl_property *self);
	double complex cpl_property_get_double_complex(const cpl_property *self);		double complex cpl_property_get_double_complex(const cpl_property *self);
	#endif		#endif
	CPL_END_DECLS		CPL_END_DECLS
	#endif /* CPL_PROPERTY_H */		#endif /* CPL_PROPERTY_H */
End of changes. 6 change blocks.
	7 lines changed or deleted		9 lines changed or added

	cpl_propertylist.h		cpl_propertylist.h
	/* $Id: cpl_propertylist.h,v 1.24 2010/12/22 11:32:13 llundin Exp $		/* $Id: cpl_propertylist.h,v 1.25 2011/03/18 14:29:59 rpalsa Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2005 European Southern Observatory		* Copyright (C) 2001-2005 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2010/12/22 11:32:13 $		* $Date: 2011/03/18 14:29:59 $
	* $Revision: 1.24 $		* $Revision: 1.25 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_PROPERTYLIST_H		#ifndef CPL_PROPERTYLIST_H
	#define CPL_PROPERTYLIST_H		#define CPL_PROPERTYLIST_H
	#include <stdio.h>		#include <stdio.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include <cpl_type.h>		#include <cpl_type.h>
	#include <cpl_property.h>		#include <cpl_property.h>
	skipping to change at line 75		skipping to change at line 75
	cpl_propertylist *		cpl_propertylist *
	cpl_propertylist_duplicate(const cpl_propertylist *other) CPL_ATTR_ALLOC;		cpl_propertylist_duplicate(const cpl_propertylist *other) CPL_ATTR_ALLOC;
	void		void
	cpl_propertylist_delete(cpl_propertylist *self);		cpl_propertylist_delete(cpl_propertylist *self);
	/*		/*
	* Non modifying operations		* Non modifying operations
	*/		*/
	long		cpl_size
	cpl_propertylist_get_size(const cpl_propertylist *self);		cpl_propertylist_get_size(const cpl_propertylist *self);
	int		int
	cpl_propertylist_is_empty(const cpl_propertylist *self);		cpl_propertylist_is_empty(const cpl_propertylist *self);
	cpl_type		cpl_type
	cpl_propertylist_get_type(const cpl_propertylist *self, const char *name);		cpl_propertylist_get_type(const cpl_propertylist *self, const char *name);
	int		int
	cpl_propertylist_has(const cpl_propertylist *self, const char *name);		cpl_propertylist_has(const cpl_propertylist *self, const char *name);
	skipping to change at line 107		skipping to change at line 107
	cpl_error_code		cpl_error_code
	cpl_propertylist_set_bool(cpl_propertylist *self, const char *name ,		cpl_propertylist_set_bool(cpl_propertylist *self, const char *name ,
	int value);		int value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_set_int(cpl_propertylist *self, const char *name,		cpl_propertylist_set_int(cpl_propertylist *self, const char *name,
	int value);		int value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_set_long(cpl_propertylist *self, const char *name,		cpl_propertylist_set_long(cpl_propertylist *self, const char *name,
	long value);		long value);
	cpl_error_code		cpl_error_code
			cpl_propertylist_set_long_long(cpl_propertylist *self, const char *name,
			long long value);
			cpl_error_code
	cpl_propertylist_set_float(cpl_propertylist *self, const char *name,		cpl_propertylist_set_float(cpl_propertylist *self, const char *name,
	float value);		float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_set_double(cpl_propertylist *self, const char *name,		cpl_propertylist_set_double(cpl_propertylist *self, const char *name,
	double value);		double value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_set_string(cpl_propertylist *self, const char *name,		cpl_propertylist_set_string(cpl_propertylist *self, const char *name,
	const char *value);		const char *value);
	#ifdef _Complex_I		#ifdef _Complex_I
	skipping to change at line 156		skipping to change at line 159
	int		int
	cpl_propertylist_get_bool(const cpl_propertylist *self, const char *name);		cpl_propertylist_get_bool(const cpl_propertylist *self, const char *name);
	int		int
	cpl_propertylist_get_int(const cpl_propertylist *self, const char *name);		cpl_propertylist_get_int(const cpl_propertylist *self, const char *name);
	long		long
	cpl_propertylist_get_long(const cpl_propertylist *self, const char *name);		cpl_propertylist_get_long(const cpl_propertylist *self, const char *name);
			long long
			cpl_propertylist_get_long_long(const cpl_propertylist *self, const char *na
			me);
	float		float
	cpl_propertylist_get_float(const cpl_propertylist *self, const char *name);		cpl_propertylist_get_float(const cpl_propertylist *self, const char *name);
	double		double
	cpl_propertylist_get_double(const cpl_propertylist *self, const char *name) ;		cpl_propertylist_get_double(const cpl_propertylist *self, const char *name) ;
	const char *		const char *
	cpl_propertylist_get_string(const cpl_propertylist *self, const char *name) ;		cpl_propertylist_get_string(const cpl_propertylist *self, const char *name) ;
	#ifdef _Complex_I		#ifdef _Complex_I
	skipping to change at line 196		skipping to change at line 202
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_int(cpl_propertylist *self, const char *here,		cpl_propertylist_insert_int(cpl_propertylist *self, const char *here,
	const char *name, int value);		const char *name, int value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_long(cpl_propertylist *self, const char *here,		cpl_propertylist_insert_long(cpl_propertylist *self, const char *here,
	const char *name, long value);		const char *name, long value);
	cpl_error_code		cpl_error_code
			cpl_propertylist_insert_long_long(cpl_propertylist *self, const char *here,
			const char *name, long long value);
			cpl_error_code
	cpl_propertylist_insert_float(cpl_propertylist *self, const char *here,		cpl_propertylist_insert_float(cpl_propertylist *self, const char *here,
	const char *name, float value);		const char *name, float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_double(cpl_propertylist *self, const char *here,		cpl_propertylist_insert_double(cpl_propertylist *self, const char *here,
	const char *name, double value);		const char *name, double value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_string(cpl_propertylist *self, const char *here,		cpl_propertylist_insert_string(cpl_propertylist *self, const char *here,
	const char *name, const char *value);		const char *name, const char *value);
	skipping to change at line 234		skipping to change at line 244
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_after_int(cpl_propertylist *self, const char *after ,		cpl_propertylist_insert_after_int(cpl_propertylist *self, const char *after ,
	const char *name, int value);		const char *name, int value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_after_long(cpl_propertylist *self, const char *afte r,		cpl_propertylist_insert_after_long(cpl_propertylist *self, const char *afte r,
	const char *name, long value);		const char *name, long value);
	cpl_error_code		cpl_error_code
			cpl_propertylist_insert_after_long_long(cpl_propertylist *self,
			const char *after, const char *name
			,
			long long value);
			cpl_error_code
	cpl_propertylist_insert_after_float(cpl_propertylist *self, const char *aft er,		cpl_propertylist_insert_after_float(cpl_propertylist *self, const char *aft er,
	const char *name, float value);		const char *name, float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_after_double(cpl_propertylist *self, const char *af ter,		cpl_propertylist_insert_after_double(cpl_propertylist *self, const char *af ter,
	const char *name, double value);		const char *name, double value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_after_string(cpl_propertylist *self, const char *af ter,		cpl_propertylist_insert_after_string(cpl_propertylist *self, const char *af ter,
	const char *name, const char *value);		const char *name, const char *value);
	skipping to change at line 274		skipping to change at line 289
	int value);		int value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_prepend_int(cpl_propertylist *self, const char *name,		cpl_propertylist_prepend_int(cpl_propertylist *self, const char *name,
	int value);		int value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_prepend_long(cpl_propertylist *self, const char *name,		cpl_propertylist_prepend_long(cpl_propertylist *self, const char *name,
	long value);		long value);
	cpl_error_code		cpl_error_code
			cpl_propertylist_prepend_long_long(cpl_propertylist *self, const char *name
			,
			long long value);
			cpl_error_code
	cpl_propertylist_prepend_float(cpl_propertylist *self, const char *name,		cpl_propertylist_prepend_float(cpl_propertylist *self, const char *name,
	float value);		float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_prepend_double(cpl_propertylist *self, const char *name,		cpl_propertylist_prepend_double(cpl_propertylist *self, const char *name,
	double value);		double value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_prepend_string(cpl_propertylist *self, const char *name,		cpl_propertylist_prepend_string(cpl_propertylist *self, const char *name,
	const char *value);		const char *value);
	skipping to change at line 313		skipping to change at line 332
	cpl_error_code		cpl_error_code
	cpl_propertylist_append_int(cpl_propertylist *self, const char *name,		cpl_propertylist_append_int(cpl_propertylist *self, const char *name,
	int value);		int value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_append_long(cpl_propertylist *self, const char *name,		cpl_propertylist_append_long(cpl_propertylist *self, const char *name,
	long value);		long value);
	cpl_error_code		cpl_error_code
			cpl_propertylist_append_long_long(cpl_propertylist *self, const char *name,
			long long value);
			cpl_error_code
	cpl_propertylist_append_float(cpl_propertylist *self, const char *name,		cpl_propertylist_append_float(cpl_propertylist *self, const char *name,
	float value);		float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_append_double(cpl_propertylist *self, const char *name,		cpl_propertylist_append_double(cpl_propertylist *self, const char *name,
	double value);		double value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_append_string(cpl_propertylist *self, const char *name,		cpl_propertylist_append_string(cpl_propertylist *self, const char *name,
	const char *value);		const char *value);
	skipping to change at line 365		skipping to change at line 388
	cpl_error_code		cpl_error_code
	cpl_propertylist_update_bool(cpl_propertylist *self, const char *name,		cpl_propertylist_update_bool(cpl_propertylist *self, const char *name,
	int value);		int value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_update_int(cpl_propertylist *self, const char *name,		cpl_propertylist_update_int(cpl_propertylist *self, const char *name,
	int value);		int value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_update_long(cpl_propertylist *self, const char *name,		cpl_propertylist_update_long(cpl_propertylist *self, const char *name,
	long value);		long value);
	cpl_error_code		cpl_error_code
			cpl_propertylist_update_long_long(cpl_propertylist *self, const char *name,
			long long value);
			cpl_error_code
	cpl_propertylist_update_float(cpl_propertylist *self, const char *name,		cpl_propertylist_update_float(cpl_propertylist *self, const char *name,
	float value);		float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_update_double(cpl_propertylist *self, const char *name,		cpl_propertylist_update_double(cpl_propertylist *self, const char *name,
	double value);		double value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_update_string(cpl_propertylist *self, const char *name,		cpl_propertylist_update_string(cpl_propertylist *self, const char *name,
	const char *value);		const char *value);
	#ifdef _Complex_I		#ifdef _Complex_I
	skipping to change at line 426		skipping to change at line 452
	cpl_error_code		cpl_error_code
	cpl_propertylist_sort(cpl_propertylist *self,		cpl_propertylist_sort(cpl_propertylist *self,
	cpl_propertylist_compare_func compare);		cpl_propertylist_compare_func compare);
	/*		/*
	* Loading, saving and conversion operations.		* Loading, saving and conversion operations.
	*/		*/
	cpl_propertylist *		cpl_propertylist *
	cpl_propertylist_load(const char *name, int position) CPL_ATTR_ALLOC;		cpl_propertylist_load(const char *name, cpl_size position) CPL_ATTR_ALLOC;
	cpl_propertylist *		cpl_propertylist *
	cpl_propertylist_load_regexp(const char *name, int position,		cpl_propertylist_load_regexp(const char *name, cpl_size position,
	const char *regexp, int invert) CPL_ATTR_ALLOC ;		const char *regexp, int invert) CPL_ATTR_ALLOC ;
	cpl_error_code		cpl_error_code
	cpl_propertylist_save(const cpl_propertylist * self, const char * filename,		cpl_propertylist_save(const cpl_propertylist *self, const char *filename,
	unsigned mode) ;		unsigned int mode);
	void cpl_propertylist_dump(const cpl_propertylist *self, FILE *stream);		void cpl_propertylist_dump(const cpl_propertylist *self, FILE *stream);
	CPL_END_DECLS		CPL_END_DECLS
	#endif /* CPL_PROPERTYLIST_H */		#endif /* CPL_PROPERTYLIST_H */
End of changes. 13 change blocks.
	10 lines changed or deleted		39 lines changed or added

	cpl_recipe.h		cpl_recipe.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2010/11/11 09:23:18 $
	* $Revision: 1.7 $		* $Revision: 1.7 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_RECIPE_H		#ifndef CPL_RECIPE_H
	#define CPL_RECIPE_H		#define CPL_RECIPE_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#include <cpl_plugin.h>		#include <cpl_plugin.h>
	#include <cpl_frameset.h>		#include <cpl_frameset.h>
	#include <cpl_parameterlist.h>		#include <cpl_parameterlist.h>
	#include <cpl_recipeconfig.h>		#include <cpl_recipeconfig.h>
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_recipeconfig.h		cpl_recipeconfig.h
	/* $Id: cpl_recipeconfig.h,v 1.4 2010/11/11 10:31:52 llundin Exp $		/* $Id: cpl_recipeconfig.h,v 1.5 2012/01/11 13:38:29 rpalsa Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2006 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2010/11/11 10:31:52 $		* $Date: 2012/01/11 13:38:29 $
	* $Revision: 1.4 $		* $Revision: 1.5 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_RECIPECONFIG_H		#ifndef CPL_RECIPECONFIG_H
	#define CPL_RECIPECONFIG_H		#define CPL_RECIPECONFIG_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
			#include <cpl_type.h>
	#include <cpl_framedata.h>		#include <cpl_framedata.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/**		/**
	* @ingroup cpl_cplrecipeconfig		* @ingroup cpl_cplrecipeconfig
	*		*
	* @brief		* @brief
	* The opaque recipe configuration object type.		* The opaque recipe configuration object type.
	*/		*/
	skipping to change at line 63		skipping to change at line 64
	/*		/*
	* Non modifying operations		* Non modifying operations
	*/		*/
	char** cpl_recipeconfig_get_tags(const cpl_recipeconfig* self);		char** cpl_recipeconfig_get_tags(const cpl_recipeconfig* self);
	char** cpl_recipeconfig_get_inputs(const cpl_recipeconfig* self,		char** cpl_recipeconfig_get_inputs(const cpl_recipeconfig* self,
	const char* tag);		const char* tag);
	char** cpl_recipeconfig_get_outputs(const cpl_recipeconfig* self,		char** cpl_recipeconfig_get_outputs(const cpl_recipeconfig* self,
	const char* tag);		const char* tag);
	int cpl_recipeconfig_get_min_count(const cpl_recipeconfig* self,		cpl_size cpl_recipeconfig_get_min_count(const cpl_recipeconfig* self,
	const char* tag, const char* input);		const char* tag, const char* input)
	int cpl_recipeconfig_get_max_count(const cpl_recipeconfig* self,		;
	const char* tag, const char* input);		cpl_size cpl_recipeconfig_get_max_count(const cpl_recipeconfig* self,
			const char* tag, const char* input)
			;
	int cpl_recipeconfig_is_required(const cpl_recipeconfig* self,		int cpl_recipeconfig_is_required(const cpl_recipeconfig* self,
	const char* tag, const char* input);		const char* tag, const char* input);
	/*		/*
	* Assignment operations		* Assignment operations
	*/		*/
	int cpl_recipeconfig_set_tag(cpl_recipeconfig* self, const char* tag,		int cpl_recipeconfig_set_tag(cpl_recipeconfig* self, const char* tag,
	int min_count, int max_count);		cpl_size min_count, cpl_size max_count);
	int cpl_recipeconfig_set_input(cpl_recipeconfig* self, const char* tag,		int cpl_recipeconfig_set_input(cpl_recipeconfig* self, const char* tag,
	const char* input, int min_count,		const char* input, cpl_size min_count,
	int max_count);		cpl_size max_count);
	int cpl_recipeconfig_set_output(cpl_recipeconfig* self, const char* tag,		int cpl_recipeconfig_set_output(cpl_recipeconfig* self, const char* tag,
	const char* output);		const char* output);
	int cpl_recipeconfig_set_tags(cpl_recipeconfig* self,		int cpl_recipeconfig_set_tags(cpl_recipeconfig* self,
	const cpl_framedata* data);		const cpl_framedata* data);
	int cpl_recipeconfig_set_inputs(cpl_recipeconfig* self, const char* tag,		int cpl_recipeconfig_set_inputs(cpl_recipeconfig* self, const char* tag,
	const cpl_framedata* data);		const cpl_framedata* data);
	int cpl_recipeconfig_set_outputs(cpl_recipeconfig* self, const char* tag,		int cpl_recipeconfig_set_outputs(cpl_recipeconfig* self, const char* tag,
	const char** outputs);		const char** outputs);
End of changes. 6 change blocks.
	12 lines changed or deleted		15 lines changed or added

	cpl_recipedefine.h		cpl_recipedefine.h
	/* $Id: cpl_recipedefine.h,v 1.13 2011/01/03 15:39:21 llundin Exp $		/* $Id: cpl_recipedefine.h,v 1.14 2011/08/19 19:57:07 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2006 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2011/01/03 15:39:21 $		* $Date: 2011/08/19 19:57:07 $
	* $Revision: 1.13 $		* $Revision: 1.14 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_RECIPEDEFINE_H		#ifndef CPL_RECIPEDEFINE_H
	#define CPL_RECIPEDEFINE_H		#define CPL_RECIPEDEFINE_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_recipe.h>		#include <cpl_recipe.h>
	skipping to change at line 108		skipping to change at line 108
	@endcode		@endcode
	The macro also declares the recipe-specific function that fills the		The macro also declares the recipe-specific function that fills the
	recipe parameterlist with the supported parameters as		recipe parameterlist with the supported parameters as
	@code		@code
	static cpl_error_code <recipe>_fill_parameterlist(cpl_parameterlist *s elf);		static cpl_error_code <recipe>_fill_parameterlist(cpl_parameterlist *s elf);
	@endcode		@endcode
	A recipe that invokes cpl_recipedefine() must define this function.		A recipe that invokes cpl_recipe_define() must define this function.
	The macro cpl_recipedefine() may be used by defining a macro, e.g. in		The macro cpl_recipe_define() may be used by defining a macro, e.g. in
	my_recipe.h:		my_recipe.h:
	@code		@code
	#define MY_RECIPE_DEFINE(NAME, SYNOPSIS, DESCRIPTION) \		#define MY_RECIPE_DEFINE(NAME, SYNOPSIS, DESCRIPTION) \
	cpl_recipe_define(NAME, MY_BINARY_VERSION, \		cpl_recipe_define(NAME, MY_BINARY_VERSION, \
	"Firstname Lastname", "2006, 2008", SYNOPSIS, DESCRIPTION)		"Firstname Lastname", "2006, 2008", SYNOPSIS, DESCRIPTION)
	@endcode		@endcode
End of changes. 4 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cpl_stats.h		cpl_stats.h
	/* $Id: cpl_stats.h,v 1.13 2010/11/11 15:28:46 llundin Exp $		/* $Id: cpl_stats.h,v 1.15 2011/07/20 09:40:05 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 15:28:46 $		* $Date: 2011/07/20 09:40:05 $
	* $Revision: 1.13 $		* $Revision: 1.15 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_STATS_H		#ifndef CPL_STATS_H
	#define CPL_STATS_H		#define CPL_STATS_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
			#ifdef HAVE_CONFIG_H
			#include <config.h>
			#endif
	#include "cpl_image.h"		#include "cpl_image.h"
	#include <stdio.h>		#include <stdio.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Defines		New types
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
			/**
			* @ingroup cpl_stats
			*
			* @brief The values of the CPL stats mode.
			* The values can be combined with bitwise or.
			*/
			enum _cpl_stats_mode_ {
	/* No mode has the value 1, which makes the (mis)use of logical or detectab le */		/* No mode has the value 1, which makes the (mis)use of logical or detectab le */
	#define CPL_STATS_MIN ((unsigned) 1 << 1)
	#define CPL_STATS_MAX ((unsigned) 1 << 2)
	#define CPL_STATS_MEAN ((unsigned) 1 << 3)
	#define CPL_STATS_MEDIAN ((unsigned) 1 << 4)
	#define CPL_STATS_STDEV ((unsigned) 1 << 5)
	#define CPL_STATS_FLUX ((unsigned) 1 << 6)
	#define CPL_STATS_ABSFLUX ((unsigned) 1 << 7)
	#define CPL_STATS_SQFLUX ((unsigned) 1 << 8)
	#define CPL_STATS_MINPOS ((unsigned) 1 << 9)
	#define CPL_STATS_MAXPOS ((unsigned) 1 << 10)
	#define CPL_STATS_CENTROID ((unsigned) 1 << 11)
	#define CPL_STATS_MEDIAN_DEV ((unsigned) 1 << 12)
	#define CPL_STATS_ALL ((unsigned)(1 << 13)-2)
	/*-------------------------------------------------------------------------		/**
	----		* The minimum
	New types		* @hideinitializer
	--------------------------------------------------------------------------		*/
	---*/		CPL_STATS_MIN = 1 << 1,
			/**
			* The maximum
			* @hideinitializer
			*/
			CPL_STATS_MAX = 1 << 2,
			/**
			* The mean
			* @hideinitializer
			*/
			CPL_STATS_MEAN = 1 << 3,
			/**
			* The median
			* @hideinitializer
			*/
			CPL_STATS_MEDIAN = 1 << 4,
			/**
			* The standard deviation
			* @hideinitializer
			*/
			CPL_STATS_STDEV = 1 << 5,
			/**
			* The flux
			* @hideinitializer
			*/
			CPL_STATS_FLUX = 1 << 6,
			/**
			* The absolute flux
			* @hideinitializer
			*/
			CPL_STATS_ABSFLUX = 1 << 7,
			/**
			* The square flux
			* @hideinitializer
			*/
			CPL_STATS_SQFLUX = 1 << 8,
			/**
			* The position of the minimum
			* @hideinitializer
			*/
			CPL_STATS_MINPOS = 1 << 9,
			/**
			* The position of the maximum
			* @hideinitializer
			*/
			CPL_STATS_MAXPOS = 1 << 10,
			/**
			* The centroid position
			* @hideinitializer
			*/
			CPL_STATS_CENTROID = 1 << 11,
			/**
			* The median deviation
			* @hideinitializer
			*/
			CPL_STATS_MEDIAN_DEV = 1 << 12,
			/**
			* All of the above
			* @hideinitializer
			*/
			CPL_STATS_ALL = (1 << 13)-2
			};
			/**
			* @ingroup cpl_stats
			*
			* @brief
			* The CPL stats mode. It is a bit field.
			*/
			typedef enum _cpl_stats_mode_ cpl_stats_mode;
			/**
			* @ingroup cpl_stats
			* @brief The opaque CPL stats data type.
			*/
	typedef struct _cpl_stats_ cpl_stats;		typedef struct _cpl_stats_ cpl_stats;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Accessor functions */		/* Accessor functions */
	double cpl_stats_get_min(const cpl_stats *);		double cpl_stats_get_min(const cpl_stats *);
	double cpl_stats_get_max(const cpl_stats *);		double cpl_stats_get_max(const cpl_stats *);
	double cpl_stats_get_mean(const cpl_stats *);		double cpl_stats_get_mean(const cpl_stats *);
	double cpl_stats_get_median(const cpl_stats *);		double cpl_stats_get_median(const cpl_stats *);
	double cpl_stats_get_median_dev(const cpl_stats *);		double cpl_stats_get_median_dev(const cpl_stats *);
	double cpl_stats_get_stdev(const cpl_stats *);		double cpl_stats_get_stdev(const cpl_stats *);
	double cpl_stats_get_flux(const cpl_stats *);		double cpl_stats_get_flux(const cpl_stats *);
	double cpl_stats_get_absflux(const cpl_stats *);		double cpl_stats_get_absflux(const cpl_stats *);
	double cpl_stats_get_sqflux(const cpl_stats *);		double cpl_stats_get_sqflux(const cpl_stats *);
	double cpl_stats_get_centroid_x(const cpl_stats *);		double cpl_stats_get_centroid_x(const cpl_stats *);
	double cpl_stats_get_centroid_y(const cpl_stats *);		double cpl_stats_get_centroid_y(const cpl_stats *);
	int cpl_stats_get_min_x(const cpl_stats *);		cpl_size cpl_stats_get_min_x(const cpl_stats *);
	int cpl_stats_get_min_y(const cpl_stats *);		cpl_size cpl_stats_get_min_y(const cpl_stats *);
	int cpl_stats_get_max_x(const cpl_stats *);		cpl_size cpl_stats_get_max_x(const cpl_stats *);
	int cpl_stats_get_max_y(const cpl_stats *);		cpl_size cpl_stats_get_max_y(const cpl_stats *);
	int cpl_stats_get_npix(const cpl_stats *);		cpl_size cpl_stats_get_npix(const cpl_stats *);
	void cpl_stats_delete(cpl_stats *);		void cpl_stats_delete(cpl_stats *);
	/* Statistics computations */		/* Statistics computations */
	cpl_stats * cpl_stats_new_from_image(const cpl_image *,		cpl_stats * cpl_stats_new_from_image(const cpl_image *,
	unsigned) CPL_ATTR_ALLOC;		cpl_stats_mode) CPL_ATTR_ALLOC;
	cpl_stats * cpl_stats_new_from_image_window(const cpl_image *, unsigned, in		cpl_stats * cpl_stats_new_from_image_window(const cpl_image *, cpl_stats_mo
	t,		de,
	int, int, int) CPL_ATTR_ALLOC;		cpl_size, cpl_size, cpl_size,
	cpl_error_code cpl_stats_dump(const cpl_stats *, unsigned, FILE *);		cpl_size) CPL_ATTR_ALLOC;
			cpl_error_code cpl_stats_dump(const cpl_stats *, cpl_stats_mode, FILE *);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 10 change blocks.
	33 lines changed or deleted		108 lines changed or added

	cpl_table.h		cpl_table.h
	/* $Id: cpl_table.h,v 1.65 2011/01/12 09:28:46 cizzo Exp $		/* $Id: cpl_table.h,v 1.67 2011/03/01 13:15:30 cizzo Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: cizzo $		* $Author: cizzo $
	* $Date: 2011/01/12 09:28:46 $		* $Date: 2011/03/01 13:15:30 $
	* $Revision: 1.65 $		* $Revision: 1.67 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_TABLE_H		#ifndef CPL_TABLE_H
	#define CPL_TABLE_H		#define CPL_TABLE_H
	#include <stdio.h>		#include <stdio.h>
	#include "cpl_io.h"		#include "cpl_io.h"
	#include "cpl_type.h"		#include "cpl_type.h"
	#include "cpl_propertylist.h"		#include "cpl_propertylist.h"
	skipping to change at line 60		skipping to change at line 60
	CPL_GREATER_THAN,		CPL_GREATER_THAN,
	CPL_NOT_GREATER_THAN,		CPL_NOT_GREATER_THAN,
	CPL_LESS_THAN,		CPL_LESS_THAN,
	CPL_NOT_LESS_THAN		CPL_NOT_LESS_THAN
	} cpl_table_select_operator;		} cpl_table_select_operator;
	/*		/*
	* Constructors and destructors:		* Constructors and destructors:
	*/		*/
	cpl_table *cpl_table_new(int);		cpl_table *cpl_table_new(cpl_size);
	cpl_error_code cpl_table_new_column(cpl_table *, const char *, cpl_type);		cpl_error_code cpl_table_new_column(cpl_table *, const char *, cpl_type);
	cpl_error_code cpl_table_new_column_array(cpl_table *, const char *,		cpl_error_code cpl_table_new_column_array(cpl_table *, const char *,
	cpl_type, int);		cpl_type, cpl_size);
	cpl_error_code cpl_table_set_column_savetype(cpl_table *,		cpl_error_code cpl_table_set_column_savetype(cpl_table *,
	const char *name, cpl_type);		const char *name, cpl_type);
	cpl_error_code cpl_table_wrap_int(cpl_table *, int *, const char *);		cpl_error_code cpl_table_wrap_int(cpl_table *, int *, const char *);
	cpl_error_code cpl_table_wrap_float(cpl_table *, float *, const char *);		cpl_error_code cpl_table_wrap_float(cpl_table *, float *, const char *);
	cpl_error_code cpl_table_wrap_double(cpl_table *, double *, const char *);		cpl_error_code cpl_table_wrap_double(cpl_table *, double *, const char *);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_table_wrap_float_complex(cpl_table *,		cpl_error_code cpl_table_wrap_float_complex(cpl_table *,
	float complex *, const char *);		float complex *, const char *);
	skipping to change at line 90		skipping to change at line 90
	void *cpl_table_unwrap(cpl_table *, const char *);		void *cpl_table_unwrap(cpl_table *, const char *);
	cpl_error_code cpl_table_copy_structure(cpl_table *, const cpl_table *);		cpl_error_code cpl_table_copy_structure(cpl_table *, const cpl_table *);
	void cpl_table_delete(cpl_table *);		void cpl_table_delete(cpl_table *);
	/*		/*
	* Methods:		* Methods:
	*/		*/
	int cpl_table_get_nrow(const cpl_table *);		cpl_size cpl_table_get_nrow(const cpl_table *);
	int cpl_table_get_ncol(const cpl_table *);		cpl_size cpl_table_get_ncol(const cpl_table *);
	cpl_type cpl_table_get_column_type(const cpl_table *, const char *name);		cpl_type cpl_table_get_column_type(const cpl_table *, const char *name);
	cpl_error_code cpl_table_set_column_unit(cpl_table *, const char *name,		cpl_error_code cpl_table_set_column_unit(cpl_table *, const char *name,
	const char *unit);		const char *unit);
	const char *cpl_table_get_column_unit(const cpl_table *, const char *name);		const char *cpl_table_get_column_unit(const cpl_table *, const char *name);
	cpl_error_code cpl_table_set_column_format(cpl_table *, const char *name,		cpl_error_code cpl_table_set_column_format(cpl_table *, const char *name,
	const char *format);		const char *format);
	const char *cpl_table_get_column_format(const cpl_table *, const char *name );		const char *cpl_table_get_column_format(const cpl_table *, const char *name );
	cpl_error_code cpl_table_set_column_depth(cpl_table *, const char *, int);		cpl_error_code cpl_table_set_column_depth(cpl_table *, const char *, cpl_si
	int cpl_table_get_column_depth(const cpl_table *, const char *);		ze);
	int cpl_table_get_column_dimensions(const cpl_table *, const char *);		cpl_size cpl_table_get_column_depth(const cpl_table *, const char *);
			cpl_size cpl_table_get_column_dimensions(const cpl_table *, const char *);
	cpl_error_code cpl_table_set_column_dimensions(cpl_table *, const char *,		cpl_error_code cpl_table_set_column_dimensions(cpl_table *, const char *,
	const cpl_array *);		const cpl_array *);
	int cpl_table_get_column_dimension(const cpl_table *, const char *, int);		cpl_size cpl_table_get_column_dimension(const cpl_table *,
			const char *, cpl_size);
	int *cpl_table_get_data_int(cpl_table *, const char *name);		int *cpl_table_get_data_int(cpl_table *, const char *name);
	const int *cpl_table_get_data_int_const(const cpl_table *,		const int *cpl_table_get_data_int_const(const cpl_table *,
	const char *name);		const char *name);
	float *cpl_table_get_data_float(cpl_table *, const char *name);		float *cpl_table_get_data_float(cpl_table *, const char *name);
	const float *cpl_table_get_data_float_const(const cpl_table *,		const float *cpl_table_get_data_float_const(const cpl_table *,
	const char *name);		const char *name);
	double *cpl_table_get_data_double(cpl_table *, const char *name);		double *cpl_table_get_data_double(cpl_table *, const char *name);
	const double *cpl_table_get_data_double_const(const cpl_table *,		const double *cpl_table_get_data_double_const(const cpl_table *,
	const char *name);		const char *name);
	skipping to change at line 134		skipping to change at line 135
	const double complex *cpl_table_get_data_double_complex_const(const cpl_tab le *,		const double complex *cpl_table_get_data_double_complex_const(const cpl_tab le *,
	const char *) ;		const char *) ;
	#endif		#endif
	char **cpl_table_get_data_string(cpl_table *, const char *name);		char **cpl_table_get_data_string(cpl_table *, const char *name);
	const char **cpl_table_get_data_string_const(const cpl_table *,		const char **cpl_table_get_data_string_const(const cpl_table *,
	const char *name);		const char *name);
	cpl_array **cpl_table_get_data_array(cpl_table *, const char *);		cpl_array **cpl_table_get_data_array(cpl_table *, const char *);
	const cpl_array **cpl_table_get_data_array_const(const cpl_table *,		const cpl_array **cpl_table_get_data_array_const(const cpl_table *,
	const char *);		const char *);
	double cpl_table_get(const cpl_table *, const char *, int, int *null);		double cpl_table_get(const cpl_table *, const char *, cpl_size, int *null);
	int cpl_table_get_int(const cpl_table *, const char *, int, int *null);		int cpl_table_get_int(const cpl_table *, const char *, cpl_size, int *null)
	float cpl_table_get_float(const cpl_table *, const char *, int, int *null);		;
	double cpl_table_get_double(const cpl_table *, const char *, int, int *null		float cpl_table_get_float(const cpl_table *, const char *, cpl_size, int *n
	);		ull);
			double cpl_table_get_double(const cpl_table *, const char *, cpl_size,
			int *null);
	#ifdef _Complex_I		#ifdef _Complex_I
	double complex cpl_table_get_complex(const cpl_table *,		double complex cpl_table_get_complex(const cpl_table *,
	const char *, int, int *);		const char *, cpl_size, int *);
	float complex cpl_table_get_float_complex(const cpl_table *,		float complex cpl_table_get_float_complex(const cpl_table *,
	const char *, int, int *null);		const char *, cpl_size, int *null );
	double complex cpl_table_get_double_complex(const cpl_table *,		double complex cpl_table_get_double_complex(const cpl_table *,
	const char *, int, int *null);		const char *, cpl_size, int *null );
	#endif		#endif
	const char *cpl_table_get_string(const cpl_table *, const char *, int);		const char *cpl_table_get_string(const cpl_table *, const char *, cpl_size)
	const cpl_array *cpl_table_get_array(const cpl_table *, const char *, int);		;
			const cpl_array *cpl_table_get_array(const cpl_table *, const char *, cpl_s
			ize);
	cpl_error_code cpl_table_set(cpl_table *, const char *, int, double);		cpl_error_code cpl_table_set(cpl_table *, const char *, cpl_size, double);
	cpl_error_code cpl_table_set_int(cpl_table *, const char *, int, int);		cpl_error_code cpl_table_set_int(cpl_table *, const char *, cpl_size, int);
	cpl_error_code cpl_table_set_float(cpl_table *, const char *, int, float);		cpl_error_code cpl_table_set_float(cpl_table *, const char *, cpl_size, flo
	cpl_error_code cpl_table_set_double(cpl_table *, const char *, int, double)		at);
	;		cpl_error_code cpl_table_set_double(cpl_table *, const char *, cpl_size,
			double)
			;
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_table_set_complex(cpl_table *,		cpl_error_code cpl_table_set_complex(cpl_table *,
	const char *, int, double complex);		const char *, cpl_size, double complex );
	cpl_error_code cpl_table_set_float_complex(cpl_table *,		cpl_error_code cpl_table_set_float_complex(cpl_table *,
	const char *, int, float complex );		const char *, cpl_size, float complex) ;
	cpl_error_code cpl_table_set_double_complex(cpl_table *,		cpl_error_code cpl_table_set_double_complex(cpl_table *,
	const char *, int, double compl ex);		const char *, cpl_size, double complex );
	#endif		#endif
	cpl_error_code cpl_table_set_string(cpl_table *, const char *, int,		cpl_error_code cpl_table_set_string(cpl_table *, const char *, cpl_size,
	const char *);		const char *);
	cpl_error_code cpl_table_set_array(cpl_table *, const char *, int,		cpl_error_code cpl_table_set_array(cpl_table *, const char *, cpl_size,
	const cpl_array *);		const cpl_array *);
	cpl_error_code cpl_table_fill_column_window(cpl_table *, const char *,		cpl_error_code cpl_table_fill_column_window(cpl_table *, const char *,
	int, int, double);		cpl_size, cpl_size, double);
	cpl_error_code cpl_table_fill_column_window_int(cpl_table *, const char *,		cpl_error_code cpl_table_fill_column_window_int(cpl_table *, const char *,
	int, int, int);		cpl_size, cpl_size, int);
	cpl_error_code cpl_table_fill_column_window_float(cpl_table *, const char * ,		cpl_error_code cpl_table_fill_column_window_float(cpl_table *, const char * ,
	int, int, float);		cpl_size, cpl_size, float);
	cpl_error_code cpl_table_fill_column_window_double(cpl_table *, const char *,		cpl_error_code cpl_table_fill_column_window_double(cpl_table *, const char *,
	int, int, double);		cpl_size, cpl_size, double);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_table_fill_column_window_complex(cpl_table *, const char *,		cpl_error_code cpl_table_fill_column_window_complex(cpl_table *, const char *,
	int, int, double complex);		cpl_size, cpl_size, double complex);
	cpl_error_code cpl_table_fill_column_window_float_complex(cpl_table *,		cpl_error_code cpl_table_fill_column_window_float_complex(cpl_table *,
	const char *, int, int, float complex);		const char *, cpl_size, cpl_size, float complex);
	cpl_error_code cpl_table_fill_column_window_double_complex(cpl_table *,		cpl_error_code cpl_table_fill_column_window_double_complex(cpl_table *,
	const char *, int, int, double complex);		const char *, cpl_size, cpl_size, double complex);
	#endif		#endif
	cpl_error_code cpl_table_fill_column_window_string(cpl_table *, const char *,		cpl_error_code cpl_table_fill_column_window_string(cpl_table *, const char *,
	int, int, const char *);		cpl_size, cpl_size, const char *);
	cpl_error_code cpl_table_fill_column_window_array(cpl_table *, const char * ,		cpl_error_code cpl_table_fill_column_window_array(cpl_table *, const char * ,
	int, int, const cpl_array *);		cpl_size, cpl_size, const cpl_array * );
	cpl_error_code cpl_table_copy_data_int(cpl_table *, const char *, const int *);		cpl_error_code cpl_table_copy_data_int(cpl_table *, const char *, const int *);
	cpl_error_code cpl_table_copy_data_float(cpl_table *, const char *,		cpl_error_code cpl_table_copy_data_float(cpl_table *, const char *,
	const float *);		const float *);
	cpl_error_code cpl_table_copy_data_double(cpl_table *, const char *,		cpl_error_code cpl_table_copy_data_double(cpl_table *, const char *,
	const double *);		const double *);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_table_copy_data_float_complex(cpl_table *, const char *,		cpl_error_code cpl_table_copy_data_float_complex(cpl_table *, const char *,
	const float complex *);		const float complex *);
	cpl_error_code cpl_table_copy_data_double_complex(cpl_table *, const char * ,		cpl_error_code cpl_table_copy_data_double_complex(cpl_table *, const char * ,
	const double complex *);		const double complex *);
	#endif		#endif
	cpl_error_code cpl_table_copy_data_string(cpl_table *, const char *,		cpl_error_code cpl_table_copy_data_string(cpl_table *, const char *,
	const char **);		const char **);
	cpl_error_code cpl_table_shift_column(cpl_table *, const char *, int);		cpl_error_code cpl_table_shift_column(cpl_table *, const char *, cpl_size);
	cpl_error_code cpl_table_set_invalid(cpl_table *, const char *, int);		cpl_error_code cpl_table_set_invalid(cpl_table *, const char *, cpl_size);
	cpl_error_code cpl_table_set_column_invalid(cpl_table *,		cpl_error_code cpl_table_set_column_invalid(cpl_table *,
	const char *, int, int);		const char *, cpl_size, cpl_siz e);
	int cpl_table_is_valid(const cpl_table *, const char *, int);		int cpl_table_is_valid(const cpl_table *, const char *, cpl_size);
	int cpl_table_count_invalid(const cpl_table *, const char *);		cpl_size cpl_table_count_invalid(const cpl_table *, const char *);
	int cpl_table_has_invalid(const cpl_table *table, const char *name);		int cpl_table_has_invalid(const cpl_table *table, const char *name);
	int cpl_table_has_valid(const cpl_table *table, const char *name);		int cpl_table_has_valid(const cpl_table *table, const char *name);
	cpl_error_code cpl_table_fill_invalid_int(cpl_table *, const char *,		cpl_error_code cpl_table_fill_invalid_int(cpl_table *, const char *,
	int);		int);
	cpl_error_code cpl_table_fill_invalid_float(cpl_table *, const char *,		cpl_error_code cpl_table_fill_invalid_float(cpl_table *, const char *,
	float);		float);
	cpl_error_code cpl_table_fill_invalid_double(cpl_table *, const char *,		cpl_error_code cpl_table_fill_invalid_double(cpl_table *, const char *,
	double);		double);
	#ifdef _Complex_I		#ifdef _Complex_I
	skipping to change at line 237		skipping to change at line 240
	cpl_error_code cpl_table_move_column(cpl_table *, const char *, cpl_table * );		cpl_error_code cpl_table_move_column(cpl_table *, const char *, cpl_table * );
	cpl_error_code cpl_table_duplicate_column(cpl_table *, const char *,		cpl_error_code cpl_table_duplicate_column(cpl_table *, const char *,
	const cpl_table *, const char *);		const cpl_table *, const char *);
	cpl_error_code cpl_table_name_column(cpl_table *, const char *, const char *);		cpl_error_code cpl_table_name_column(cpl_table *, const char *, const char *);
	int cpl_table_has_column(const cpl_table *, const char *);		int cpl_table_has_column(const cpl_table *, const char *);
	const char *cpl_table_get_column_name(const cpl_table *);		const char *cpl_table_get_column_name(const cpl_table *);
	cpl_array *cpl_table_get_column_names(const cpl_table *table);		cpl_array *cpl_table_get_column_names(const cpl_table *table);
	cpl_error_code cpl_table_set_size(cpl_table *, int);		cpl_error_code cpl_table_set_size(cpl_table *, cpl_size);
	cpl_table *cpl_table_duplicate(const cpl_table *);		cpl_table *cpl_table_duplicate(const cpl_table *);
	cpl_table *cpl_table_extract(const cpl_table *, int, int);		cpl_table *cpl_table_extract(const cpl_table *, cpl_size, cpl_size);
	cpl_table *cpl_table_extract_selected(const cpl_table *);		cpl_table *cpl_table_extract_selected(const cpl_table *);
	cpl_array *cpl_table_where_selected(const cpl_table *);		cpl_array *cpl_table_where_selected(const cpl_table *);
	cpl_error_code cpl_table_erase_selected(cpl_table *);		cpl_error_code cpl_table_erase_selected(cpl_table *);
	cpl_error_code cpl_table_erase_window(cpl_table *, int, int);		cpl_error_code cpl_table_erase_window(cpl_table *, cpl_size, cpl_size);
	cpl_error_code cpl_table_insert_window(cpl_table *, int, int);		cpl_error_code cpl_table_insert_window(cpl_table *, cpl_size, cpl_size);
	int cpl_table_compare_structure(const cpl_table *, const cpl_table *);		int cpl_table_compare_structure(const cpl_table *, const cpl_table *);
	cpl_error_code cpl_table_insert(cpl_table *, const cpl_table *, int);		cpl_error_code cpl_table_insert(cpl_table *, const cpl_table *, cpl_size);
	cpl_error_code cpl_table_cast_column(cpl_table *,		cpl_error_code cpl_table_cast_column(cpl_table *,
	const char *, const char *, cpl_type);		const char *, const char *, cpl_type);
	cpl_error_code cpl_table_add_columns(cpl_table *,		cpl_error_code cpl_table_add_columns(cpl_table *,
	const char *, const char *);		const char *, const char *);
	cpl_error_code cpl_table_subtract_columns(cpl_table *,		cpl_error_code cpl_table_subtract_columns(cpl_table *,
	const char *, const char *);		const char *, const char *);
	cpl_error_code cpl_table_multiply_columns(cpl_table *,		cpl_error_code cpl_table_multiply_columns(cpl_table *,
	const char *, const char *);		const char *, const char *);
	skipping to change at line 294		skipping to change at line 297
	cpl_error_code cpl_table_real_column(cpl_table *, const char *);		cpl_error_code cpl_table_real_column(cpl_table *, const char *);
	cpl_error_code cpl_table_imag_column(cpl_table *, const char *);		cpl_error_code cpl_table_imag_column(cpl_table *, const char *);
	cpl_error_code cpl_table_arg_column(cpl_table *, const char *);		cpl_error_code cpl_table_arg_column(cpl_table *, const char *);
	cpl_error_code cpl_table_erase_invalid_rows(cpl_table *);		cpl_error_code cpl_table_erase_invalid_rows(cpl_table *);
	cpl_error_code cpl_table_erase_invalid(cpl_table *);		cpl_error_code cpl_table_erase_invalid(cpl_table *);
	double cpl_table_get_column_max(const cpl_table *, const char *);		double cpl_table_get_column_max(const cpl_table *, const char *);
	double cpl_table_get_column_min(const cpl_table *, const char *);		double cpl_table_get_column_min(const cpl_table *, const char *);
	cpl_error_code cpl_table_get_column_maxpos(const cpl_table *,		cpl_error_code cpl_table_get_column_maxpos(const cpl_table *,
	const char *, int *);		const char *, cpl_size *);
	cpl_error_code cpl_table_get_column_minpos(const cpl_table *,		cpl_error_code cpl_table_get_column_minpos(const cpl_table *,
	const char *, int *);		const char *, cpl_size *);
	#ifdef _Complex_I		#ifdef _Complex_I
	double complex cpl_table_get_column_mean_complex(const cpl_table *,		double complex cpl_table_get_column_mean_complex(const cpl_table *,
	const char *);		const char *);
	#endif		#endif
	double cpl_table_get_column_mean(const cpl_table *, const char *);		double cpl_table_get_column_mean(const cpl_table *, const char *);
	double cpl_table_get_column_median(const cpl_table *, const char *);		double cpl_table_get_column_median(const cpl_table *, const char *);
	double cpl_table_get_column_stdev(const cpl_table *, const char *);		double cpl_table_get_column_stdev(const cpl_table *, const char *);
	cpl_error_code cpl_table_sort(cpl_table *, const cpl_propertylist *);		cpl_error_code cpl_table_sort(cpl_table *, const cpl_propertylist *);
	int cpl_table_and_selected_window(cpl_table *, int, int);		cpl_size cpl_table_and_selected_window(cpl_table *, cpl_size, cpl_size);
	int cpl_table_or_selected_window(cpl_table *, int, int);		cpl_size cpl_table_or_selected_window(cpl_table *, cpl_size, cpl_size);
	int cpl_table_not_selected(cpl_table *);		cpl_size cpl_table_not_selected(cpl_table *);
	cpl_error_code cpl_table_select_row(cpl_table *, int);		cpl_error_code cpl_table_select_row(cpl_table *, cpl_size);
	cpl_error_code cpl_table_unselect_row(cpl_table *, int);		cpl_error_code cpl_table_unselect_row(cpl_table *, cpl_size);
	cpl_error_code cpl_table_select_all(cpl_table *);		cpl_error_code cpl_table_select_all(cpl_table *);
	cpl_error_code cpl_table_unselect_all(cpl_table *);		cpl_error_code cpl_table_unselect_all(cpl_table *);
	int cpl_table_and_selected_invalid(cpl_table *, const char *);		cpl_size cpl_table_and_selected_invalid(cpl_table *, const char *);
	int cpl_table_or_selected_invalid(cpl_table *, const char *);		cpl_size cpl_table_or_selected_invalid(cpl_table *, const char *);
	int cpl_table_and_selected_int(cpl_table *, const char *,		cpl_size cpl_table_and_selected_int(cpl_table *, const char *,
	cpl_table_select_operator, int);		cpl_table_select_operator, int);
	int cpl_table_or_selected_int(cpl_table *, const char *,		cpl_size cpl_table_or_selected_int(cpl_table *, const char *,
	cpl_table_select_operator, int);		cpl_table_select_operator, int);
	int cpl_table_and_selected_float(cpl_table *, const char *,		cpl_size cpl_table_and_selected_float(cpl_table *, const char *,
	cpl_table_select_operator, float);		cpl_table_select_operator, float);
	int cpl_table_or_selected_float(cpl_table *, const char *,		cpl_size cpl_table_or_selected_float(cpl_table *, const char *,
	cpl_table_select_operator, float);		cpl_table_select_operator, float);
	int cpl_table_and_selected_double(cpl_table *, const char *,		cpl_size cpl_table_and_selected_double(cpl_table *, const char *,
	cpl_table_select_operator, double);		cpl_table_select_operator, double);
	int cpl_table_or_selected_double(cpl_table *, const char *,		cpl_size cpl_table_or_selected_double(cpl_table *, const char *,
	cpl_table_select_operator, double);		cpl_table_select_operator, double);
	#ifdef _Complex_I		#ifdef _Complex_I
	int cpl_table_and_selected_float_complex(cpl_table *, const char *,		cpl_size cpl_table_and_selected_float_complex(cpl_table *, const char *,
	cpl_table_select_operator, float comple x);		cpl_table_select_operator, float comple x);
	int cpl_table_or_selected_float_complex(cpl_table *, const char *,		cpl_size cpl_table_or_selected_float_complex(cpl_table *, const char *,
	cpl_table_select_operator, float comple x);		cpl_table_select_operator, float comple x);
	int cpl_table_and_selected_double_complex(cpl_table *, const char *,		cpl_size cpl_table_and_selected_double_complex(cpl_table *, const char *,
	cpl_table_select_operator, double comp lex);		cpl_table_select_operator, double comp lex);
	int cpl_table_or_selected_double_complex(cpl_table *, const char *,		cpl_size cpl_table_or_selected_double_complex(cpl_table *, const char *,
	cpl_table_select_operator, double comp lex);		cpl_table_select_operator, double comp lex);
	#endif		#endif
	int cpl_table_and_selected_string(cpl_table *, const char *,		cpl_size cpl_table_and_selected_string(cpl_table *, const char *,
	cpl_table_select_operator, const char *);		cpl_table_select_operator, const char *);
	int cpl_table_or_selected_string(cpl_table *, const char *,		cpl_size cpl_table_or_selected_string(cpl_table *, const char *,
	cpl_table_select_operator, const char *);		cpl_table_select_operator, const char *);
	int cpl_table_and_selected(cpl_table *, const char *,		cpl_size cpl_table_and_selected(cpl_table *, const char *,
	cpl_table_select_operator, const char *);		cpl_table_select_operator, const char *);
	int cpl_table_or_selected(cpl_table *, const char *,		cpl_size cpl_table_or_selected(cpl_table *, const char *,
	cpl_table_select_operator, const char *);		cpl_table_select_operator, const char *);
	int cpl_table_is_selected(const cpl_table *, int);		int cpl_table_is_selected(const cpl_table *, cpl_size);
	int cpl_table_count_selected(const cpl_table *);		cpl_size cpl_table_count_selected(const cpl_table *);
	void cpl_table_dump_structure(const cpl_table *, FILE *);		void cpl_table_dump_structure(const cpl_table *, FILE *);
	void cpl_table_dump(const cpl_table *, int, int, FILE *);		void cpl_table_dump(const cpl_table *, cpl_size, cpl_size, FILE *);
	cpl_table *cpl_table_load(const char *, int, int);		cpl_table *cpl_table_load(const char *, int, int);
	cpl_table *cpl_table_load_window(const char *, int, int, const cpl_array *,		cpl_table *cpl_table_load_window(const char *, int, int, const cpl_array *,
	int, int);		cpl_size, cpl_size);
	cpl_error_code cpl_table_save(const cpl_table *, const cpl_propertylist *,		cpl_error_code cpl_table_save(const cpl_table *, const cpl_propertylist *,
	const cpl_propertylist *, const char *filenam e,		const cpl_propertylist *, const char *filenam e,
	unsigned mode);		unsigned mode);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
	/* end of cpl_table.h */		/* end of cpl_table.h */
End of changes. 59 change blocks.
	78 lines changed or deleted		86 lines changed or added

	cpl_test.h		cpl_test.h
	/* $Id: cpl_test.h,v 1.58 2011/02/10 12:54:53 llundin Exp $		/* $Id: cpl_test.h,v 1.60 2011/07/20 13:40:49 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2011/02/10 12:54:53 $		* $Date: 2011/07/20 13:40:49 $
	* $Revision: 1.58 $		* $Revision: 1.60 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_TEST_H		#ifndef CPL_TEST_H
	#define CPL_TEST_H		#define CPL_TEST_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#ifdef HAVE_CONFIG_H		#ifdef HAVE_CONFIG_H
	skipping to change at line 132		skipping to change at line 132
	@endcode		@endcode
	*/		*/
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
	#define cpl_test_zero(zero) do { \		#define cpl_test_zero(zero) do { \
	const int cpl_test_errno = errno; \		const int cpl_test_errno = errno; \
	const cpl_flops cpl_test_flops = cpl_test_get_flops(); \		const cpl_flops cpl_test_flops = cpl_test_get_flops(); \
	const double cpl_test_time = cpl_test_get_walltime(); \		const double cpl_test_time = cpl_test_get_walltime(); \
	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \		cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	cpl_test_macro(cpl_test_errno, cpl_test_time, cpl_test_flops, \		cpl_test_macro(cpl_test_errno, cpl_test_time, cpl_test_flops, \
	cpl_test_state, (zero) ? 1 : 0, CPL_FALSE, \		cpl_test_state, (zero), CPL_FALSE, \
	#zero, cpl_func, __FILE__, __LINE__); \		#zero, cpl_func, __FILE__, __LINE__); \
	} while (0)		} while (0)
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
	/**		/**
	@hideinitializer		@hideinitializer
	@ingroup cpl_test		@ingroup cpl_test
	@brief Test if a pointer is NULL and update an internal counter on failu re		@brief Test if a pointer is NULL and update an internal counter on failu re
	@param pointer The NULL-pointer to check, side-effects are allowed		@param pointer The NULL-pointer to check, side-effects are allowed
	skipping to change at line 962		skipping to change at line 962
	#endif		#endif
	typedef unsigned long long int cpl_flops;		typedef unsigned long long int cpl_flops;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	void cpl_test_init_macro(const char *, const char *,		void cpl_test_init_macro(const char *, const char *,
	cpl_msg_severity) CPL_ATTR_NONNULL;		cpl_msg_severity) CPL_ATTR_NONNULL;
	int cpl_test_end(int);		int cpl_test_end(cpl_size);
	void cpl_test_macro(int, double, cpl_flops, cpl_errorstate, int, cpl_boolea		void cpl_test_macro(int, double, cpl_flops, cpl_errorstate, cpl_size,
	n,		cpl_boolean, const char *, const char *,
	const char *, const char *,
	const char *, unsigned) CPL_ATTR_NONNULL;		const char *, unsigned) CPL_ATTR_NONNULL;
	void cpl_test_errorstate_macro(int, double, cpl_flops, cpl_errorstate,		void cpl_test_errorstate_macro(int, double, cpl_flops, cpl_errorstate,
	cpl_errorstate, const char *, const char *,		cpl_errorstate, const char *, const char *,
	const char *, unsigned) CPL_ATTR_NONNULL;		const char *, unsigned) CPL_ATTR_NONNULL;
	void cpl_test_error_macro(int, double, cpl_flops, cpl_errorstate,		void cpl_test_error_macro(int, double, cpl_flops, cpl_errorstate,
	cpl_error_code, const char *, const char *,		cpl_error_code, const char *, const char *,
	const char *, unsigned) CPL_ATTR_NONNULL;		const char *, unsigned) CPL_ATTR_NONNULL;
	skipping to change at line 993		skipping to change at line 993
	__attribute__((nonnull(6, 7, 8)))		__attribute__((nonnull(6, 7, 8)))
	#endif		#endif
	;		;
	void cpl_test_nonnull_macro(int, double, cpl_flops, cpl_errorstate,		void cpl_test_nonnull_macro(int, double, cpl_flops, cpl_errorstate,
	const void *, const char *, const char *,		const void *, const char *, const char *,
	const char *, unsigned)		const char *, unsigned)
	#ifdef CPL_HAVE_ATTR_NONNULL		#ifdef CPL_HAVE_ATTR_NONNULL
	__attribute__((nonnull(6, 7, 8)))		__attribute__((nonnull(6, 7, 8)))
	#endif		#endif
	;		;
	void cpl_test_eq_macro(int, double, cpl_flops, cpl_errorstate, int,		void cpl_test_eq_macro(int, double, cpl_flops, cpl_errorstate, cpl_size,
	const char *, int, const char *, const char *,		const char *, cpl_size, const char *, const char *,
	const char *, unsigned) CPL_ATTR_NONNULL;		const char *, unsigned) CPL_ATTR_NONNULL;
	void cpl_test_noneq_macro(int, double, cpl_flops, cpl_errorstate, int,		void cpl_test_noneq_macro(int, double, cpl_flops, cpl_errorstate, cpl_size,
	const char *, int, const char *, const char *,		const char *, cpl_size, const char *, const char
			*,
	const char *, unsigned) CPL_ATTR_NONNULL;		const char *, unsigned) CPL_ATTR_NONNULL;
	void cpl_test_eq_ptr_macro(int, double, cpl_flops, cpl_errorstate, const vo id *,		void cpl_test_eq_ptr_macro(int, double, cpl_flops, cpl_errorstate, const vo id *,
	const char *, const void *, const char *,		const char *, const void *, const char *,
	const char *, const char *, unsigned)		const char *, const char *, unsigned)
	#ifdef CPL_HAVE_ATTR_NONNULL		#ifdef CPL_HAVE_ATTR_NONNULL
	__attribute__((nonnull(6, 8, 9, 10)))		__attribute__((nonnull(6, 8, 9, 10)))
	#endif		#endif
	;		;
End of changes. 6 change blocks.
	13 lines changed or deleted		13 lines changed or added

	cpl_type.h		cpl_type.h
	/* $Id: cpl_type.h,v 1.17 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_type.h,v 1.27 2012/03/02 14:10:44 cgarcia Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2005 European Southern Observatory		* Copyright (C) 2001-2005 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: cgarcia $
	* $Date: 2010/11/11 09:23:18 $		* $Date: 2012/03/02 14:10:44 $
	* $Revision: 1.17 $		* $Revision: 1.27 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_TYPE_H		#ifndef CPL_TYPE_H
	#define CPL_TYPE_H		#define CPL_TYPE_H
			#include <cxtypes.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
			/**@{*/
	/**		/**
	* @ingroup cpl_type		* @ingroup cpl_type
	*		*
	* @brief		* @brief
	* The CPL type codes and flags.		* The CPL type codes and flags.
	*/		*/
	enum _cpl_type_ {		enum _cpl_type_ {
	/* flags */		/* flags */
	/**		/**
	* Flag indicating whether a type is an array or a basic type.		* Flag indicating whether a type is an array or a basic type.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_FLAG_ARRAY = 1 << 0,		CPL_TYPE_FLAG_ARRAY = 1 << 0,
	/* Padded for future extensions */		/* Padded for future extensions */
	/* types */		/* types */
	/**		/**
	* Invalid or undetermined type.		* Invalid or undetermined type.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_INVALID = 1 << 4,		CPL_TYPE_INVALID = 1 << 4,
	/**		/**
	* Type code corresponding to type @c char.		* Type code corresponding to type @c char.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_CHAR = 1 << 5,		CPL_TYPE_CHAR = 1 << 5,
	/**		/**
	* Type code corresponding to type @c unsigned char.		* Type code corresponding to type @c unsigned char.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_UCHAR = 1 << 6,		CPL_TYPE_UCHAR = 1 << 6,
	/**		/**
	* Type code corresponding to the boolean type.		* Type code corresponding to the boolean type.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_BOOL = 1 << 7,		CPL_TYPE_BOOL = 1 << 7,
			/**
			* Type code corresponding to type @c short.
			* @hideinitializer
			*/
			CPL_TYPE_SHORT = 1 << 8,
			/**
			* Type code corresponding to type @c unsigned short.
			* @hideinitializer
			*/
			CPL_TYPE_USHORT = 1 << 9,
	/**		/**
	* Type code corresponding to type @c int.		* Type code corresponding to type @c int.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_INT = 1 << 8,		CPL_TYPE_INT = 1 << 10,
	/**		/**
	* Type code corresponding to type @c unsigned int.		* Type code corresponding to type @c unsigned int.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_UINT = 1 << 9,		CPL_TYPE_UINT = 1 << 11,
	/**		/**
	* Type code corresponding to type @c long.		* Type code corresponding to type @c long.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_LONG = 1 << 10,		CPL_TYPE_LONG = 1 << 12,
	/**		/**
	* Type code corresponding to type @c unsigned long.		* Type code corresponding to type @c unsigned long.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_ULONG = 1 << 11,		CPL_TYPE_ULONG = 1 << 13,
			/**
			* Type code corresponding to type @c cpl_size.
			* @hideinitializer
			*/
			CPL_TYPE_LONG_LONG = 1 << 14,
			/**
			* Type code corresponding to type @c cpl_size
			* @hideinitializer
			*/
			CPL_TYPE_SIZE = 1 << 15,
	/**		/**
	* Type code corresponding to type @c float.		* Type code corresponding to type @c float.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_FLOAT = 1 << 12,		CPL_TYPE_FLOAT = 1 << 16,
	/**		/**
	* Type code corresponding to type @c double.		* Type code corresponding to type @c double.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_DOUBLE = 1 << 13,		CPL_TYPE_DOUBLE = 1 << 17,
	/**		/**
	* Type code corresponding to a pointer type.		* Type code corresponding to a pointer type.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_POINTER = 1 << 14,		CPL_TYPE_POINTER = 1 << 18,
	/**		/**
	* Type code corresponding to type @c float complex.		* Type code corresponding to type @c float complex.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_COMPLEX = 1 << 15,		CPL_TYPE_COMPLEX = 1 << 19,
	/**		/**
	* Type code to be used for inheritance of original FITS type.		* Type code to be used for inheritance of original FITS type.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_UNSPECIFIED = 1 << 16,		CPL_TYPE_UNSPECIFIED = 1 << 20,
	/**		/**
	* Type code corresponding to a character array.		* Type code corresponding to a character array.
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_TYPE_STRING = (CPL_TYPE_CHAR | CPL_TYPE_FLAG_ARRAY),		CPL_TYPE_STRING = (CPL_TYPE_CHAR | CPL_TYPE_FLAG_ARRAY),
	/**		/**
	* Type code corresponding to type @c float complex.		* Type code corresponding to type @c float complex.
	* @hideinitializer		* @hideinitializer
	skipping to change at line 169		skipping to change at line 196
	typedef enum _cpl_type_ cpl_type;		typedef enum _cpl_type_ cpl_type;
	enum _cpl_boolean_ {		enum _cpl_boolean_ {
	CPL_FALSE = 0,		CPL_FALSE = 0,
	CPL_TRUE = !CPL_FALSE		CPL_TRUE = !CPL_FALSE
	};		};
	typedef enum _cpl_boolean_ cpl_boolean;		typedef enum _cpl_boolean_ cpl_boolean;
			/**
			* @ingroup cpl_type
			*
			* @brief The type used for sizes and indices in CPL
			*/
			#if defined CPL_SIZE_BITS && CPL_SIZE_BITS == 32
			typedef int cpl_size; /* The type as is was up to CPL 5.3 */
			#else
			typedef long long cpl_size;
			#endif
			/**
			* @def CPL_SIZE_MIN
			*
			* @hideinitializer
			* @ingroup cpl_type
			*
			* @brief
			* Minimum value a variable of type @em cpl_size can hold.
			*/
			/**
			* @def CPL_SIZE_MAX
			*
			* @hideinitializer
			* @ingroup cpl_type
			*
			* @brief
			* Maximum value a variable of type @em cpl_size can hold.
			*/
			#if defined CPL_SIZE_BITS && CPL_SIZE_BITS == 32
			#define CPL_SIZE_MIN (CX_MININT)
			#define CPL_SIZE_MAX (CX_MAXINT)
			#else
			#define CPL_SIZE_MIN (LLONG_MIN)
			#define CPL_SIZE_MAX (LLONG_MAX)
			#endif
			/**
			* @hideinitializer
			* @ingroup cpl_type
			*
			* @brief The format specifier for the type cpl_size
			* @note It is "ld" when cpl_size is a @c long int and "d" when it is an @c
			int
			* @see cpl_size
			*
			* It can be used like this:
			* @code
			* cpl_size i = my_index();
			*
			* return cpl_sprintf("The index is %" CPL_SIZE_FORMAT "\n", i);
			*
			* @endcode
			*/
			#if defined CPL_SIZE_BITS && CPL_SIZE_BITS == 32
			#define CPL_SIZE_FORMAT "d"
			#else
			#define CPL_SIZE_FORMAT "lld"
			#endif
			/**@}*/
	size_t cpl_type_get_sizeof(cpl_type type) CPL_ATTR_CONST;		size_t cpl_type_get_sizeof(cpl_type type) CPL_ATTR_CONST;
	const char * cpl_type_get_name(cpl_type type);		const char * cpl_type_get_name(cpl_type type);
	CPL_END_DECLS		CPL_END_DECLS
	#endif /* CPL_TYPE_H */		#endif /* CPL_TYPE_H */
End of changes. 19 change blocks.
	19 lines changed or deleted		119 lines changed or added

	cpl_vector.h		cpl_vector.h
	/* $Id: cpl_vector.h,v 1.62 2010/12/13 11:02:43 llundin Exp $		/* $Id: cpl_vector.h,v 1.65 2011/11/29 13:28:48 llundin Exp $
	*		*
	* This file is part of the ESO Common Pipeline Library		* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory		* Copyright (C) 2001-2008 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	skipping to change at line 23		skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/12/13 11:02:43 $		* $Date: 2011/11/29 13:28:48 $
	* $Revision: 1.62 $		* $Revision: 1.65 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_VECTOR_H		#ifndef CPL_VECTOR_H
	#define CPL_VECTOR_H		#define CPL_VECTOR_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>		#include <stdio.h>
			#include "cpl_type.h"
	#include "cpl_error.h"		#include "cpl_error.h"
	#include "cpl_propertylist.h"		#include "cpl_propertylist.h"
	#include "cpl_matrix.h"		#include "cpl_matrix.h"
	#include "cpl_io.h"		#include "cpl_io.h"
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Defines		Defines
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	skipping to change at line 63		skipping to change at line 64
	#ifndef CPL_KERNEL_TABSPERPIX		#ifndef CPL_KERNEL_TABSPERPIX
	#define CPL_KERNEL_TABSPERPIX 1000		#define CPL_KERNEL_TABSPERPIX 1000
	#endif		#endif
	/* Suggested radius of pixel interpolation */		/* Suggested radius of pixel interpolation */
	#ifndef CPL_KERNEL_DEF_WIDTH		#ifndef CPL_KERNEL_DEF_WIDTH
	#define CPL_KERNEL_DEF_WIDTH 2.0		#define CPL_KERNEL_DEF_WIDTH 2.0
	#endif		#endif
	/* Suggested length of interpolation profile */		/* Suggested length of interpolation profile */
	#define CPL_KERNEL_DEF_SAMPLES (1+(int)(CPL_KERNEL_TABSPERPIX * CPL_KERNEL_		#define CPL_KERNEL_DEF_SAMPLES \
	DEF_WIDTH))		(1+(cpl_size)((CPL_KERNEL_TABSPERPIX) * (CPL_KERNEL_DEF_WIDTH)))
	/* FIXME: Will disappear. Do not use in new code! */		/* FIXME: Will disappear. Do not use in new code! */
	#define cpl_wlcalib_xc_convolve_create_kernel \		#define cpl_wlcalib_xc_convolve_create_kernel \
	cpl_vector_new_lss_kernel		cpl_vector_new_lss_kernel
	#define cpl_wlcalib_xc_convolve \		#define cpl_wlcalib_xc_convolve \
	cpl_vector_convolve_symmetric		cpl_vector_convolve_symmetric
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	New types		New types
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	skipping to change at line 86		skipping to change at line 88
	CPL_LOWPASS_LINEAR,		CPL_LOWPASS_LINEAR,
	CPL_LOWPASS_GAUSSIAN		CPL_LOWPASS_GAUSSIAN
	} cpl_lowpass;		} cpl_lowpass;
	typedef enum {		typedef enum {
	CPL_KERNEL_TANH,		CPL_KERNEL_TANH,
	CPL_KERNEL_SINC,		CPL_KERNEL_SINC,
	CPL_KERNEL_SINC2,		CPL_KERNEL_SINC2,
	CPL_KERNEL_LANCZOS,		CPL_KERNEL_LANCZOS,
	CPL_KERNEL_HAMMING,		CPL_KERNEL_HAMMING,
	CPL_KERNEL_HANN		CPL_KERNEL_HANN,
			CPL_KERNEL_NEAREST
	} cpl_kernel;		} cpl_kernel;
	typedef enum {		typedef enum {
	CPL_FIT_CENTROID = 1 << 1,		CPL_FIT_CENTROID = 1 << 1,
	CPL_FIT_STDEV = 1 << 2,		CPL_FIT_STDEV = 1 << 2,
	CPL_FIT_AREA = 1 << 3,		CPL_FIT_AREA = 1 << 3,
	CPL_FIT_OFFSET = 1 << 4,		CPL_FIT_OFFSET = 1 << 4,
	CPL_FIT_ALL = (1 << 1) |		CPL_FIT_ALL = (1 << 1) |
	(1 << 2) |		(1 << 2) |
	(1 << 3) |		(1 << 3) |
	skipping to change at line 113		skipping to change at line 116
	CPL_SORT_ASCENDING = 1		CPL_SORT_ASCENDING = 1
	} cpl_sort_direction;		} cpl_sort_direction;
	typedef struct _cpl_vector_ cpl_vector;		typedef struct _cpl_vector_ cpl_vector;
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Function prototypes		Function prototypes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	/* Constructors and destructors */		/* Constructors and destructors */
	cpl_vector * cpl_vector_new(int) CPL_ATTR_ALLOC;		cpl_vector * cpl_vector_new(cpl_size) CPL_ATTR_ALLOC;
	cpl_vector * cpl_vector_wrap(int, double *) CPL_ATTR_ALLOC;		cpl_vector * cpl_vector_wrap(cpl_size, double *) CPL_ATTR_ALLOC;
	void cpl_vector_delete(cpl_vector *);		void cpl_vector_delete(cpl_vector *);
	void * cpl_vector_unwrap(cpl_vector *);		void * cpl_vector_unwrap(cpl_vector *);
	cpl_vector * cpl_vector_read(const char *) CPL_ATTR_ALLOC;		cpl_vector * cpl_vector_read(const char *) CPL_ATTR_ALLOC;
	void cpl_vector_dump(const cpl_vector *, FILE *);		void cpl_vector_dump(const cpl_vector *, FILE *);
	cpl_vector * cpl_vector_load(const char *, int) CPL_ATTR_ALLOC;		cpl_vector * cpl_vector_load(const char *, cpl_size) CPL_ATTR_ALLOC;
	cpl_error_code cpl_vector_save(const cpl_vector *, const char *, cpl_type_b		cpl_error_code cpl_vector_save(const cpl_vector *, const char *, cpl_type,
	pp,
	const cpl_propertylist *, unsigned);		const cpl_propertylist *, unsigned);
	cpl_vector * cpl_vector_duplicate(const cpl_vector *) CPL_ATTR_ALLOC;		cpl_vector * cpl_vector_duplicate(const cpl_vector *) CPL_ATTR_ALLOC;
	cpl_error_code cpl_vector_copy(cpl_vector *, const cpl_vector *);		cpl_error_code cpl_vector_copy(cpl_vector *, const cpl_vector *);
	/* Accessor functions */		/* Accessor functions */
	int cpl_vector_get_size(const cpl_vector *);		cpl_size cpl_vector_get_size(const cpl_vector *);
	double * cpl_vector_get_data(cpl_vector *);		double * cpl_vector_get_data(cpl_vector *);
	const double * cpl_vector_get_data_const(const cpl_vector *);		const double * cpl_vector_get_data_const(const cpl_vector *);
	double cpl_vector_get(const cpl_vector *, int);		double cpl_vector_get(const cpl_vector *, cpl_size);
	cpl_error_code cpl_vector_set_size(cpl_vector *, int);		cpl_error_code cpl_vector_set_size(cpl_vector *, cpl_size);
	cpl_error_code cpl_vector_set(cpl_vector *, int, double);		cpl_error_code cpl_vector_set(cpl_vector *, cpl_size, double);
	/* Basic operations */		/* Basic operations */
	cpl_error_code cpl_vector_add(cpl_vector *, const cpl_vector *);		cpl_error_code cpl_vector_add(cpl_vector *, const cpl_vector *);
	cpl_error_code cpl_vector_subtract(cpl_vector *, const cpl_vector *);		cpl_error_code cpl_vector_subtract(cpl_vector *, const cpl_vector *);
	cpl_error_code cpl_vector_multiply(cpl_vector *, const cpl_vector *);		cpl_error_code cpl_vector_multiply(cpl_vector *, const cpl_vector *);
	cpl_error_code cpl_vector_divide(cpl_vector *, const cpl_vector *);		cpl_error_code cpl_vector_divide(cpl_vector *, const cpl_vector *);
	double cpl_vector_product(const cpl_vector *, const cpl_vector *);		double cpl_vector_product(const cpl_vector *, const cpl_vector *);
	cpl_error_code cpl_vector_sort(cpl_vector *, cpl_sort_direction);		cpl_error_code cpl_vector_sort(cpl_vector *, cpl_sort_direction);
	cpl_error_code cpl_vector_add_scalar(cpl_vector *, double);		cpl_error_code cpl_vector_add_scalar(cpl_vector *, double);
	cpl_error_code cpl_vector_subtract_scalar(cpl_vector *, double);		cpl_error_code cpl_vector_subtract_scalar(cpl_vector *, double);
	cpl_error_code cpl_vector_multiply_scalar(cpl_vector *, double);		cpl_error_code cpl_vector_multiply_scalar(cpl_vector *, double);
	cpl_error_code cpl_vector_divide_scalar(cpl_vector *, double);		cpl_error_code cpl_vector_divide_scalar(cpl_vector *, double);
	cpl_error_code cpl_vector_logarithm(cpl_vector *, double);		cpl_error_code cpl_vector_logarithm(cpl_vector *, double);
	cpl_error_code cpl_vector_exponential(cpl_vector *, double);		cpl_error_code cpl_vector_exponential(cpl_vector *, double);
	cpl_error_code cpl_vector_power(cpl_vector *, double);		cpl_error_code cpl_vector_power(cpl_vector *, double);
	cpl_error_code cpl_vector_fill(cpl_vector *, double);		cpl_error_code cpl_vector_fill(cpl_vector *, double);
	cpl_error_code cpl_vector_sqrt(cpl_vector *);		cpl_error_code cpl_vector_sqrt(cpl_vector *);
	int cpl_vector_find(const cpl_vector *, double);		cpl_size cpl_vector_find(const cpl_vector *, double);
	cpl_vector * cpl_vector_extract(const cpl_vector *, int,		cpl_vector * cpl_vector_extract(const cpl_vector *, cpl_size,
	int, int) CPL_ATTR_ALLOC;		cpl_size, cpl_size) CPL_ATTR_ALLOC;
	/* Statistics on cpl_vector */		/* Statistics on cpl_vector */
	double cpl_vector_get_min(const cpl_vector *);		double cpl_vector_get_min(const cpl_vector *);
	double cpl_vector_get_max(const cpl_vector *);		double cpl_vector_get_max(const cpl_vector *);
	double cpl_vector_get_mean(const cpl_vector *);		double cpl_vector_get_mean(const cpl_vector *);
	double cpl_vector_get_median(cpl_vector *);		double cpl_vector_get_median(cpl_vector *);
	double cpl_vector_get_median_const(const cpl_vector *);		double cpl_vector_get_median_const(const cpl_vector *);
	double cpl_vector_get_stdev(const cpl_vector *);		double cpl_vector_get_stdev(const cpl_vector *);
	int cpl_vector_correlate(cpl_vector *, const cpl_vector *, const cpl_vector *);		cpl_size cpl_vector_correlate(cpl_vector *, const cpl_vector *, const cpl_v ector *);
	/* Filtering */		/* Filtering */
	cpl_vector * cpl_vector_filter_lowpass_create(const cpl_vector *, cpl_lowpa ss,		cpl_vector * cpl_vector_filter_lowpass_create(const cpl_vector *, cpl_lowpa ss,
	int) CPL_ATTR_ALLOC;		cpl_size) CPL_ATTR_ALLOC;
	cpl_vector * cpl_vector_filter_median_create(const cpl_vector *,		cpl_vector * cpl_vector_filter_median_create(const cpl_vector *,
	int) CPL_ATTR_ALLOC;		cpl_size) CPL_ATTR_ALLOC;
	cpl_error_code cpl_vector_fill_kernel_profile(cpl_vector *, cpl_kernel, dou ble);		cpl_error_code cpl_vector_fill_kernel_profile(cpl_vector *, cpl_kernel, dou ble);
	/* Fitting */		/* Fitting */
	cpl_error_code cpl_vector_fit_gaussian(const cpl_vector *, const cpl_vector *,		cpl_error_code cpl_vector_fit_gaussian(const cpl_vector *, const cpl_vector *,
	const cpl_vector *, const cpl_vector *,		const cpl_vector *, const cpl_vector *,
	cpl_fit_mode,		cpl_fit_mode,
	double *, double *,		double *, double *,
	double *, double *,		double *, double *,
	double *, double *,		double *, double *,
End of changes. 13 change blocks.
	22 lines changed or deleted		23 lines changed or added

	cpl_version.h		cpl_version.h
	skipping to change at line 30		skipping to change at line 30
	/*		/*
	* Do not edit this file! This file was automatically generated.		* Do not edit this file! This file was automatically generated.
	* All changes to this file might be lost!		* All changes to this file might be lost!
	*/		*/
	#ifndef CPL_VERSION_H		#ifndef CPL_VERSION_H
	#define CPL_VERSION_H		#define CPL_VERSION_H
	#include <cpl_macros.h>		#include <cpl_macros.h>
	#define CPL_VERSION_STRING "5.3.1"		#define CPL_VERSION_STRING "6.0"
	#define CPL_VERSION_CODE 328449		#define CPL_VERSION_CODE 393216
	#define CPL_VERSION(major, minor, micro) \		#define CPL_VERSION(major, minor, micro) \
	(((major) * 65536) + ((minor) * 256) + (micro))		(((major) * 65536) + ((minor) * 256) + (micro))
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	unsigned int cpl_version_get_major(void) CPL_ATTR_CONST;		unsigned int cpl_version_get_major(void) CPL_ATTR_CONST;
	unsigned int cpl_version_get_minor(void) CPL_ATTR_CONST;		unsigned int cpl_version_get_minor(void) CPL_ATTR_CONST;
	unsigned int cpl_version_get_micro(void) CPL_ATTR_CONST;		unsigned int cpl_version_get_micro(void) CPL_ATTR_CONST;
End of changes. 1 change blocks.
	2 lines changed or deleted		2 lines changed or added

	cpl_wcs.h		cpl_wcs.h
	skipping to change at line 25		skipping to change at line 25
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: llundin $
	* $Date: 2010/11/11 10:32:10 $		* $Date: 2010/11/11 10:32:10 $
	* $Revision: 1.13 $		* $Revision: 1.13 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CPL_WCS_H		#ifndef CPL_WCS_H
	#define CPL_WCS_H		#define CPL_WCS_H
	#include "cpl_error.h"		#include "cpl_error.h"
	#include "cpl_propertylist.h"		#include "cpl_propertylist.h"
	#include "cpl_matrix.h"		#include "cpl_matrix.h"
	#include "cpl_array.h"		#include "cpl_array.h"
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cxdeque.h		cxdeque.h
	/* $Id: cxdeque.h,v 1.2 2007/07/04 12:14:04 scastro Exp $		/* $Id: cxdeque.h,v 1.3 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: scastro $		* $Author: rpalsa $
	* $Date: 2007/07/04 12:14:04 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.2 $		* $Revision: 1.3 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_DEQUE_H		#ifndef CX_DEQUE_H
	#define CX_DEQUE_H		#define CX_DEQUE_H
			#include <cxtypes.h>
	#include <cxmemory.h>		#include <cxmemory.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
	typedef struct _cx_deque_ cx_deque;		typedef struct _cx_deque_ cx_deque;
	typedef unsigned long cx_deque_const_iterator;		typedef cxsize cx_deque_const_iterator;
	typedef unsigned long cx_deque_iterator;		typedef cxsize cx_deque_iterator;
	typedef cxint (*cx_deque_compare) (cxcptr a, cxcptr b);
			/*
			* Create, copy and destroy operations
			*/
	cx_deque *cx_deque_new(void);		cx_deque *cx_deque_new(void);
	void cx_deque_destroy(cx_deque *d, cx_free_func deallocate);		void cx_deque_delete(cx_deque* deque);
			void cx_deque_destroy(cx_deque *deque, cx_free_func deallocate);
	cxsize cx_deque_size(const cx_deque *d);		/*
	cxbool cx_deque_empty(const cx_deque *d);		* Non-modifying operations
			*/
	cxptr cx_deque_get(const cx_deque *d, cx_deque_const_iterator indx);		cxsize cx_deque_size(const cx_deque *deque);
			cxbool cx_deque_empty(const cx_deque *deque);
			cxsize cx_deque_max_size(const cx_deque *deque);
	cx_deque_iterator cx_deque_begin(const cx_deque *d);		/*
	cx_deque_iterator cx_deque_end(const cx_deque *d);		* Assignment operations
	cx_deque_iterator cx_deque_next(const cx_deque *d, cx_deque_const_iterator		*/
	i);
	void cx_deque_push_back(cx_deque *d, cxptr what);		void cx_deque_swap(cx_deque *deque, cx_deque *other);
	void cx_deque_push_front(cx_deque *d, cxptr what);		cxptr cx_deque_assign(cx_deque *deque, cx_deque_iterator position, cxptr da
	cx_deque_iterator cx_deque_erase(cx_deque *d, cx_deque_iterator indx, cx_fr		ta);
	ee_func deallocate);
	void cx_deque_insert(cx_deque *d, cx_deque_iterator indx, cxptr what);
	void cx_deque_sort(cx_deque *d, cx_deque_compare compare);		/*
			* Element access
			*/
			cxptr cx_deque_front(const cx_deque *deque);
			cxptr cx_deque_back(const cx_deque *deque);
			cxptr cx_deque_get(const cx_deque *deque, cx_deque_const_iterator position)
			;
			/*
			* Iterator functions
			*/
			cx_deque_iterator cx_deque_begin(const cx_deque *deque);
			cx_deque_iterator cx_deque_end(const cx_deque *deque);
			cx_deque_iterator cx_deque_next(const cx_deque *deque,
			cx_deque_const_iterator position);
			cx_deque_iterator cx_deque_previous(const cx_deque *deque,
			cx_deque_const_iterator position);
			/*
			* Inserting and removing elements
			*/
			void cx_deque_push_front(cx_deque *deque, cxcptr data);
			cxptr cx_deque_pop_front(cx_deque *deque);
			void cx_deque_push_back(cx_deque *deque, cxcptr data);
			cxptr cx_deque_pop_back(cx_deque *deque);
			cx_deque_iterator cx_deque_insert(cx_deque *deque, cx_deque_iterator positi
			on,
			cxcptr data);
			cx_deque_iterator cx_deque_erase(cx_deque *deque, cx_deque_iterator positio
			n,
			cx_free_func deallocate);
			void cx_deque_clear(cx_deque *deque);
			/*
			* Extra deque interfaces
			*/
			/*
			* Removing elements
			*/
			cxptr cx_deque_extract(cx_deque *deque, cx_deque_iterator position);
			void cx_deque_remove(cx_deque *deque, cxcptr data);
			/*
			* Splice functions
			*/
			void cx_deque_unique(cx_deque *deque, cx_compare_func compare);
			void cx_deque_splice(cx_deque *deque, cx_deque_iterator position,
			cx_deque *other, cx_deque_iterator start,
			cx_deque_iterator end);
			void cx_deque_merge(cx_deque *deque, cx_deque *other, cx_compare_func compa
			re);
			void cx_deque_sort(cx_deque *deque, cx_compare_func compare);
			void cx_deque_reverse(cx_deque *deque);
	CX_END_DECLS		CX_END_DECLS
	#endif /* CX_DEQUE_H */		#endif /* CX_DEQUE_H */
End of changes. 11 change blocks.
	23 lines changed or deleted		87 lines changed or added

	cxfileutils.h		cxfileutils.h
	/* $Id: cxfileutils.h,v 1.3 2006/06/12 09:57:33 rpalsa Exp $		/* $Id: cxfileutils.h,v 1.4 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: rpalsa $		* $Author: rpalsa $
	* $Date: 2006/06/12 09:57:33 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.3 $		* $Revision: 1.4 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_FILEUTILS_H		#ifndef CX_FILEUTILS_H
	#define CX_FILEUTILS_H		#define CX_FILEUTILS_H
	#include <cxtypes.h>		#include <cxtypes.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
	cxlong cx_path_max(const cxchar *);		cxlong cx_path_max(const cxchar *);
End of changes. 3 change blocks.
	5 lines changed or deleted		5 lines changed or added

	cxlist.h		cxlist.h
	/* $Id: cxlist.h,v 1.3 2006/06/12 09:57:33 rpalsa Exp $		/* $Id: cxlist.h,v 1.4 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: rpalsa $		* $Author: rpalsa $
	* $Date: 2006/06/12 09:57:33 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.3 $		* $Revision: 1.4 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_LIST_H		#ifndef CX_LIST_H
	#define CX_LIST_H		#define CX_LIST_H
	#include <cxmemory.h>		#include <cxmemory.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
	typedef struct _cx_lnode_ *cx_list_iterator;		typedef struct _cx_lnode_ *cx_list_iterator;
	skipping to change at line 49		skipping to change at line 49
	/*		/*
	* Create, copy and destroy operations		* Create, copy and destroy operations
	*/		*/
	cx_list *cx_list_new(void);		cx_list *cx_list_new(void);
	void cx_list_delete(cx_list *);		void cx_list_delete(cx_list *);
	void cx_list_destroy(cx_list *, cx_free_func);		void cx_list_destroy(cx_list *, cx_free_func);
	/*		/*
	* Nonmodifying operations		* Non-modifying operations
	*/		*/
	cxsize cx_list_size(const cx_list *);		cxsize cx_list_size(const cx_list *);
	cxbool cx_list_empty(const cx_list *);		cxbool cx_list_empty(const cx_list *);
	cxsize cx_list_max_size(const cx_list *);		cxsize cx_list_max_size(const cx_list *);
	/*		/*
	* Assignment operations		* Assignment operations
	*/		*/
End of changes. 4 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cxmacros.h		cxmacros.h
	/* $Id: cxmacros.h,v 1.6 2007/12/12 12:09:41 scastro Exp $		/* $Id: cxmacros.h,v 1.7 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: scastro $		* $Author: rpalsa $
	* $Date: 2007/12/12 12:09:41 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.6 $		* $Revision: 1.7 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	/*		/*
	* This file MUST not include any other cext header file.		* This file MUST not include any other cext header file.
	*/		*/
	#ifndef CX_MACROS_H		#ifndef CX_MACROS_H
	#define CX_MACROS_H		#define CX_MACROS_H
	/*		/*
	skipping to change at line 52		skipping to change at line 52
	* An alias for __extension__		* An alias for __extension__
	*/		*/
	#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)		#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
	# define CX_GNUC_EXTENSION __extension__		# define CX_GNUC_EXTENSION __extension__
	#else		#else
	# define CX_GNUC_EXTENSION		# define CX_GNUC_EXTENSION
	#endif		#endif
	/*		/*
			* Macros for the GNU compiler function attributes
			*/
			#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 96)
			# define CX_GNUC_PURE __attribute__((__pure__))
			# define CX_GNUC_MALLOC __attribute__((__malloc__))
			#else
			# define G_GNUC_PURE
			# define G_GNUC_MALLOC
			#endif
			#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
			# define CX_GNUC_PRINTF(fmt_idx, arg_idx) \
			__attribute__((__format__ (__printf__, fmt_idx, arg_idx)))
			# define CX_GNUC_SCANF(fmt_idx, arg_idx) \
			__attribute__((__format__ (__scanf__, fmt_idx, arg_idx)))
			# define CX_GNUC_FORMAT(arg_idx) __attribute__((__format_arg__ (arg_idx)))
			# define CX_GNUC_NORETURN __attribute__((__noreturn__))
			# define CX_GNUC_CONST __attribute__((__const__))
			# define CX_GNUC_UNUSED __attribute__((__unused__))
			#else
			# define CX_GNUC_PRINTF(fmt_idx, arg_idx)
			# define CX_GNUC_SCANF(fmt_idx, arg_idx)
			# define CX_GNUC_FORMAT(arg_idx)
			# define CX_GNUC_NORETURN
			# define CX_GNUC_CONST
			# define CX_GNUC_UNUSED
			#endif
			/*
	* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with macros.		* Wrap the gcc __PRETTY_FUNCTION__ and __FUNCTION__ variables with macros.
	*/		*/
	#if defined (__GNUC__) && (__GNUC__ < 3)		#if defined (__GNUC__) && (__GNUC__ < 3)
	# define CX_GNUC_FUNCTION __FUNCTION__		# define CX_GNUC_FUNCTION __FUNCTION__
	# define CX_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__		# define CX_GNUC_PRETTY_FUNCTION __PRETTY_FUNCTION__
	#else /* !__GNUC__ */		#else /* !__GNUC__ */
	# define CX_GNUC_FUNCTION ""		# define CX_GNUC_FUNCTION ""
	# define CX_GNUC_PRETTY_FUNCTION ""		# define CX_GNUC_PRETTY_FUNCTION ""
	#endif /* !__GNUC__ */		#endif /* !__GNUC__ */
	skipping to change at line 77		skipping to change at line 107
	* String identifier for the current code position		* String identifier for the current code position
	*/		*/
	#if defined (__GNUC__) && (__GNUC__ < 3)		#if defined (__GNUC__) && (__GNUC__ < 3)
	# define CX_CODE_POS __FILE__ ":" CX_STRINGIFY(__LINE__) ":" __PRETTY_FUN CTION__ "()"		# define CX_CODE_POS __FILE__ ":" CX_STRINGIFY(__LINE__) ":" __PRETTY_FUN CTION__ "()"
	#else		#else
	# define CX_CODE_POS __FILE__ ":" CX_STRINGIFY(__LINE__)		# define CX_CODE_POS __FILE__ ":" CX_STRINGIFY(__LINE__)
	#endif		#endif
	/*		/*
			* Current function identifier
			*/
			#if defined (__GNUC__)
			# define CX_FUNC_NAME ((const char*) (__PRETTY_FUNCTION__))
			#elif defined (__STDC_VERSION__) && __STDC_VERSION__ >= 19901L
			# define CX_FUNC_NAME ((const char*) (__func__))
			#else
			# define CX_FUNC_NAME ((const char*) ("???"))
			#endif
			/*
	* C code guard		* C code guard
	*/		*/
	#undef CX_BEGIN_DECLS		#undef CX_BEGIN_DECLS
	#undef CX_END_DECLS		#undef CX_END_DECLS
	#ifdef __cplusplus		#ifdef __cplusplus
	# define CX_BEGIN_DECLS extern "C" {		# define CX_BEGIN_DECLS extern "C" {
	# define CX_END_DECLS }		# define CX_END_DECLS }
	#else		#else
	skipping to change at line 115		skipping to change at line 156
	# define FALSE (0)		# define FALSE (0)
	#endif		#endif
	#ifndef TRUE		#ifndef TRUE
	# define TRUE (!FALSE)		# define TRUE (!FALSE)
	#endif		#endif
	#ifndef CX_MIN		#ifndef CX_MIN
	# define CX_MIN(a, b) ((a) < (b) ? (a) : (b))		# define CX_MIN(a, b) ((a) < (b) ? (a) : (b))
	#endif		#endif
	/*#undef MIN
	#define MIN(a, b) ((a) < (b) ? (a) : (b))*/
	#ifndef CX_MAX		#ifndef CX_MAX
	# define CX_MAX(a, b) ((a) > (b) ? (a) : (b))		# define CX_MAX(a, b) ((a) > (b) ? (a) : (b))
	#endif		#endif
	/*#undef MAX
	#define MAX(a, b) ((a) > (b) ? (a) : (b))*/
	#ifndef CX_ABS		#ifndef CX_ABS
	# define CX_ABS(a) ((a) < (0) ? -(a) : (a))		# define CX_ABS(a) ((a) < (0) ? -(a) : (a))
	#endif		#endif
	/*#undef ABS
	#define ABS(a) ((a) < (0) ? -(a) : (a))*/
	#ifndef CX_CLAMP		#ifndef CX_CLAMP
	# define CX_CLAMP(a, low, high) (((a) > (high)) ? (high) : (((a) < (low)) ? (low) : (a)))		# define CX_CLAMP(a, low, high) (((a) > (high)) ? (high) : (((a) < (low)) ? (low) : (a)))
	#endif		#endif
	/*#undef CLAMP
	#define CLAMP(a, low, high) (((a) > (high)) ? (high) : (((a) < (low)) ? (l
	ow) : (a)))*/
	/*		/*
	* Number of elements in an array		* Number of elements in an array
	*/		*/
	#define CX_N_ELEMENTS(array) (sizeof (array) / sizeof ((array)[0]))		#define CX_N_ELEMENTS(array) (sizeof (array) / sizeof ((array)[0]))
	#endif /* CX_MACROS_H */		#endif /* CX_MACROS_H */
End of changes. 9 change blocks.
	15 lines changed or deleted		47 lines changed or added

	cxmap.h		cxmap.h
	/* $Id: cxmap.h,v 1.4 2006/06/12 09:57:33 rpalsa Exp $		/* $Id: cxmap.h,v 1.5 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: rpalsa $		* $Author: rpalsa $
	* $Date: 2006/06/12 09:57:33 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.4 $		* $Revision: 1.5 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_MAP_H		#ifndef CX_MAP_H
	#define CX_MAP_H		#define CX_MAP_H
	#include <cxmemory.h>		#include <cxmemory.h>
	#include <cxtree.h>		#include <cxtree.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
End of changes. 3 change blocks.
	5 lines changed or deleted		5 lines changed or added

	cxmemory.h		cxmemory.h
	/* $Id: cxmemory.h,v 1.4 2009/03/25 13:01:22 llundin Exp $		/* $Id: cxmemory.h,v 1.5 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2009/03/25 13:01:22 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.4 $		* $Revision: 1.5 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_MEMORY_H		#ifndef CX_MEMORY_H
	#define CX_MEMORY_H		#define CX_MEMORY_H
	#include <cxtypes.h>		#include <cxtypes.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
	struct _cx_memory_vtable_ {		struct _cx_memory_vtable_ {
End of changes. 3 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cxmessages.h		cxmessages.h
	/* $Id: cxmessages.h,v 1.9 2009/12/07 15:48:15 llundin Exp $		/* $Id: cxmessages.h,v 1.10 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2009/12/07 15:48:15 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.9 $		* $Revision: 1.10 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_MESSAGES_H		#ifndef CX_MESSAGES_H
	#define CX_MESSAGES_H		#define CX_MESSAGES_H
	#include <stdarg.h>		#include <stdarg.h>
	#include <cxmacros.h>		#include <cxmacros.h>
	#include <cxtypes.h>		#include <cxtypes.h>
	skipping to change at line 93		skipping to change at line 93
	cxuint cx_log_set_handler(const cxchar *, cx_log_level_flags,		cxuint cx_log_set_handler(const cxchar *, cx_log_level_flags,
	cx_log_func, cxptr);		cx_log_func, cxptr);
	void cx_log_remove_handler(const cxchar *, cxuint);		void cx_log_remove_handler(const cxchar *, cxuint);
	cx_log_level_flags cx_log_set_fatal_mask(const cxchar *, cx_log_level_flags );		cx_log_level_flags cx_log_set_fatal_mask(const cxchar *, cx_log_level_flags );
	cx_log_level_flags cx_log_set_always_fatal(cx_log_level_flags);		cx_log_level_flags cx_log_set_always_fatal(cx_log_level_flags);
	cxsize cx_log_get_domain_count(void);		cxsize cx_log_get_domain_count(void);
	const cxchar *cx_log_get_domain_name(cxsize);		const cxchar *cx_log_get_domain_name(cxsize);
	void cx_log(const cxchar *, cx_log_level_flags, const cxchar *, ...)		void cx_log(const cxchar *, cx_log_level_flags,
	#ifdef __GNUC__		const cxchar *, ...) CX_GNUC_PRINTF(3, 4);
	__attribute__((format (printf, 3, 4)))		void cx_logv(const cxchar *, cx_log_level_flags,
	#endif		const cxchar *, va_list) CX_GNUC_PRINTF(3, 0);
	;
	void cx_logv(const cxchar *, cx_log_level_flags, const cxchar *, va_list)
	#ifdef __GNUC__
	__attribute__((format (printf, 3, 0)))
	#endif
	;
	cx_print_func cx_print_set_handler(cx_print_func);		cx_print_func cx_print_set_handler(cx_print_func);
	cx_print_func cx_printerr_set_handler(cx_print_func);		cx_print_func cx_printerr_set_handler(cx_print_func);
	void cx_print(const cxchar *, ...)		void cx_print(const cxchar *, ...) CX_GNUC_PRINTF(1, 2);
	#ifdef __GNUC__		void cx_printerr(const cxchar *, ...) CX_GNUC_PRINTF(1, 0);
	__attribute__((format (printf, 1, 2)))
	#endif
	;
	void cx_printerr(const cxchar *, ...)
	#ifdef __GNUC__
	__attribute__((format (printf, 1, 0)))
	#endif
	;
	/*		/*
	* Convenience functions		* Convenience functions
	*/		*/
	void cx_error(const cxchar *, ...)		void cx_error(const cxchar *, ...) CX_GNUC_PRINTF(1, 2);
	#ifdef __GNUC__		void cx_critical(const cxchar *, ...) CX_GNUC_PRINTF(1, 2);
	__attribute__((format (printf, 1, 2)))		void cx_warning(const cxchar *, ...) CX_GNUC_PRINTF(1, 2);
	#endif		void cx_message(const cxchar *, ...) CX_GNUC_PRINTF(1, 2);
	;
	void cx_critical(const cxchar *, ...)
	#ifdef __GNUC__
	__attribute__((format (printf, 1, 2)))
	#endif
	;
	void cx_warning(const cxchar *, ...)
	#ifdef __GNUC__
	__attribute__((format (printf, 1, 2)))
	#endif
	;
	void cx_message(const cxchar *, ...)
	#ifdef __GNUC__
	__attribute__((format (printf, 1, 2)))
	#endif
	;
	#ifndef CX_LOG_DOMAIN		#ifndef CX_LOG_DOMAIN
	# define CX_LOG_DOMAIN ((cxchar *)0)		# define CX_LOG_DOMAIN ((cxchar *)0)
	#endif		#endif
	/*		/*
	* Macros for error handling.		* Macros for error handling.
	*/		*/
	#ifdef CX_DISABLE_ASSERT		#ifdef CX_DISABLE_ASSERT
End of changes. 6 change blocks.
	46 lines changed or deleted		16 lines changed or added

	cxmultimap.h		cxmultimap.h
	/* $Id: cxmultimap.h,v 1.5 2006/06/12 09:57:33 rpalsa Exp $		/* $Id: cxmultimap.h,v 1.6 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: rpalsa $		* $Author: rpalsa $
	* $Date: 2006/06/12 09:57:33 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.5 $		* $Revision: 1.6 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_MULTIMAP_H		#ifndef CX_MULTIMAP_H
	#define CX_MULTIMAP_H		#define CX_MULTIMAP_H
	#include <cxmemory.h>		#include <cxmemory.h>
	#include <cxtree.h>		#include <cxtree.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
End of changes. 3 change blocks.
	5 lines changed or deleted		5 lines changed or added

	cxslist.h		cxslist.h
	/* $Id: cxslist.h,v 1.6 2006/06/12 09:54:44 rpalsa Exp $		/* $Id: cxslist.h,v 1.7 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: rpalsa $		* $Author: rpalsa $
	* $Date: 2006/06/12 09:54:44 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.6 $		* $Revision: 1.7 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_SLIST_H		#ifndef CX_SLIST_H
	#define CX_SLIST_H		#define CX_SLIST_H
	#include <cxmemory.h>		#include <cxmemory.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
	typedef struct _cx_slnode_ *cx_slist_iterator;		typedef struct _cx_slnode_ *cx_slist_iterator;
End of changes. 3 change blocks.
	5 lines changed or deleted		5 lines changed or added

	cxstring.h		cxstring.h
	/* $Id: cxstring.h,v 1.7 2009/12/07 15:48:15 llundin Exp $		/* $Id: cxstring.h,v 1.8 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2009/12/07 15:48:15 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.7 $		* $Revision: 1.8 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_STRING_H_		#ifndef CX_STRING_H_
	#define CX_STRING_H_ 1		#define CX_STRING_H_ 1
	#include <stdarg.h>		#include <stdarg.h>
	#include <string.h>		#include <string.h>
	#include <ctype.h>		#include <ctype.h>
	#include <cxtypes.h>		#include <cxtypes.h>
	skipping to change at line 121		skipping to change at line 121
	cxbool cx_string_equal (const cx_string *, const cx_string *);		cxbool cx_string_equal (const cx_string *, const cx_string *);
	cxint cx_string_compare(const cx_string *, const cx_string *);		cxint cx_string_compare(const cx_string *, const cx_string *);
	cxint cx_string_casecmp(const cx_string *, const cx_string *);		cxint cx_string_casecmp(const cx_string *, const cx_string *);
	cxint cx_string_ncasecmp(const cx_string *, const cx_string *, cxsize);		cxint cx_string_ncasecmp(const cx_string *, const cx_string *, cxsize);
	/*		/*
	* I/O functions		* I/O functions
	*/		*/
	cxint cx_string_sprintf(cx_string *, const cxchar *, ...)		cxint cx_string_sprintf(cx_string *,
	#ifdef __GNUC__		const cxchar *, ...) CX_GNUC_PRINTF(2, 3);
	__attribute__((format (printf, 2, 3)))		cxint cx_string_vsprintf(cx_string *,
	#endif		const cxchar *, va_list) CX_GNUC_PRINTF(2, 0);
	;
	cxint cx_string_vsprintf(cx_string *, const cxchar *, va_list)
	#ifdef __GNUC__
	__attribute__((format (printf, 2, 0)))
	#endif
	;
	/*		/*
	* Debugging utilities		* Debugging utilities
	*/		*/
	void cx_string_print(const cx_string *);		void cx_string_print(const cx_string *);
	CX_END_DECLS		CX_END_DECLS
	#endif /* CX_STRING_H */		#endif /* CX_STRING_H */
End of changes. 4 change blocks.
	16 lines changed or deleted		10 lines changed or added

	cxstrutils.h		cxstrutils.h
	/* $Id: cxstrutils.h,v 1.5 2009/12/07 15:48:15 llundin Exp $		/* $Id: cxstrutils.h,v 1.6 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2009/12/07 15:48:15 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.5 $		* $Revision: 1.6 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_STRUTILS_H		#ifndef CX_STRUTILS_H
	#define CX_STRUTILS_H		#define CX_STRUTILS_H
	#include <stdarg.h>		#include <stdarg.h>
	#include <cxtypes.h>		#include <cxtypes.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
	skipping to change at line 67		skipping to change at line 67
	*/		*/
	cxchar *cx_strskip(const cxchar *, cxint (*)(cxint));		cxchar *cx_strskip(const cxchar *, cxint (*)(cxint));
	/*		/*
	* Utilities returning a newly allocated string.		* Utilities returning a newly allocated string.
	*/		*/
	cxchar *cx_strdup(const cxchar *);		cxchar *cx_strdup(const cxchar *);
	cxchar *cx_strndup(const cxchar *, cxsize);		cxchar *cx_strndup(const cxchar *, cxsize);
	cxchar *cx_strvdupf(const cxchar *, va_list)		cxchar *cx_strvdupf(const cxchar *, va_list) CX_GNUC_PRINTF(1, 0);
	#ifdef __GNUC__
	__attribute__((format (printf, 1, 0)))
	#endif
	;
	cxchar *cx_stpcpy(cxchar *, const cxchar *);		cxchar *cx_stpcpy(cxchar *, const cxchar *);
	cxchar **cx_strsplit(const cxchar *, const cxchar *, cxint);		cxchar **cx_strsplit(const cxchar *, const cxchar *, cxint);
	void cx_strfreev(cxchar **sarray);		void cx_strfreev(cxchar **sarray);
	cxchar *cx_strjoinv(const cxchar *, cxchar **);		cxchar *cx_strjoinv(const cxchar *, cxchar **);
	CX_END_DECLS		CX_END_DECLS
End of changes. 4 change blocks.
	11 lines changed or deleted		7 lines changed or added

	cxtree.h		cxtree.h
	/* $Id: cxtree.h,v 1.4 2006/06/12 09:54:44 rpalsa Exp $		/* $Id: cxtree.h,v 1.5 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: rpalsa $		* $Author: rpalsa $
	* $Date: 2006/06/12 09:54:44 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.4 $		* $Revision: 1.5 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_TREE_H		#ifndef CX_TREE_H
	#define CX_TREE_H		#define CX_TREE_H
	#include <cxmemory.h>		#include <cxmemory.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
	typedef struct _cx_tnode_ *cx_tree_iterator;		typedef struct _cx_tnode_ *cx_tree_iterator;
End of changes. 3 change blocks.
	5 lines changed or deleted		5 lines changed or added

	cxtypes.h		cxtypes.h
	/* $Id: cxtypes.h,v 1.2 2009/02/11 12:27:50 llundin Exp $		/* $Id: cxtypes.h,v 1.3 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	#ifndef _CX_TYPES_H		#ifndef _CX_TYPES_H
	#define _CX_TYPES_H		#define _CX_TYPES_H
	#ifdef HAVE_CONFIG_H		#include <cxconfig.h>
	#include <config.h>
	#endif
	#include <limits.h>
	#include <float.h>
	#include <cxmacros.h>		#include <cxmacros.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
	/*		/*
	* Some mathematical constants. Some strict ISO C implementations		* Some mathematical constants. Some strict ISO C implementations
	* don't provide them as symbols.		* don't provide them as symbols. The constants provide enough
			* digits for the 128 bit IEEE quad
	*/		*/
	/* Deprecated, use constants from cpl_math_const.h instead. */		#define CX_E 2.7182818284590452353602874713526625L
			#define CX_LN2 0.6931471805599453094172321214581766L
	#define CX_PI 3.14159265358979323846e0		#define CX_LN10 2.3025850929940456840179914546843642L
			#define CX_PI 3.1415926535897932384626433832795029L
			#define CX_PI_2 1.5707963267948966192313216916397514L
			#define CX_PI_4 0.7853981633974483096156608458198757L
			#define CX_SQRT2 1.4142135623730950488016887242096981L
	/*		/*
	* Limits for numerical data types		* Minimum and maximum constants for fixed size integer types
	*/		*/
	#define CX_MINSHORT SHRT_MIN		#define CX_MININT8 ((cxint8) 0x80)
	#define CX_MAXSHORT SHRT_MAX		#define CX_MAXINT8 ((cxint8) 0x7f)
	#define CX_MAXUSHORT USHRT_MAX		#define CX_MAXUINT8 ((cxuint8) 0xff)
	#define CX_MININT INT_MIN
	#define CX_MAXINT INT_MAX
	#define CX_MAXUINT UINT_MAX
	#define CX_MINLONG LONG_MIN
	#define CX_MAXLONG LONG_MAX
	#define CX_MAXULONG ULONG_MAX
	#define CX_MINFLOAT FLT_MIN
	#define CX_MAXFLOAT FLT_MAX
	#define CX_MINDOUBLE DBL_MIN
	#define CX_MAXDOUBLE DBL_MAX
	#define CX_MININT64 ((cxint64) 0x8000000000000000)
	#define CX_MAXINT64 ((cxint64) 0x7fffffffffffffff)
	#define CX_MAXUINT64 ((cxuint64) 0xffffffffffffffff)
	/*
	* Sized types
	*/
	typedef signed char cxint8;		#define CX_MININT16 ((cxint16) 0x8000)
	typedef unsigned char cxuint8;		#define CX_MAXINT16 ((cxint16) 0x7fff)
	typedef signed short cxint16;		#define CX_MAXUINT16 ((cxuint16) 0xffff)
	typedef unsigned short cxuint16;
	typedef signed int cxint32;
	typedef unsigned int cxuint32;
	#if defined SIZEOF_LONG && SIZEOF_LONG == 8		#define CX_MININT32 ((cxint32) 0x80000000)
	CX_GNUC_EXTENSION typedef signed long cxint64;		#define CX_MAXINT32 ((cxint32) 0x7fffffff)
	CX_GNUC_EXTENSION typedef unsigned long cxuint64;		#define CX_MAXUINT32 ((cxuint32) 0xffffffff)
	#else
	CX_GNUC_EXTENSION typedef signed long long cxint64;
	CX_GNUC_EXTENSION typedef unsigned long long cxuint64;
	#endif
	#if defined SIZEOF_SIZE_T && SIZEOF_SIZE_T == 8		#define CX_MININT64 ((cxint64) CX_INT64_CONSTANT(0x8000000000000000))
	typedef cxint64 cxssize;		#define CX_MAXINT64 CX_INT64_CONSTANT(0x7fffffffffffffff)
	typedef cxuint64 cxsize;		#define CX_MAXUINT64 CX_INT64_CONSTANT(0xffffffffffffffffU)
	#else
	typedef cxint32 cxssize;
	typedef cxuint32 cxsize;
	#endif
	/*		/*
	* For completeness: Definitions for standard types		* For completeness: Definitions for standard types
	*/		*/
	typedef char cxchar;		typedef char cxchar;
	typedef short cxshort;		typedef short cxshort;
	typedef int cxint;		typedef int cxint;
	typedef long cxlong;		typedef long cxlong;
			typedef cxint cxbool;
	typedef unsigned char cxbyte;
	typedef unsigned char cxuchar;		typedef unsigned char cxuchar;
	typedef unsigned short cxushort;		typedef unsigned short cxushort;
	typedef unsigned int cxuint;		typedef unsigned int cxuint;
	typedef unsigned long cxulong;		typedef unsigned long cxulong;
			typedef cxuchar cxbyte;
	typedef float cxfloat;		typedef float cxfloat;
	typedef double cxdouble;		typedef double cxdouble;
	typedef void * cxptr;		typedef void * cxptr;
	typedef const void * cxcptr;		typedef const void * cxcptr;
	typedef int cxbool;
	/*		/*
	* Generic, frequently used types.		* Generic, frequently used types.
	*/		*/
	typedef cxint (*cx_compare_func) (cxcptr a, cxcptr b);		typedef cxint (*cx_compare_func) (cxcptr a, cxcptr b);
	typedef cxint (*cx_compare_data_func) (cxcptr a, cxcptr b, cxptr data);		typedef cxint (*cx_compare_data_func) (cxcptr a, cxcptr b, cxptr data);
	typedef cxbool (*cx_equal_func) (cxcptr a, cxcptr b);		typedef cxbool (*cx_equal_func) (cxcptr a, cxcptr b);
			typedef void (*cx_free_func) (cxptr data);
	typedef void (*cx_free_func) (cxptr data);
	CX_END_DECLS		CX_END_DECLS
	#endif /* _CX_TYPES_H */		#endif /* _CX_TYPES_H */
End of changes. 18 change blocks.
	72 lines changed or deleted		37 lines changed or added

	cxutils.h		cxutils.h
	/* $Id: cxutils.h,v 1.5 2009/12/07 15:48:15 llundin Exp $		/* $Id: cxutils.h,v 1.6 2011/02/21 14:15:31 rpalsa Exp $
	*		*
	* This file is part of the ESO C Extension Library		* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory		* Copyright (C) 2001-2011 European Southern Observatory
	*		*
	* This program is free software; you can redistribute it and/or modify		* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by		* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or		* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.		* (at your option) any later version.
	*		*
	* This program is distributed in the hope that it will be useful,		* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of		* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.		* GNU General Public License for more details.
	*		*
	* You should have received a copy of the GNU General Public License		* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software		* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: rpalsa $
	* $Date: 2009/12/07 15:48:15 $		* $Date: 2011/02/21 14:15:31 $
	* $Revision: 1.5 $		* $Revision: 1.6 $
	* $Name: cpl-5_3_0-BRANCH $		* $Name: cpl-6_0 $
	*/		*/
	#ifndef CX_UTILS_H		#ifndef CX_UTILS_H
	#define CX_UTILS_H		#define CX_UTILS_H
	#include <stdarg.h>		#include <stdarg.h>
	#include <cxtypes.h>		#include <cxtypes.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
	skipping to change at line 56		skipping to change at line 56
	* Bit tests		* Bit tests
	*/		*/
	cxint cx_bits_find(cxuint32, cxint);		cxint cx_bits_find(cxuint32, cxint);
	cxint cx_bits_rfind(cxuint32, cxint);		cxint cx_bits_rfind(cxuint32, cxint);
	/*		/*
	* Miscellaneous utility functions		* Miscellaneous utility functions
	*/		*/
	cxint cx_snprintf(cxchar *, cxsize, const cxchar *, ...)		cxint cx_snprintf(cxchar *, cxsize,
	#ifdef __GNUC__		const cxchar *, ...) CX_GNUC_PRINTF(3, 4);
	__attribute__((format (printf, 3, 4)))		cxint cx_vsnprintf(cxchar *, cxsize,
	#endif		const cxchar *, va_list) CX_GNUC_PRINTF(3, 0);
	;		cxint cx_asprintf(cxchar **, const cxchar *, ...) CX_GNUC_PRINTF(2, 3);
	cxint cx_vsnprintf(cxchar *, cxsize, const cxchar *, va_list)		cxint cx_vasprintf(cxchar **, const cxchar *, va_list) CX_GNUC_PRINTF(2, 0)
	#ifdef __GNUC__		;
	__attribute__((format (printf, 3, 0)))
	#endif
	;
	cxint cx_asprintf(cxchar **, const cxchar *, ...)
	#ifdef __GNUC__
	__attribute__((format (printf, 2, 3)))
	#endif
	;
	cxint cx_vasprintf(cxchar **, const cxchar *, va_list)
	#ifdef __GNUC__
	__attribute__((format (printf, 2, 0)))
	#endif
	;
	cxchar *cx_line_alloc(void);		cxchar *cx_line_alloc(void);
	CX_END_DECLS		CX_END_DECLS
	#endif /* CX_UTILS_H */		#endif /* CX_UTILS_H */
End of changes. 4 change blocks.
	26 lines changed or deleted		13 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/