cpl.h		cpl.h
	/* $Id: cpl.h,v 1.31 2009/12/02 10:29:45 lbilbao Exp $		/* $Id: cpl.h,v 1.32 2013-03-25 10:22:28 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	*/		*/
	/*		/*
	* $Author: lbilbao $		* $Author: cgarcia $
	* $Date: 2009/12/02 10:29:45 $		* $Date: 2013-03-25 10:22:28 $
	* $Revision: 1.31 $		* $Revision: 1.32 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	/* 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. 3 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cpl_apertures.h		cpl_apertures.h
	/* $Id: cpl_apertures.h,v 1.11 2012/04/04 12:05:51 llundin Exp $		/* $Id: cpl_apertures.h,v 1.11 2012-04-04 12:05:51 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: 2012/04/04 12:05:51 $		* $Date: 2012-04-04 12:05:51 $
	* $Revision: 1.11 $		* $Revision: 1.11 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_APERTURES_H		#ifndef CPL_APERTURES_H
	#define CPL_APERTURES_H		#define CPL_APERTURES_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>		#include <stdio.h>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_apertures_img.h		cpl_apertures_img.h
	/* $Id: cpl_apertures_img.h,v 1.4 2011/04/19 09:05:08 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: 2011/04/19 09:05:08 $		* $Date: 2011-04-19 09:05:08 $
	* $Revision: 1.4 $		* $Revision: 1.4 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	/* Deprecated: Include cpl_apertures.h instead */		/* 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
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_array.h		cpl_array.h
	/* $Id: cpl_array.h,v 1.22 2012/02/27 16:12:47 rpalsa 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,
	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 US A		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US A
	*/		*/
	/*		/*
	* $Author: rpalsa $		* $Author: rpalsa $
	* $Date: 2012/02/27 16:12:47 $		* $Date: 2012-02-27 16:12:47 $
	* $Revision: 1.22 $		* $Revision: 1.22 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
	skipping to change at line 49		skipping to change at line 49
	typedef struct _cpl_array_ cpl_array;		typedef struct _cpl_array_ cpl_array;
	cpl_array *cpl_array_new(cpl_size, cpl_type);		cpl_array *cpl_array_new(cpl_size, cpl_type);
	cpl_array *cpl_array_wrap_int(int *, cpl_size);		cpl_array *cpl_array_wrap_int(int *, cpl_size);
	cpl_array *cpl_array_wrap_long(long *, cpl_size);		cpl_array *cpl_array_wrap_long(long *, cpl_size);
	cpl_array *cpl_array_wrap_long_long(long long *, cpl_size);		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_cplsize(cpl_size *, cpl_size);
	cpl_array *cpl_array_wrap_float(float *, cpl_size);		cpl_array *cpl_array_wrap_float(float *, cpl_size);
	cpl_array *cpl_array_wrap_double(double *, 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 *, cpl_size);		cpl_array *cpl_array_wrap_float_complex(_Complex float *, cpl_size);
	cpl_array *cpl_array_wrap_double_complex(double complex *, cpl_size);		cpl_array *cpl_array_wrap_double_complex(_Complex double *, cpl_size);
	#endif		#endif
	cpl_array *cpl_array_wrap_string(char **, cpl_size);		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(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_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_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 _Complex doub le *);
	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 _Complex float *);
	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 _Complex double *);
	#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 *);
	cpl_size 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 *, cpl_size);		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 *, cpl_size);		int cpl_array_is_valid(const cpl_array *, cpl_size);
	cpl_size cpl_array_count_invalid(const cpl_array *);		cpl_size cpl_array_count_invalid(const cpl_array *);
	skipping to change at line 91		skipping to change at line 91
	const long *cpl_array_get_data_long_const(const cpl_array *);		const long *cpl_array_get_data_long_const(const cpl_array *);
	long long *cpl_array_get_data_long_long(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 *);		const long long *cpl_array_get_data_long_long_const(const cpl_array *);
	cpl_size *cpl_array_get_data_cplsize(cpl_array *);		cpl_size *cpl_array_get_data_cplsize(cpl_array *);
	const cpl_size *cpl_array_get_data_cplsize_const(const 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 *);		_Complex float *cpl_array_get_data_float_complex(cpl_array *);
	const float complex *cpl_array_get_data_float_complex_const(const cpl_array		const _Complex float *cpl_array_get_data_float_complex_const(const cpl_arra
	*);		y *);
	const double complex *cpl_array_get_data_double_complex_const		const _Complex double *cpl_array_get_data_double_complex_const
	(const cpl_array *);		(const cpl_array *);
	double complex *cpl_array_get_data_double_complex(cpl_array *);		_Complex double *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 *, cpl_size, int *);		double cpl_array_get(const cpl_array *, cpl_size, int *);
	int cpl_array_get_int(const cpl_array *, cpl_size, int *);		int cpl_array_get_int(const cpl_array *, cpl_size, int *);
	long cpl_array_get_long(const cpl_array *, cpl_size, int *);		long cpl_array_get_long(const cpl_array *, cpl_size, int *);
	long long cpl_array_get_long_long(const cpl_array *, cpl_size, int *);		long long cpl_array_get_long_long(const cpl_array *, cpl_size, int *);
	cpl_size cpl_array_get_cplsize(const cpl_array *, cpl_size, int *);		cpl_size cpl_array_get_cplsize(const cpl_array *, cpl_size, int *);
	float cpl_array_get_float(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 *);		double cpl_array_get_double(const cpl_array *, cpl_size, int *);
	const char *cpl_array_get_string(const cpl_array *, cpl_size);		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 *, cpl_size, int *);		_Complex double cpl_array_get_complex(const cpl_array *, cpl_size, int *);
	float complex cpl_array_get_float_complex(const cpl_array *, cpl_size, int		_Complex float cpl_array_get_float_complex(const cpl_array *, cpl_size, int
	*);		*);
	double complex cpl_array_get_double_complex(const cpl_array *, cpl_size, in		_Complex double cpl_array_get_double_complex(const cpl_array *, cpl_size, i
	t *);		nt *);
	#endif		#endif
	cpl_error_code cpl_array_set(cpl_array *array, cpl_size, double);		cpl_error_code cpl_array_set(cpl_array *array, cpl_size, double);
	cpl_error_code cpl_array_set_int(cpl_array *, cpl_size, int);		cpl_error_code cpl_array_set_int(cpl_array *, cpl_size, int);
	cpl_error_code cpl_array_set_long(cpl_array *, cpl_size, long);		cpl_error_code cpl_array_set_long(cpl_array *, cpl_size, long);
	cpl_error_code cpl_array_set_long_long(cpl_array *, cpl_size, long long);		cpl_error_code cpl_array_set_long_long(cpl_array *, cpl_size, long long);
	cpl_error_code cpl_array_set_cplsize(cpl_array *, cpl_size, cpl_size);		cpl_error_code cpl_array_set_cplsize(cpl_array *, cpl_size, cpl_size);
	cpl_error_code cpl_array_set_float(cpl_array *, cpl_size, float);		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_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_string(cpl_array *, cpl_size, const char *);
	cpl_error_code cpl_array_set_invalid(cpl_array *, cpl_size);		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 *, cpl_size, double complex)		cpl_error_code cpl_array_set_complex(cpl_array *, cpl_size, _Complex double
	;		);
	cpl_error_code cpl_array_set_float_complex(cpl_array *, cpl_size, float com		cpl_error_code cpl_array_set_float_complex(cpl_array *, cpl_size, _Complex
	plex);		float);
	cpl_error_code cpl_array_set_double_complex(cpl_array *, cpl_size, double c		cpl_error_code cpl_array_set_double_complex(cpl_array *, cpl_size, _Complex
	omplex);		double);
	#endif		#endif
	cpl_error_code cpl_array_fill_window(cpl_array *, cpl_size, cpl_size, doubl e);		cpl_error_code cpl_array_fill_window(cpl_array *, cpl_size, cpl_size, doubl e);
	cpl_error_code cpl_array_fill_window_int(cpl_array *, cpl_size, cpl_size, i nt);		cpl_error_code cpl_array_fill_window_int(cpl_array *, cpl_size, cpl_size, i nt);
	cpl_error_code cpl_array_fill_window_long(cpl_array *, cpl_size, cpl_size, long);		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,		cpl_error_code cpl_array_fill_window_long_long(cpl_array *, cpl_size, cpl_s ize,
	long long);		long long);
	cpl_error_code cpl_array_fill_window_cplsize(cpl_array *, cpl_size, cpl_siz e,		cpl_error_code cpl_array_fill_window_cplsize(cpl_array *, cpl_size, cpl_siz e,
	cpl_size);		cpl_size);
	cpl_error_code cpl_array_fill_window_float(cpl_array *, cpl_size, cpl_size, float);		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_double(cpl_array *, cpl_size, cpl_size , double);
	cpl_error_code cpl_array_fill_window_string(cpl_array *, cpl_size, cpl_size ,		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 *,
	cpl_size, cpl_size, double com plex);		cpl_size, cpl_size, _Complex d ouble);
	cpl_error_code cpl_array_fill_window_float_complex(cpl_array *, cpl_size, c pl_size,		cpl_error_code cpl_array_fill_window_float_complex(cpl_array *, cpl_size, c pl_size,
	float complex);		_Complex float);
	cpl_error_code cpl_array_fill_window_double_complex(cpl_array *, cpl_size, cpl_size,		cpl_error_code cpl_array_fill_window_double_complex(cpl_array *, cpl_size, cpl_size,
	double complex);		_Complex double);
	#endif		#endif
	cpl_error_code cpl_array_fill_window_invalid(cpl_array *, cpl_size, cpl_siz e);		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 *, cpl_size start, cpl_size co unt);		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 *, cpl_size start, cpl_siz e count);		cpl_error_code cpl_array_insert_window(cpl_array *, cpl_size start, cpl_siz e count);
	cpl_error_code cpl_array_erase_window(cpl_array *, cpl_size start, cpl_size count);		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_insert(cpl_array *, const cpl_array *, cpl_size);
	skipping to change at line 169		skipping to change at line 169
	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 *);
	cpl_error_code cpl_array_arg(cpl_array *);		cpl_error_code cpl_array_arg(cpl_array *);
	cpl_error_code cpl_array_logarithm(cpl_array *, double);		cpl_error_code cpl_array_logarithm(cpl_array *, double);
	cpl_error_code cpl_array_power(cpl_array *, double);		cpl_error_code cpl_array_power(cpl_array *, double);
	cpl_error_code cpl_array_exponential(cpl_array *, double);		cpl_error_code cpl_array_exponential(cpl_array *, double);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_array_add_scalar_complex(cpl_array *, double complex);		cpl_error_code cpl_array_add_scalar_complex(cpl_array *, _Complex double);
	cpl_error_code cpl_array_subtract_scalar_complex(cpl_array *, double comple		cpl_error_code cpl_array_subtract_scalar_complex(cpl_array *, _Complex doub
	x);		le);
	cpl_error_code cpl_array_multiply_scalar_complex(cpl_array *, double comple		cpl_error_code cpl_array_multiply_scalar_complex(cpl_array *, _Complex doub
	x);		le);
	cpl_error_code cpl_array_divide_scalar_complex(cpl_array *, double complex)		cpl_error_code cpl_array_divide_scalar_complex(cpl_array *, _Complex double
	;		);
	#endif		#endif
	#ifdef _Complex_I		#ifdef _Complex_I
	double complex cpl_array_get_mean_complex(const cpl_array *);		_Complex double 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 *, cpl_size *);		cpl_error_code cpl_array_get_maxpos(const cpl_array *, cpl_size *);
	cpl_error_code cpl_array_get_minpos(const cpl_array *, cpl_size *);		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 *);
End of changes. 16 change blocks.
	35 lines changed or deleted		35 lines changed or added

	cpl_bivector.h		cpl_bivector.h
	/* $Id: cpl_bivector.h,v 1.15 2011/02/28 15:45:20 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: 2011/02/28 15:45:20 $		* $Date: 2011-02-28 15:45:20 $
	* $Revision: 1.15 $		* $Revision: 1.15 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_detector.h		cpl_detector.h
	/* $Id: cpl_detector.h,v 1.8 2011/07/29 12:04:06 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: 2011/07/29 12:04:06 $		* $Date: 2011-07-29 12:04:06 $
	* $Revision: 1.8 $		* $Revision: 1.8 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_dfs.h		cpl_dfs.h
	/* $Id: cpl_dfs.h,v 1.17 2011/04/01 09:57:38 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: 2011/04/01 09:57:38 $		* $Date: 2011-04-01 09:57:38 $
	* $Revision: 1.17 $		* $Revision: 1.17 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_error.h		cpl_error.h
	/* $Id: cpl_error.h,v 1.81.2.1 2013/05/02 09:39:31 llundin Exp $		/* $Id: cpl_error.h,v 1.83 2013-10-14 11:21:00 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: 2013/05/02 09:39:31 $		* $Date: 2013-10-14 11:21:00 $
	* $Revision: 1.81.2.1 $		* $Revision: 1.83 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
	skipping to change at line 180		skipping to change at line 180
	y = cpl_table_get_int(table, "y", 0, NULL),		y = cpl_table_get_int(table, "y", 0, NULL),
	z = cpl_table_get_int(table, "z", 0, NULL)),		z = cpl_table_get_int(table, "z", 0, NULL)),
	"Error reading wavelength catalogue");		"Error reading wavelength catalogue");
	@endcode		@endcode
	*/		*/
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
	#if defined CPL_HAVE_VA_ARGS && CPL_HAVE_VA_ARGS == 1 || defined DOXYGEN_SK IP		#if defined CPL_HAVE_VA_ARGS && CPL_HAVE_VA_ARGS == 1 || defined DOXYGEN_SK IP
	#define cpl_error_ensure(CONDITION, CODE, ACTION, ...) \		#define cpl_error_ensure(CONDITION, CODE, ACTION, ...) \
	do if (!(CONDITION)) { \		do if (CPL_UNLIKELY(!(CONDITION))) { \
	/* Evaluate exactly once using a name-space protected variable name */ \		/* Evaluate exactly once using a name-space protected variable name */ \
	const cpl_error_code cpl_ensure_error = (CODE); \		const cpl_error_code cpl_ensure_error = (CODE); \
	(void)cpl_error_set_message_macro(cpl_func, cpl_ensure_error \		(void)cpl_error_set_message_macro(cpl_func, cpl_ensure_error \
	? cpl_ensure_error : \		? cpl_ensure_error : \
	CPL_ERROR_UNSPECIFIED, \		CPL_ERROR_UNSPECIFIED, \
	__FILE__, __LINE__, __VA_ARGS__) ; \		__FILE__, __LINE__, __VA_ARGS__) ; \
	ACTION; \		ACTION; \
	} while (0)		} while (0)
	#else		#else
	#define cpl_error_ensure(CONDITION, CODE, ACTION, MSG) \		#define cpl_error_ensure(CONDITION, CODE, ACTION, MSG) \
	do if (!(CONDITION)) { \		do if (CPL_UNLIKELY(!(CONDITION))) { \
	/* Evaluate exactly once using a name-space protected variable name */ \		/* Evaluate exactly once using a name-space protected variable name */ \
	const cpl_error_code cpl_ensure_error = (CODE); \		const cpl_error_code cpl_ensure_error = (CODE); \
	(void)cpl_error_set_message_one_macro(cpl_func, cpl_ensure_error \		(void)cpl_error_set_message_one_macro(cpl_func, cpl_ensure_error \
	? cpl_ensure_error : \		? cpl_ensure_error : \
	CPL_ERROR_UNSPECIFIED, \		CPL_ERROR_UNSPECIFIED, \
	__FILE__, __LINE__, MSG); \		__FILE__, __LINE__, MSG); \
	ACTION; \		ACTION; \
	} while (0)		} while (0)
	#endif		#endif
End of changes. 4 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cpl_errorstate.h		cpl_errorstate.h
	/* $Id: cpl_errorstate.h,v 1.8 2011/11/30 15:59:22 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: 2011/11/30 15:59:22 $		* $Date: 2011-11-30 15:59:22 $
	* $Revision: 1.8 $		* $Revision: 1.8 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_fft.h		cpl_fft.h
	/* $Id: cpl_fft.h,v 1.8 2013/01/24 17:21:52 cgarcia Exp $		/* $Id: cpl_fft.h,v 1.8 2013-01-24 17:21:52 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,
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cpl_filter.h		cpl_filter.h
	/* $Id: cpl_filter.h,v 1.25 2012/12/14 13:50:08 llundin Exp $		/* $Id: cpl_filter.h,v 1.25 2012-12-14 13:50: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: 2012/12/14 13:50:08 $		* $Date: 2012-12-14 13:50:08 $
	* $Revision: 1.25 $		* $Revision: 1.25 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_fit.h		cpl_fit.h
	/* $Id: cpl_fit.h,v 1.10 2011/07/27 14:18:36 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: 2011/07/27 14:18:36 $		* $Date: 2011-07-27 14:18:36 $
	* $Revision: 1.10 $		* $Revision: 1.10 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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 107		skipping to change at line 107
	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*,
	cpl_size, cpl_size,		cpl_size, cpl_size,
	cpl_size, cpl_size,		cpl_size, cpl_size,
	cpl_array*, cpl_array*,		cpl_array*, cpl_array*,
	const cpl_array*, double*,		const cpl_array*, double*,
	double*, cpl_matrix**,		double*, cpl_matrix**,
	double*, double*,		double*, double*,
	double*, cpl_matrix**);		double*, cpl_matrix**);
			double cpl_gaussian_eval_2d(const cpl_array *, double, double);
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
	/* end of cpl_fit.h */		/* end of cpl_fit.h */
End of changes. 4 change blocks.
	3 lines changed or deleted		5 lines changed or added

	cpl_fits.h		cpl_fits.h
	/* $Id: cpl_fits.h,v 1.9 2012/05/11 12:24:00 llundin Exp $		/* $Id: cpl_fits.h,v 1.9 2012-05-11 12:24:00 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: 2012/05/11 12:24:00 $		* $Date: 2012-05-11 12:24:00 $
	* $Revision: 1.9 $		* $Revision: 1.9 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_frame.h		cpl_frame.h
	/* $Id: cpl_frame.h,v 1.20 2013/01/10 13:18:50 rpalsa Exp $		/* $Id: cpl_frame.h,v 1.20 2013-01-10 13:18:50 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2013/01/10 13:18:50 $		* $Date: 2013-01-10 13:18:50 $
	* $Revision: 1.20 $		* $Revision: 1.20 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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_type.h>
	#include <cpl_error.h>		#include <cpl_error.h>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_framedata.h		cpl_framedata.h
	/* $Id: cpl_framedata.h,v 1.4 2012/01/11 13:38:29 rpalsa 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2012/01/11 13:38:29 $		* $Date: 2012-01-11 13:38:29 $
	* $Revision: 1.4 $		* $Revision: 1.4 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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_type.h>
	#include <cpl_error.h>		#include <cpl_error.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_frameset.h		cpl_frameset.h
	/* $Id: cpl_frameset.h,v 1.24 2013/01/24 07:50:20 rpalsa Exp $		/* $Id: cpl_frameset.h,v 1.25 2013-08-28 06:44:37 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2013/01/24 07:50:20 $		* $Date: 2013-08-28 06:44:37 $
	* $Revision: 1.24 $		* $Revision: 1.25 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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_type.h>
	#include <cpl_frame.h>		#include <cpl_frame.h>
	skipping to change at line 78		skipping to change at line 78
	*/		*/
	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);
	/*		/*
	* Sequential access		* Sequential access
	*/		*/
	const cpl_frame *cpl_frameset_get_first_const(const cpl_frameset *self);		const cpl_frame *cpl_frameset_get_first_const(const cpl_frameset *self) CPL
	cpl_frame *cpl_frameset_get_first(cpl_frameset *self);		_ATTR_DEPRECATED;
			cpl_frame *cpl_frameset_get_first(cpl_frameset *self) CPL_ATTR_DEPRECATED;
	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_
	cpl_frame *cpl_frameset_get_next(cpl_frameset *self);		ATTR_DEPRECATED;
			cpl_frame *cpl_frameset_get_next(cpl_frameset *self) CPL_ATTR_DEPRECATED;
	/*		/*
	* 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);
	cpl_size 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);
	/*		/*
	skipping to change at line 123		skipping to change at line 123
	cpl_frameset *cpl_frameset_extract(const cpl_frameset *self,		cpl_frameset *cpl_frameset_extract(const cpl_frameset *self,
	const cpl_size *labels,		const cpl_size *labels,
	cpl_size desired_label) CPL_ATTR_ALLOC;		cpl_size desired_label) CPL_ATTR_ALLOC;
	cpl_size *cpl_frameset_labelise(const cpl_frameset *self,		cpl_size *cpl_frameset_labelise(const cpl_frameset *self,
	int (*compare)(const cpl_frame *,		int (*compare)(const cpl_frame *,
	const cpl_frame *), cpl_size *nb_labels);		const cpl_frame *), cpl_size *nb_labels);
	void cpl_frameset_dump(const cpl_frameset *self, FILE *stream);		void cpl_frameset_dump(const cpl_frameset *self, FILE *stream);
			/*
			* Iterator support for frame sets
			*/
			/**
			* @ingroup cpl_frameset_iterator
			*
			* @brief
			* The frame set iterator data type.
			*
			* This data type is opaque.
			*/
			typedef struct _cpl_frameset_iterator_ cpl_frameset_iterator;
			/*
			* Iterator create, copy and destroy operations
			*/
			cpl_frameset_iterator *
			cpl_frameset_iterator_new(const cpl_frameset *parent) CPL_ATTR_ALLOC;
			cpl_frameset_iterator *
			cpl_frameset_iterator_duplicate(const cpl_frameset_iterator *other) CPL_ATT
			R_ALLOC;
			void cpl_frameset_iterator_delete(cpl_frameset_iterator *self);
			/*
			* Iterator assignment
			*/
			cpl_error_code
			cpl_frameset_iterator_assign(cpl_frameset_iterator *self,
			const cpl_frameset_iterator *other);
			/*
			* Iterator positioning
			*/
			cpl_error_code cpl_frameset_iterator_advance(cpl_frameset_iterator *self,
			int distance);
			int cpl_frameset_iterator_distance(const cpl_frameset_iterator *self,
			const cpl_frameset_iterator *other);
			void cpl_frameset_iterator_reset(cpl_frameset_iterator *self);
			/*
			* Iterator data access
			*/
			cpl_frame *cpl_frameset_iterator_get(cpl_frameset_iterator *self);
			const cpl_frame *
			cpl_frameset_iterator_get_const(const cpl_frameset_iterator *self);
	CPL_END_DECLS		CPL_END_DECLS
	#endif /* CPL_FRAMESET_H */		#endif /* CPL_FRAMESET_H */
End of changes. 5 change blocks.
	8 lines changed or deleted		65 lines changed or added

	cpl_frameset_io.h		cpl_frameset_io.h
	/* $Id: cpl_frameset_io.h,v 1.6 2011/07/21 07:36:33 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: 2011/07/21 07:36:33 $		* $Date: 2011-07-21 07:36:33 $
	* $Revision: 1.6 $		* $Revision: 1.6 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_geom_img.h		cpl_geom_img.h
	/* $Id: cpl_geom_img.h,v 1.8 2011/11/15 12:41:28 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: 2011/11/15 12:41:28 $		* $Date: 2011-11-15 12:41:28 $
	* $Revision: 1.8 $		* $Revision: 1.8 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_image.h		cpl_image.h
	/* $Id: cpl_image.h,v 1.51 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_image.h,v 1.51 2010-11-11 09:23: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: 2010-11-11 09:23:18 $
	* $Revision: 1.51 $		* $Revision: 1.51 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_image_basic.h		cpl_image_basic.h
	/* $Id: cpl_image_basic.h,v 1.49 2011/07/20 08:49:07 llundin Exp $		/* $Id: cpl_image_basic.h,v 1.50 2013-07-24 09:45: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: 2011/07/20 08:49:07 $		* $Date: 2013-07-24 09:45:53 $
	* $Revision: 1.49 $		* $Revision: 1.50 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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 91		skipping to change at line 91
	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_error_code cpl_image_hypot(cpl_image *,
			const cpl_image *,
			const cpl_image *);
			cpl_error_code cpl_image_and(cpl_image *,
			const cpl_image *,
			const cpl_image *);
			cpl_error_code cpl_image_or(cpl_image *,
			const cpl_image *,
			const cpl_image *);
			cpl_error_code cpl_image_xor(cpl_image *,
			const cpl_image *,
			const cpl_image *);
			cpl_error_code cpl_image_not(cpl_image *,
			const cpl_image *);
			cpl_error_code cpl_image_and_scalar(cpl_image *,
			const cpl_image *,
			cpl_bitmask);
			cpl_error_code cpl_image_or_scalar(cpl_image *,
			const cpl_image *,
			cpl_bitmask);
			cpl_error_code cpl_image_xor_scalar(cpl_image *,
			const cpl_image *,
			cpl_bitmask);
	cpl_image * cpl_image_add_scalar_create(const cpl_image *, double)		cpl_image * cpl_image_add_scalar_create(const cpl_image *, double)
	CPL_ATTR_ALLOC;		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_subtract_scalar_create(const cpl_image *, double)		cpl_image * cpl_image_subtract_scalar_create(const cpl_image *, double)
	CPL_ATTR_ALLOC;		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_multiply_scalar_create(const cpl_image *, double)		cpl_image * cpl_image_multiply_scalar_create(const cpl_image *, double)
	CPL_ATTR_ALLOC;		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_divide_scalar_create(const cpl_image *, double)		cpl_image * cpl_image_divide_scalar_create(const cpl_image *, double)
	CPL_ATTR_ALLOC;		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_power_create(const cpl_image *, double)		cpl_image * cpl_image_power_create(const cpl_image *, double)
End of changes. 3 change blocks.
	4 lines changed or deleted		30 lines changed or added

	cpl_image_bpm.h		cpl_image_bpm.h
	/* $Id: cpl_image_bpm.h,v 1.20 2012/12/07 13:51:34 llundin Exp $		/* $Id: cpl_image_bpm.h,v 1.20 2012-12-07 13:51:34 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: 2012/12/07 13:51:34 $		* $Date: 2012-12-07 13:51:34 $
	* $Revision: 1.20 $		* $Revision: 1.20 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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"
	skipping to change at line 65		skipping to change at line 65
	/**		/**
	* Not-a-Number (NaN)		* Not-a-Number (NaN)
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_VALUE_NAN = 1 << 1,		CPL_VALUE_NAN = 1 << 1,
	/**		/**
	* Plus Infinity		* Plus Infinity
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_VALUE_PLUSINF = 1 << 2,		CPL_VALUE_PLUSINF = 1 << 2,
	/**		/**
	* Minus Infinity		* Minus Infinity
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_VALUE_MINUSINF = 1 << 3,		CPL_VALUE_MINUSINF = 1 << 3,
	/**		/**
	* Zero		* Zero
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_VALUE_ZERO = 1 << 4,		CPL_VALUE_ZERO = 1 << 4,
	/**		/**
	* Infinity with any sign		* Infinity with any sign
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_VALUE_INF = CPL_VALUE_PLUSINF | CPL_VALUE_MINUSINF,		CPL_VALUE_INF = CPL_VALUE_PLUSINF | CPL_VALUE_MINUSINF,
	/**		/**
	* NaN or infinity with any sign		* NaN or infinity with any sign
	* @hideinitializer		* @hideinitializer
	*/		*/
	CPL_VALUE_NOTFINITE = CPL_VALUE_INF | CPL_VALUE_NAN		CPL_VALUE_NOTFINITE = CPL_VALUE_INF | CPL_VALUE_NAN
End of changes. 6 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cpl_image_filter.h		cpl_image_filter.h
	/* $Id: cpl_image_filter.h,v 1.25 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_image_filter.h,v 1.25 2010-11-11 09:23: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: 2010-11-11 09:23:18 $
	* $Revision: 1.25 $		* $Revision: 1.25 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_image_gen.h		cpl_image_gen.h
	/* $Id: cpl_image_gen.h,v 1.20 2011/07/21 08:03:53 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: 2011/07/21 08:03:53 $		* $Date: 2011-07-21 08:03:53 $
	* $Revision: 1.20 $		* $Revision: 1.20 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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"
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_image_io.h		cpl_image_io.h
	/* $Id: cpl_image_io.h,v 1.78 2012/03/13 09:31:59 llundin Exp $		/* $Id: cpl_image_io.h,v 1.79 2013-10-14 13:33: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: 2012/03/13 09:31:59 $		* $Date: 2013-10-14 13:33:06 $
	* $Revision: 1.78 $		* $Revision: 1.79 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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 62		skipping to change at line 62
	/* Image constructors */		/* Image constructors */
	cpl_image * cpl_image_new(cpl_size, cpl_size, cpl_type) CPL_ATTR_ALLOC;		cpl_image * cpl_image_new(cpl_size, cpl_size, cpl_type) CPL_ATTR_ALLOC;
	cpl_image * cpl_image_wrap(cpl_size, cpl_size, cpl_type, void *) CPL_ATTR_A LLOC;		cpl_image * cpl_image_wrap(cpl_size, cpl_size, cpl_type, void *) CPL_ATTR_A LLOC;
	cpl_image * cpl_image_wrap_double(cpl_size, cpl_size, double *) CPL_ATTR_AL LOC;		cpl_image * cpl_image_wrap_double(cpl_size, cpl_size, double *) CPL_ATTR_AL LOC;
	cpl_image * cpl_image_wrap_float(cpl_size, cpl_size, float *) CPL_ATTR_ALLO C;		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;		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(cpl_size, cpl_size,		cpl_image * cpl_image_wrap_double_complex(cpl_size, cpl_size,
	double complex *) CPL_ATTR_ALLOC;		_Complex double *) CPL_ATTR_ALLOC ;
	cpl_image * cpl_image_wrap_float_complex(cpl_size, cpl_size,		cpl_image * cpl_image_wrap_float_complex(cpl_size, cpl_size,
	float complex *) CPL_ATTR_ALLOC;		_Complex float *) CPL_ATTR_ALLOC;
	#endif		#endif
	cpl_image * cpl_image_load(const char *, cpl_type, cpl_size, cpl_size)		cpl_image * cpl_image_load(const char *, cpl_type, cpl_size, cpl_size)
	CPL_ATTR_ALLOC;		CPL_ATTR_ALLOC;
	cpl_image * cpl_image_load_window(const char *, cpl_type, cpl_size, cpl_siz e,		cpl_image * cpl_image_load_window(const char *, cpl_type, cpl_size, cpl_siz e,
	cpl_size, cpl_size, cpl_size, cpl_size)		cpl_size, cpl_size, cpl_size, cpl_size)
	CPL_ATTR_ALLOC;		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 *,
	cpl_size *) 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 *);
	cpl_size cpl_image_get_size_x(const cpl_image *);		cpl_size cpl_image_get_size_x(const cpl_image *);
	cpl_size 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 *, cpl_size, cpl_size, 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 *, cpl_size, cpl_size,		_Complex double cpl_image_get_complex(const cpl_image *, cpl_size, cpl_size ,
	int *);		int *);
	cpl_error_code cpl_image_set_complex(cpl_image *, cpl_size, cpl_size,		cpl_error_code cpl_image_set_complex(cpl_image *, cpl_size, cpl_size,
	double complex);		_Complex double);
	#endif		#endif
			cpl_mask * cpl_image_set_bpm(cpl_image *, cpl_mask *);
	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 *);		_Complex double * cpl_image_get_data_double_complex(cpl_image *);
	const double complex * cpl_image_get_data_double_complex_const(const cpl_im		const _Complex double * cpl_image_get_data_double_complex_const(const cpl_i
	age *);		mage *);
	float complex * cpl_image_get_data_float_complex(cpl_image *);		_Complex float * cpl_image_get_data_float_complex(cpl_image *);
	const float complex * cpl_image_get_data_float_complex_const(const cpl_imag		const _Complex float * cpl_image_get_data_float_complex_const(const cpl_ima
	e *);		ge *);
	#endif		#endif
	cpl_error_code cpl_image_conjugate(cpl_image *, const cpl_image *);		cpl_error_code cpl_image_conjugate(cpl_image *, const cpl_image *);
	cpl_error_code cpl_image_fill_re_im(cpl_image *, cpl_image *,		cpl_error_code cpl_image_fill_re_im(cpl_image *, cpl_image *,
	const cpl_image *);		const cpl_image *);
	cpl_error_code cpl_image_fill_abs_arg(cpl_image *, cpl_image *,		cpl_error_code cpl_image_fill_abs_arg(cpl_image *, cpl_image *,
	const cpl_image *);		const cpl_image *);
	/* Set functions */		/* Set functions */
	cpl_error_code cpl_image_set(cpl_image *, cpl_size, cpl_size, 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);
			cpl_error_code cpl_image_fill_window(cpl_image *, cpl_size, cpl_size,
			cpl_size, cpl_size, 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 *, cpl_size, cpl_size,		cpl_error_code cpl_image_dump_window(const cpl_image *, cpl_size, cpl_size,
	cpl_size, cpl_size, FILE *);		cpl_size, cpl_size, FILE *);
End of changes. 9 change blocks.
	14 lines changed or deleted		17 lines changed or added

	cpl_image_iqe.h		cpl_image_iqe.h
	/* $Id: cpl_image_iqe.h,v 1.6 2011/07/20 08:49:08 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: 2011/07/20 08:49:08 $		* $Date: 2011-07-20 08:49:08 $
	* $Revision: 1.6 $		* $Revision: 1.6 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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"
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_image_resample.h		cpl_image_resample.h
	/* $Id: cpl_image_resample.h,v 1.19 2011/07/20 11:20:40 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: 2011/07/20 11:20:40 $		* $Date: 2011-07-20 11:20:40 $
	* $Revision: 1.19 $		* $Revision: 1.19 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_image_stats.h		cpl_image_stats.h
	/* $Id: cpl_image_stats.h,v 1.29 2012/07/30 23:39:10 llundin Exp $		/* $Id: cpl_image_stats.h,v 1.29 2012-07-30 23:39:10 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: 2012/07/30 23:39:10 $		* $Date: 2012-07-30 23:39:10 $
	* $Revision: 1.29 $		* $Revision: 1.29 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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"
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_imagelist.h		cpl_imagelist.h
	/* $Id: cpl_imagelist.h,v 1.7 2011/04/08 08:43:28 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: 2011/04/08 08:43:28 $		* $Date: 2011-04-08 08:43:28 $
	* $Revision: 1.7 $		* $Revision: 1.7 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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;
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_imagelist_basic.h		cpl_imagelist_basic.h
	/* $Id: cpl_imagelist_basic.h,v 1.25 2011/07/20 14:32:39 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: 2011/07/20 14:32:39 $		* $Date: 2011-07-20 14:32:39 $
	* $Revision: 1.25 $		* $Revision: 1.25 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_IMAGELIST_BASIC_H		#ifndef CPL_IMAGELIST_BASIC_H
	#define CPL_IMAGELIST_BASIC_H		#define CPL_IMAGELIST_BASIC_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include "cpl_imagelist.h"		#include "cpl_imagelist.h"
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_imagelist_io.h		cpl_imagelist_io.h
	/* $Id: cpl_imagelist_io.h,v 1.30 2013/01/17 16:04:13 llundin Exp $		/* $Id: cpl_imagelist_io.h,v 1.30 2013-01-17 16:04:13 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: 2013/01/17 16:04:13 $		* $Date: 2013-01-17 16:04:13 $
	* $Revision: 1.30 $		* $Revision: 1.30 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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"
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_init.h		cpl_init.h
	/* $Id: cpl_init.h,v 1.9 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_init.h,v 1.9 2010-11-11 09:23: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: 2010-11-11 09:23:18 $
	* $Revision: 1.9 $		* $Revision: 1.9 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_io.h		cpl_io.h
	/* $Id: cpl_io.h,v 1.21 2013/02/21 17:14:53 cgarcia Exp $		/* $Id: cpl_io.h,v 1.21 2013-02-21 17:14:53 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,
	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: cgarcia $		* $Author: cgarcia $
	* $Date: 2013/02/21 17:14:53 $		* $Date: 2013-02-21 17:14:53 $
	* $Revision: 1.21 $		* $Revision: 1.21 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_macros.h		cpl_macros.h
	/* $Id: cpl_macros.h,v 1.11 2013/02/15 09:24:42 rpalsa Exp $		/* $Id: cpl_macros.h,v 1.12 2013-03-13 09:19:47 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,
	* 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: llundin $
	* $Date: 2013/02/15 09:24:42 $		* $Date: 2013-03-13 09:19:47 $
	* $Revision: 1.11 $		* $Revision: 1.12 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	/*		/*
	* 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>
	skipping to change at line 52		skipping to change at line 52
	#undef CPL_END_DECLS		#undef CPL_END_DECLS
	#define CPL_BEGIN_DECLS CX_BEGIN_DECLS		#define CPL_BEGIN_DECLS CX_BEGIN_DECLS
	#define CPL_END_DECLS CX_END_DECLS		#define CPL_END_DECLS CX_END_DECLS
	/* Needed to concatenate two and three macro arguments */		/* Needed to concatenate two and three macro arguments */
	#define CPL_CONCAT(a,b) a ## _ ## b		#define CPL_CONCAT(a,b) a ## _ ## b
	#define CPL_CONCAT2X(a,b) CPL_CONCAT(a,b)		#define CPL_CONCAT2X(a,b) CPL_CONCAT(a,b)
	#define CPL_CONCAT3X(a,b,c) CPL_CONCAT2X(CPL_CONCAT2X(a,b),c)		#define CPL_CONCAT3X(a,b,c) CPL_CONCAT2X(CPL_CONCAT2X(a,b),c)
			#define CPL_XSTRINGIFY(TOSTRING) #TOSTRING
			#define CPL_STRINGIFY(TOSTRING) CPL_XSTRINGIFY(TOSTRING)
	/*		/*
	(Try to) determine support for the function __attribute__		(Try to) determine support for the function __attribute__
	These attributes are used in CPL (from the given gcc version)		These attributes are used in CPL (from the given gcc version)
	2.3 format (used only from gcc 3)		2.3 format (used only from gcc 3)
	2.5 const (used only from gcc 3)		2.5 const (used only from gcc 3)
	2.96 pure (used only from gcc 3)		2.96 pure (used only from gcc 3)
	3.0 malloc		3.0 malloc
	skipping to change at line 102		skipping to change at line 105
	# define CPL_ATTR_ALLOC __attribute__((malloc, warn_unused_result))		# define CPL_ATTR_ALLOC __attribute__((malloc, warn_unused_result))
	# if __GNUC__ > 4 || __GNUC__ == 4 && defined __GNUC_MINOR__ && __GNUC_M INOR__ > 2		# if __GNUC__ > 4 || __GNUC__ == 4 && defined __GNUC_MINOR__ && __GNUC_M INOR__ > 2
	/* gcc 4.3 or higher */		/* gcc 4.3 or higher */
	# define CPL_ATTR_MALLOC \		# define CPL_ATTR_MALLOC \
	__attribute__((malloc, warn_unused_result, alloc_size(1)))		__attribute__((malloc, warn_unused_result, alloc_size(1)))
	# define CPL_ATTR_CALLOC \		# define CPL_ATTR_CALLOC \
	__attribute__((malloc, warn_unused_result, alloc_size(1,2)))		__attribute__((malloc, warn_unused_result, alloc_size(1,2)))
	# define CPL_ATTR_REALLOC \		# define CPL_ATTR_REALLOC \
	__attribute__((malloc, warn_unused_result, alloc_size(2)))		__attribute__((warn_unused_result, alloc_size(2)))
	# else		# else
	/* gcc 3.4 to 4.2 */		/* gcc 3.4 to 4.2 */
	# define CPL_ATTR_MALLOC __attribute__((malloc, warn_unused_result))		# define CPL_ATTR_MALLOC __attribute__((malloc, warn_unused_result))
	# define CPL_ATTR_CALLOC __attribute__((malloc, warn_unused_result))		# define CPL_ATTR_CALLOC __attribute__((malloc, warn_unused_result))
	# define CPL_ATTR_REALLOC __attribute__((malloc, warn_unused_result))		# define CPL_ATTR_REALLOC __attribute__((warn_unused_result))
	# endif		# endif
	# else		# else
	/* gcc 3.0 to 3.3 */		/* gcc 3.0 to 3.3 */
	# define CPL_ATTR_ALLOC __attribute__((malloc))		# define CPL_ATTR_ALLOC __attribute__((malloc))
	# define CPL_ATTR_MALLOC __attribute__((malloc))		# define CPL_ATTR_MALLOC __attribute__((malloc))
	# define CPL_ATTR_CALLOC __attribute__((malloc))		# define CPL_ATTR_CALLOC __attribute__((malloc))
	# define CPL_ATTR_REALLOC __attribute__((malloc))		# define CPL_ATTR_REALLOC /* __attribute__ */
	# endif		# endif
	# if __GNUC__ >= 4		# if __GNUC__ >= 4
	# define CPL_INTERNAL __attribute__((visibility("hidden")))		# define CPL_INTERNAL __attribute__((visibility("hidden")))
	# define CPL_EXPORT __attribute__((visibility("default")))		# define CPL_EXPORT __attribute__((visibility("default")))
	# endif		# endif
	#endif		#endif
			#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
			#define CPL_DIAG_PRAGMA_PUSH_IGN(x) \
			_Pragma("GCC diagnostic push") \
			_Pragma(CPL_STRINGIFY(GCC diagnostic ignored #x))
			#define CPL_DIAG_PRAGMA_PUSH_ERR(x) \
			_Pragma("GCC diagnostic push") \
			_Pragma(CPL_STRINGIFY(GCC diagnostic error #x))
			#define CPL_DIAG_PRAGMA_POP \
			_Pragma("GCC diagnostic pop")
			#else
			#define CPL_DIAG_PRAGMA_PUSH_IGN(x) /* pragma GCC diagnostic ignored */
			#define CPL_DIAG_PRAGMA_PUSH_ERR(x) /* pragma GCC diagnostic error */
			#define CPL_DIAG_PRAGMA_POP /* pragma GCC diagnostic pop */
			#endif
	#ifndef CPL_ATTR_ALLOC		#ifndef CPL_ATTR_ALLOC
	# define CPL_ATTR_ALLOC /* __attribute__ */		# define CPL_ATTR_ALLOC /* __attribute__ */
	#endif		#endif
	#ifndef CPL_ATTR_CALLOC		#ifndef CPL_ATTR_CALLOC
	# define CPL_ATTR_CALLOC /*__attribute__ */		# define CPL_ATTR_CALLOC /*__attribute__ */
	#endif		#endif
	#ifndef CPL_ATTR_CONST		#ifndef CPL_ATTR_CONST
	# define CPL_ATTR_CONST /* __attribute__ */		# define CPL_ATTR_CONST /* __attribute__ */
End of changes. 7 change blocks.
	8 lines changed or deleted		26 lines changed or added

	cpl_mask.h		cpl_mask.h
	/* $Id: cpl_mask.h,v 1.33 2011/08/11 11:08:33 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: 2011/08/11 11:08:33 $		* $Date: 2011-08-11 11:08:33 $
	* $Revision: 1.33 $		* $Revision: 1.33 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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;
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_math_const.h		cpl_math_const.h
	/* $Id: cpl_math_const.h,v 1.10 2012/10/01 14:50:02 llundin Exp $		/* $Id: cpl_math_const.h,v 1.10 2012-10-01 14:50:02 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: 2012/10/01 14:50:02 $		* $Date: 2012-10-01 14:50:02 $
	* $Revision: 1.10 $		* $Revision: 1.10 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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
	/**		/**
	skipping to change at line 274		skipping to change at line 274
	For a Gaussian distribution the Median Absolute Deviation (MAD) is a robu st		For a Gaussian distribution the Median Absolute Deviation (MAD) is a robu st
	and consistent estimate of the Standard Deviation (STD) in the sense that the		and consistent estimate of the Standard Deviation (STD) in the sense that the
	STD is approximately K * MAD, where K is a constant equal to approximatel y		STD is approximately K * MAD, where K is a constant equal to approximatel y
	1.4826.		1.4826.
	*/		*/
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
	#define CPL_MATH_STD_MAD 1.4826		#define CPL_MATH_STD_MAD 1.4826
			/*-------------------------------------------------------------------------
			---*/
			/**
			@hideinitializer
			@brief Return the minimum of two values
			@param first The first expression in the comparison
			@param second The second expression in the comparison
			@return The minimum of the two values
			@note If the first argument is the smallest then it is evaluated twice
			otherwise the second argument is evaluated twice
			*/
			/*-------------------------------------------------------------------------
			---*/
			#define CPL_MIN(first, second) \
			((first) < (second) ? (first) : (second)) /* Two evaluations of minimum
			*/
			/*-------------------------------------------------------------------------
			---*/
			/**
			@hideinitializer
			@brief Return the maximum of two values
			@param first The first expression in the comparison
			@param second The second expression in the comparison
			@return The maximum of the two values
			@see CPL_MIN()
			*/
			/*-------------------------------------------------------------------------
			---*/
			#define CPL_MAX(first, second) \
			((first) > (second) ? (first) : (second)) /* Two evaluations of maximum
			*/
	/**@}*/		/**@}*/
	CPL_END_DECLS		CPL_END_DECLS
	#endif		#endif
End of changes. 4 change blocks.
	3 lines changed or deleted		38 lines changed or added

	cpl_matrix.h		cpl_matrix.h
	/* $Id: cpl_matrix.h,v 1.40 2011/07/29 12:40:08 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: 2011/07/29 12:40:08 $		* $Date: 2011-07-29 12:40:08 $
	* $Revision: 1.40 $		* $Revision: 1.40 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_MATRIX_H		#ifndef CPL_MATRIX_H
	#define CPL_MATRIX_H		#define CPL_MATRIX_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_macros.h>		#include <cpl_macros.h>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_memory.h		cpl_memory.h
	/* $Id: cpl_memory.h,v 1.22 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_memory.h,v 1.22 2010-11-11 09:23: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-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 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: 2010-11-11 09:23:18 $
	* $Revision: 1.22 $		* $Revision: 1.22 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_msg.h		cpl_msg.h
	/* $Id: cpl_msg.h,v 1.18 2013/01/28 12:31:19 cgarcia Exp $		/* $Id: cpl_msg.h,v 1.18 2013-01-28 12:31:19 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,
	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: cgarcia $		* $Author: cgarcia $
	* $Date: 2013/01/28 12:31:19 $		* $Date: 2013-01-28 12:31:19 $
	* $Revision: 1.18 $		* $Revision: 1.18 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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_type.h>
	#include <cpl_error.h>		#include <cpl_error.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_parameter.h		cpl_parameter.h
	/* $Id: cpl_parameter.h,v 1.16 2013/02/11 13:30:57 rpalsa Exp $		/* $Id: cpl_parameter.h,v 1.16 2013-02-11 13:30:57 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2013/02/11 13:30:57 $		* $Date: 2013-02-11 13:30:57 $
	* $Revision: 1.16 $		* $Revision: 1.16 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_parameterlist.h		cpl_parameterlist.h
	/* $Id: cpl_parameterlist.h,v 1.10 2012/01/11 13:38:29 rpalsa 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2012/01/11 13:38:29 $		* $Date: 2012-01-11 13:38:29 $
	* $Revision: 1.10 $		* $Revision: 1.10 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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_type.h>
	#include <cpl_parameter.h>		#include <cpl_parameter.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_photom.h		cpl_photom.h
	/* $Id: cpl_photom.h,v 1.4 2011/07/21 09:45:24 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: 2011/07/21 09:45:24 $		* $Date: 2011-07-21 09:45:24 $
	* $Revision: 1.4 $		* $Revision: 1.4 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_PHOTOM_H		#ifndef CPL_PHOTOM_H
	#define CPL_PHOTOM_H		#define CPL_PHOTOM_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_macros.h>		#include <cpl_macros.h>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_phys_const.h		cpl_phys_const.h
	/* $Id: cpl_phys_const.h,v 1.9 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_phys_const.h,v 1.9 2010-11-11 09:23: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: 2010-11-11 09:23:18 $
	* $Revision: 1.9 $		* $Revision: 1.9 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_plot.h		cpl_plot.h
	/* $Id: cpl_plot.h,v 1.11 2011/07/21 08:35:14 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: 2011/07/21 08:35:14 $		* $Date: 2011-07-21 08:35:14 $
	* $Revision: 1.11 $		* $Revision: 1.11 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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"
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_plugin.h		cpl_plugin.h
	/* $Id: cpl_plugin.h,v 1.14 2011/01/11 10:33:18 llundin Exp $		/* $Id: cpl_plugin.h,v 1.14 2011-01-11 10:33: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-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 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/01/11 10:33:18 $		* $Date: 2011-01-11 10:33:18 $
	* $Revision: 1.14 $		* $Revision: 1.14 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_plugininfo.h		cpl_plugininfo.h
	/* $Id: cpl_plugininfo.h,v 1.5 2010/11/11 09:23:18 llundin Exp $		/* $Id: cpl_plugininfo.h,v 1.5 2010-11-11 09:23: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-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 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: 2010-11-11 09:23:18 $
	* $Revision: 1.5 $		* $Revision: 1.5 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_pluginlist.h		cpl_pluginlist.h
	/* $Id: cpl_pluginlist.h,v 1.8 2010/11/11 10:31:52 llundin Exp $		/* $Id: cpl_pluginlist.h,v 1.8 2010-11-11 10:31:52 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 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: 2010-11-11 10:31:52 $
	* $Revision: 1.8 $		* $Revision: 1.8 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_polynomial.h		cpl_polynomial.h
	/* $Id: cpl_polynomial.h,v 1.40 2011/12/14 12:29:06 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: 2011/12/14 12:29:06 $		* $Date: 2011-12-14 12:29:06 $
	* $Revision: 1.40 $		* $Revision: 1.40 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_POLYNOMIAL_H		#ifndef CPL_POLYNOMIAL_H
	#define CPL_POLYNOMIAL_H		#define CPL_POLYNOMIAL_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>		#include <stdio.h>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_ppm.h		cpl_ppm.h
	/* $Id: cpl_ppm.h,v 1.10 2011/08/02 11:59:57 rpalsa 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,
	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 US A		* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US A
	*/		*/
	/*		/*
	* $Author: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/08/02 11:59:57 $		* $Date: 2011-08-02 11:59:57 $
	* $Revision: 1.10 $		* $Revision: 1.10 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_property.h		cpl_property.h
	/* $Id: cpl_property.h,v 1.15 2012/05/21 14:29:54 rpalsa Exp $		/* $Id: cpl_property.h,v 1.15 2012-05-21 14:29:54 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2012/05/21 14:29:54 $		* $Date: 2012-05-21 14:29:54 $
	* $Revision: 1.15 $		* $Revision: 1.15 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_PROPERTY_H		#ifndef CPL_PROPERTY_H
	#define CPL_PROPERTY_H		#define CPL_PROPERTY_H
	#include <cpl_type.h>		#include <cpl_type.h>
	#include <cpl_error.h>		#include <cpl_error.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	skipping to change at line 80		skipping to change at line 80
	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_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);		_Complex double 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);		_Complex float 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);		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);		_Complex float cpl_property_get_float_complex(const cpl_property *self);
	double complex cpl_property_get_double_complex(const cpl_property *self);		_Complex double 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		7 lines changed or added

	cpl_propertylist.h		cpl_propertylist.h
	/* $Id: cpl_propertylist.h,v 1.25 2011/03/18 14:29:59 rpalsa 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/03/18 14:29:59 $		* $Date: 2011-03-18 14:29:59 $
	* $Revision: 1.25 $		* $Revision: 1.25 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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 122		skipping to change at line 122
	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
	cpl_error_code		cpl_error_code
	cpl_propertylist_set_float_complex(cpl_propertylist *self, const char *name ,		cpl_propertylist_set_float_complex(cpl_propertylist *self, const char *name ,
	float complex value);		_Complex float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_set_double_complex(cpl_propertylist *self, const char *nam e,		cpl_propertylist_set_double_complex(cpl_propertylist *self, const char *nam e,
	double complex value);		_Complex double value);
	#endif		#endif
	/*		/*
	* Element access		* Element access
	*/		*/
	const cpl_property *		const cpl_property *
	cpl_propertylist_get_const(const cpl_propertylist *self, long position);		cpl_propertylist_get_const(const cpl_propertylist *self, long position);
	cpl_property *		cpl_property *
	skipping to change at line 172		skipping to change at line 172
	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
	float complex		_Complex float
	cpl_propertylist_get_float_complex(const cpl_propertylist *self,		cpl_propertylist_get_float_complex(const cpl_propertylist *self,
	const char *name);		const char *name);
	double complex		_Complex double
	cpl_propertylist_get_double_complex(const cpl_propertylist *self,		cpl_propertylist_get_double_complex(const cpl_propertylist *self,
	const char *name);		const char *name);
	#endif		#endif
	/*		/*
	* Inserting and removing elements		* Inserting and removing elements
	*/		*/
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_char(cpl_propertylist *self, const char *here,		cpl_propertylist_insert_char(cpl_propertylist *self, const char *here,
	skipping to change at line 220		skipping to change at line 220
	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);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_float_complex(cpl_propertylist *self, const char *h ere,		cpl_propertylist_insert_float_complex(cpl_propertylist *self, const char *h ere,
	const char *name, float complex value );		const char *name, _Complex float valu e);
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_double_complex(cpl_propertylist *self, const char * here,		cpl_propertylist_insert_double_complex(cpl_propertylist *self, const char * here,
	const char *name, double complex val ue);		const char *name, _Complex double va lue);
	#endif		#endif
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_after_char(cpl_propertylist *self, const char *afte r,		cpl_propertylist_insert_after_char(cpl_propertylist *self, const char *afte r,
	const char *name, char value);		const char *name, char value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_after_bool(cpl_propertylist *self, const char *afte r,		cpl_propertylist_insert_after_bool(cpl_propertylist *self, const char *afte r,
	const char *name, int value);		const char *name, int value);
	skipping to change at line 264		skipping to change at line 264
	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);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_after_float_complex(cpl_propertylist *self,		cpl_propertylist_insert_after_float_complex(cpl_propertylist *self,
	const char *after, const char * name,		const char *after, const char * name,
	float complex value);		_Complex float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_insert_after_double_complex(cpl_propertylist *self,		cpl_propertylist_insert_after_double_complex(cpl_propertylist *self,
	const char *after,		const char *after,
	const char *name,		const char *name,
	double complex value);		_Complex double value);
	#endif		#endif
	cpl_error_code		cpl_error_code
	cpl_propertylist_prepend_char(cpl_propertylist *self, const char *name,		cpl_propertylist_prepend_char(cpl_propertylist *self, const char *name,
	char value);		char value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_prepend_bool(cpl_propertylist *self, const char *name,		cpl_propertylist_prepend_bool(cpl_propertylist *self, const char *name,
	int value);		int value);
	cpl_error_code		cpl_error_code
	skipping to change at line 307		skipping to change at line 307
	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);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code		cpl_error_code
	cpl_propertylist_prepend_float_complex(cpl_propertylist *self,		cpl_propertylist_prepend_float_complex(cpl_propertylist *self,
	const char *name,		const char *name,
	float complex value);		_Complex float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_prepend_double_complex(cpl_propertylist *self,		cpl_propertylist_prepend_double_complex(cpl_propertylist *self,
	const char *name,		const char *name,
	double complex value);		_Complex double value);
	#endif		#endif
	cpl_error_code		cpl_error_code
	cpl_propertylist_append_char(cpl_propertylist *self, const char *name,		cpl_propertylist_append_char(cpl_propertylist *self, const char *name,
	char value);		char value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_append_bool(cpl_propertylist *self, const char *name,		cpl_propertylist_append_bool(cpl_propertylist *self, const char *name,
	int value);		int value);
	skipping to change at line 350		skipping to change at line 350
	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);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code		cpl_error_code
	cpl_propertylist_append_float_complex(cpl_propertylist *self, const char *n ame,		cpl_propertylist_append_float_complex(cpl_propertylist *self, const char *n ame,
	float complex value);		_Complex float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_append_double_complex(cpl_propertylist *self, const char * name,		cpl_propertylist_append_double_complex(cpl_propertylist *self, const char * name,
	double complex value);		_Complex double value);
	#endif		#endif
	cpl_error_code		cpl_error_code
	cpl_propertylist_append(cpl_propertylist *self,		cpl_propertylist_append(cpl_propertylist *self,
	const cpl_propertylist *other);		const cpl_propertylist *other);
	int		int
	cpl_propertylist_erase(cpl_propertylist *self, const char *name);		cpl_propertylist_erase(cpl_propertylist *self, const char *name);
	int		int
	skipping to change at line 403		skipping to change at line 403
	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
	cpl_error_code		cpl_error_code
	cpl_propertylist_update_float_complex(cpl_propertylist *self, const char *n ame,		cpl_propertylist_update_float_complex(cpl_propertylist *self, const char *n ame,
	float complex value);		_Complex float value);
	cpl_error_code		cpl_error_code
	cpl_propertylist_update_double_complex(cpl_propertylist *self, const char * name,		cpl_propertylist_update_double_complex(cpl_propertylist *self, const char * name,
	double complex value);		_Complex double value);
	#endif		#endif
	/*		/*
	* Working on properties		* Working on properties
	*/		*/
	cpl_error_code		cpl_error_code
	cpl_propertylist_copy_property(cpl_propertylist *self,		cpl_propertylist_copy_property(cpl_propertylist *self,
	const cpl_propertylist *other,		const cpl_propertylist *other,
	const char *name);		const char *name);
End of changes. 17 change blocks.
	17 lines changed or deleted		17 lines changed or added

	cpl_recipe.h		cpl_recipe.h
	/* $Id: cpl_recipe.h,v 1.8 2012/11/05 09:10:01 rpalsa Exp $		/* $Id: cpl_recipe.h,v 1.8 2012-11-05 09:10:01 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2012/11/05 09:10:01 $		* $Date: 2012-11-05 09:10:01 $
	* $Revision: 1.8 $		* $Revision: 1.8 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_recipeconfig.h		cpl_recipeconfig.h
	/* $Id: cpl_recipeconfig.h,v 1.5 2012/01/11 13:38:29 rpalsa 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2012/01/11 13:38:29 $		* $Date: 2012-01-11 13:38:29 $
	* $Revision: 1.5 $		* $Revision: 1.5 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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_type.h>
	#include <cpl_framedata.h>		#include <cpl_framedata.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_recipedefine.h		cpl_recipedefine.h
	/* $Id: cpl_recipedefine.h,v 1.14 2011/08/19 19:57:07 llundin Exp $		/* $Id: cpl_recipedefine.h,v 1.15 2013-03-25 10:23:06 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-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 02111-1307 U SA		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: cgarcia $
	* $Date: 2011/08/19 19:57:07 $		* $Date: 2013-03-25 10:23:06 $
	* $Revision: 1.14 $		* $Revision: 1.15 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cpl_stats.h		cpl_stats.h
	/* $Id: cpl_stats.h,v 1.17 2012/07/30 23:39:10 llundin Exp $		/* $Id: cpl_stats.h,v 1.17 2012-07-30 23:39:10 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: 2012/07/30 23:39:10 $		* $Date: 2012-07-30 23:39:10 $
	* $Revision: 1.17 $		* $Revision: 1.17 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_STATS_H		#ifndef CPL_STATS_H
	#define CPL_STATS_H		#define CPL_STATS_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#ifdef HAVE_CONFIG_H		#ifdef HAVE_CONFIG_H
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cpl_table.h		cpl_table.h
	/* $Id: cpl_table.h,v 1.68 2013/01/23 16:06:32 rpalsa Exp $		/* $Id: cpl_table.h,v 1.68 2013-01-23 16:06:32 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-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: rpalsa $		* $Author: rpalsa $
	* $Date: 2013/01/23 16:06:32 $		* $Date: 2013-01-23 16:06:32 $
	* $Revision: 1.68 $		* $Revision: 1.68 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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 75		skipping to change at line 75
	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_long_long(cpl_table *, long long *, const cha r *);		cpl_error_code cpl_table_wrap_long_long(cpl_table *, long long *, const cha r *);
	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 *);		_Complex float *, const char *) ;
	cpl_error_code cpl_table_wrap_double_complex(cpl_table *,		cpl_error_code cpl_table_wrap_double_complex(cpl_table *,
	double complex *, const char * );		_Complex double *, const char *);
	#endif		#endif
	cpl_error_code cpl_table_wrap_string(cpl_table *, char **, const char *);		cpl_error_code cpl_table_wrap_string(cpl_table *, char **, const char *);
	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 *);
	/*		/*
	skipping to change at line 125		skipping to change at line 125
	long long *cpl_table_get_data_long_long(cpl_table *, const char *name);		long long *cpl_table_get_data_long_long(cpl_table *, const char *name);
	const long long *cpl_table_get_data_long_long_const(const cpl_table *,		const long long *cpl_table_get_data_long_long_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);
	#ifdef _Complex_I		#ifdef _Complex_I
	float complex *cpl_table_get_data_float_complex(cpl_table *, const char *na		_Complex float *cpl_table_get_data_float_complex(cpl_table *, const char *n
	me);		ame);
	const float complex *cpl_table_get_data_float_complex_const(const cpl_table		const _Complex float *cpl_table_get_data_float_complex_const(const cpl_tabl
	*,		e *,
	const char *nam e);		const char *nam e);
	double complex *cpl_table_get_data_double_complex(cpl_table *, const char *		_Complex double *cpl_table_get_data_double_complex(cpl_table *, const char
	);		*);
	const double complex *cpl_table_get_data_double_complex_const(const cpl_tab		const _Complex double *cpl_table_get_data_double_complex_const(const cpl_ta
	le *,		ble *,
	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 *, cpl_size, 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 *, cpl_size, int *null) ;		int cpl_table_get_int(const cpl_table *, const char *, cpl_size, int *null) ;
	long long cpl_table_get_long_long(const cpl_table *, const char *, cpl_size ,		long long cpl_table_get_long_long(const cpl_table *, const char *, cpl_size ,
	int *null);		int *null);
	float cpl_table_get_float(const cpl_table *, const char *, cpl_size, int *n ull);		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,		double cpl_table_get_double(const cpl_table *, const char *, cpl_size,
	int *null);		int *null);
	#ifdef _Complex_I		#ifdef _Complex_I
	double complex cpl_table_get_complex(const cpl_table *,		_Complex double cpl_table_get_complex(const cpl_table *,
	const char *, cpl_size, int *);		const char *, cpl_size, int *);
	float complex cpl_table_get_float_complex(const cpl_table *,		_Complex float cpl_table_get_float_complex(const cpl_table *,
	const char *, cpl_size, int *null );		const char *, cpl_size, int *null );
	double complex cpl_table_get_double_complex(const cpl_table *,		_Complex double cpl_table_get_double_complex(const cpl_table *,
	const char *, cpl_size, int *null );		const char *, cpl_size, int *null );
	#endif		#endif
	const char *cpl_table_get_string(const cpl_table *, const char *, cpl_size) ;		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 *, cpl_s ize);		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 *, cpl_size, 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 *, cpl_size, int);		cpl_error_code cpl_table_set_int(cpl_table *, const char *, cpl_size, int);
	cpl_error_code cpl_table_set_long_long(cpl_table *, const char *, cpl_size,		cpl_error_code cpl_table_set_long_long(cpl_table *, const char *, cpl_size,
	long long);		long long);
	cpl_error_code cpl_table_set_float(cpl_table *, const char *, cpl_size, flo at);		cpl_error_code cpl_table_set_float(cpl_table *, const char *, cpl_size, flo at);
	cpl_error_code cpl_table_set_double(cpl_table *, const char *, cpl_size,		cpl_error_code cpl_table_set_double(cpl_table *, const char *, cpl_size,
	double) ;		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 *, cpl_size, double complex );		const char *, cpl_size, _Complex doubl e);
	cpl_error_code cpl_table_set_float_complex(cpl_table *,		cpl_error_code cpl_table_set_float_complex(cpl_table *,
	const char *, cpl_size, float complex) ;		const char *, cpl_size, _Complex float );
	cpl_error_code cpl_table_set_double_complex(cpl_table *,		cpl_error_code cpl_table_set_double_complex(cpl_table *,
	const char *, cpl_size, double complex );		const char *, cpl_size, _Complex doubl e);
	#endif		#endif
	cpl_error_code cpl_table_set_string(cpl_table *, const char *, cpl_size,		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 *, cpl_size,		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 *,
	cpl_size, cpl_size, 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 *,
	cpl_size, cpl_size, int);		cpl_size, cpl_size, int);
	cpl_error_code cpl_table_fill_column_window_long_long(cpl_table *, const ch ar *,		cpl_error_code cpl_table_fill_column_window_long_long(cpl_table *, const ch ar *,
	cpl_size, cpl_size,		cpl_size, cpl_size,
	long long);		long long);
	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 * ,
	cpl_size, cpl_size, 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 *,
	cpl_size, cpl_size, 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 *,
	cpl_size, cpl_size, double complex);		cpl_size, cpl_size, _Complex double);
	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 *, cpl_size, cpl_size, float complex);		const char *, cpl_size, cpl_size, _Complex float);
	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 *, cpl_size, cpl_size, double complex);		const char *, cpl_size, cpl_size, _Complex double);
	#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 *,
	cpl_size, cpl_size, 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 * ,
	cpl_size, cpl_size, 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_long_long(cpl_table *, const char *,		cpl_error_code cpl_table_copy_data_long_long(cpl_table *, const char *,
	const long long *);		const long long *);
	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 _Complex float *);
	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 _Complex double *);
	#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 *, cpl_size);		cpl_error_code cpl_table_shift_column(cpl_table *, const char *, cpl_size);
	cpl_error_code cpl_table_set_invalid(cpl_table *, const char *, cpl_size);		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 *, cpl_size, cpl_siz e);		const char *, cpl_size, cpl_siz e);
	skipping to change at line 239		skipping to change at line 239
	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_long_long(cpl_table *, const char *,		cpl_error_code cpl_table_fill_invalid_long_long(cpl_table *, const char *,
	long long);		long long);
	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
	cpl_error_code cpl_table_fill_invalid_float_complex(cpl_table *, const char *,		cpl_error_code cpl_table_fill_invalid_float_complex(cpl_table *, const char *,
	float complex);		_Complex float);
	cpl_error_code cpl_table_fill_invalid_double_complex(cpl_table *, const cha r *,		cpl_error_code cpl_table_fill_invalid_double_complex(cpl_table *, const cha r *,
	double complex);		_Complex double);
	#endif		#endif
	cpl_error_code cpl_table_erase_column(cpl_table *, const char *);		cpl_error_code cpl_table_erase_column(cpl_table *, const char *);
	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_ATTR_DEPRECATE D;
	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 *, cpl_size);		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 *, cpl_size, cpl_size);		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 *);
	skipping to change at line 289		skipping to change at line 289
	const char *, const char *);		const char *, const char *);
	cpl_error_code cpl_table_divide_columns(cpl_table *,		cpl_error_code cpl_table_divide_columns(cpl_table *,
	const char *, const char *);		const char *, const char *);
	cpl_error_code cpl_table_add_scalar(cpl_table *, const char *, double);		cpl_error_code cpl_table_add_scalar(cpl_table *, const char *, double);
	cpl_error_code cpl_table_subtract_scalar(cpl_table *, const char *, double) ;		cpl_error_code cpl_table_subtract_scalar(cpl_table *, const char *, double) ;
	cpl_error_code cpl_table_multiply_scalar(cpl_table *, const char *, double) ;		cpl_error_code cpl_table_multiply_scalar(cpl_table *, const char *, double) ;
	cpl_error_code cpl_table_divide_scalar(cpl_table *, const char *, double);		cpl_error_code cpl_table_divide_scalar(cpl_table *, const char *, double);
	#ifdef _Complex_I		#ifdef _Complex_I
	cpl_error_code cpl_table_add_scalar_complex(cpl_table *,		cpl_error_code cpl_table_add_scalar_complex(cpl_table *,
	const char *, double complex);		const char *, _Complex double);
	cpl_error_code cpl_table_subtract_scalar_complex(cpl_table *,		cpl_error_code cpl_table_subtract_scalar_complex(cpl_table *,
	const char *, double compl ex);		const char *, _Complex dou ble);
	cpl_error_code cpl_table_multiply_scalar_complex(cpl_table *,		cpl_error_code cpl_table_multiply_scalar_complex(cpl_table *,
	const char *, double compl ex);		const char *, _Complex dou ble);
	cpl_error_code cpl_table_divide_scalar_complex(cpl_table *,		cpl_error_code cpl_table_divide_scalar_complex(cpl_table *,
	const char *, double complex );		const char *, _Complex doubl e);
	#endif		#endif
	cpl_error_code cpl_table_abs_column(cpl_table *, const char *);		cpl_error_code cpl_table_abs_column(cpl_table *, const char *);
	cpl_error_code cpl_table_logarithm_column(cpl_table *, const char *, double );		cpl_error_code cpl_table_logarithm_column(cpl_table *, const char *, double );
	cpl_error_code cpl_table_power_column(cpl_table *, const char *, double);		cpl_error_code cpl_table_power_column(cpl_table *, const char *, double);
	cpl_error_code cpl_table_exponential_column(cpl_table *, const char *, doub le);		cpl_error_code cpl_table_exponential_column(cpl_table *, const char *, doub le);
	cpl_error_code cpl_table_conjugate_column(cpl_table *, const char *);		cpl_error_code cpl_table_conjugate_column(cpl_table *, const char *);
	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 *);
	skipping to change at line 317		skipping to change at line 317
	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 *, cpl_size *);		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 *, cpl_size *);		const char *, cpl_size *);
	#ifdef _Complex_I		#ifdef _Complex_I
	double complex cpl_table_get_column_mean_complex(const cpl_table *,		_Complex double 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 *);
	cpl_size cpl_table_and_selected_window(cpl_table *, cpl_size, cpl_size);		cpl_size cpl_table_and_selected_window(cpl_table *, cpl_size, cpl_size);
	cpl_size cpl_table_or_selected_window(cpl_table *, cpl_size, cpl_size);		cpl_size cpl_table_or_selected_window(cpl_table *, cpl_size, cpl_size);
	skipping to change at line 357		skipping to change at line 357
	cpl_size 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);
	cpl_size 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);
	cpl_size 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);
	cpl_size 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
	cpl_size 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, _Complex flo at);
	cpl_size 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, _Complex flo at);
	cpl_size 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, _Complex do uble);
	cpl_size 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, _Complex do uble);
	#endif		#endif
	cpl_size 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 *);
	cpl_size 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 *);
	cpl_size 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 *);
	cpl_size cpl_table_or_selected(cpl_table *, const char *,		cpl_size cpl_table_or_selected(cpl_table *, const char *,
End of changes. 30 change blocks.
	36 lines changed or deleted		36 lines changed or added

	cpl_test.h		cpl_test.h
	/* $Id: cpl_test.h,v 1.62 2013/02/20 09:47:08 llundin Exp $		/* $Id: cpl_test.h,v 1.63 2013-04-04 13:10:32 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: 2013/02/20 09:47:08 $		* $Date: 2013-04-04 13:10:32 $
	* $Revision: 1.62 $		* $Revision: 1.63 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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 794		skipping to change at line 794
	cpl_test_image_abs_macro(cpl_test_errno, cpl_test_time, \		cpl_test_image_abs_macro(cpl_test_errno, cpl_test_time, \
	cpl_test_flops, cpl_test_state, first, \		cpl_test_flops, cpl_test_state, first, \
	#first, second, #second, tolerance, \		#first, second, #second, tolerance, \
	#tolerance, cpl_func, __FILE__, __LINE__) ; \		#tolerance, cpl_func, __FILE__, __LINE__) ; \
	} while (0)		} while (0)
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
	/**		/**
	@hideinitializer		@hideinitializer
	@ingroup cpl_test		@ingroup cpl_test
			@brief Test if two images are identical within a given (relative) tolera
			nce
			@param first The first image in the comparison
			@param second The second image of identical size in the comparison
			@param tolerance A non-negative tolerance
			@return void
			@see cpl_test_rel()
			@note The test will fail if one or both the images are NULL
			For each pixel position the two values x, y must pass the test:
			|x - y| <= tol * min(|x|, |y|).
			This definition is chosen since it is commutative and meaningful also for
			zero-valued pixels.
			*/
			/*-------------------------------------------------------------------------
			---*/
			#define cpl_test_image_rel(first, second, tolerance) do { \
			const int cpl_test_errno = errno; \
			const cpl_flops cpl_test_flops = cpl_test_get_flops(); \
			const double cpl_test_time = cpl_test_get_walltime(); \
			cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
			cpl_test_image_rel_macro(cpl_test_errno, cpl_test_time, \
			cpl_test_flops, cpl_test_state, first, \
			#first, second, #second, tolerance, \
			#tolerance, cpl_func, __FILE__, __LINE__)
			; \
			} while (0)
			/*-------------------------------------------------------------------------
			---*/
			/**
			@hideinitializer
			@ingroup cpl_test
	@brief Test if two imagelists are identical within a given (absolute)		@brief Test if two imagelists are identical within a given (absolute)
	tolerance		tolerance
	@param first The first imagelist in the comparison		@param first The first imagelist in the comparison
	@param second The second imagelist of identical size in the compari son		@param second The second imagelist of identical size in the compari son
	@param tolerance A non-negative tolerance		@param tolerance A non-negative tolerance
	@return void		@return void
	@see cpl_test_image_abs()		@see cpl_test_image_abs()
	@note The test will fail if one or both the imagelists are NULL		@note The test will fail if one or both the imagelists are NULL
	*/		*/
	skipping to change at line 853		skipping to change at line 883
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
	/**		/**
	@hideinitializer		@hideinitializer
	@ingroup cpl_test		@ingroup cpl_test
	@brief Test if two numerical expressions are within a given relative tole rance		@brief Test if two numerical expressions are within a given relative tole rance
	@param first The first value in the comparison, side-effects are allo wed		@param first The first value in the comparison, side-effects are allo wed
	@param second The second value in the comparison, side-effects are all owed		@param second The second value in the comparison, side-effects are all owed
	@param tolerance A non-negative tolerance		@param tolerance A non-negative tolerance
	@note If the tolerance is negative or if one but not both of the two val ues		@note If the tolerance is negative or if one but not both of the two val ues
	is zero, the test will always fail. if both values are zero, the t est		is zero, the test will always fail. If both values are zero, the t est
	will succeed for any non-negative tolerance. The test is commutati ve		will succeed for any non-negative tolerance. The test is commutati ve
	in the two values.		in the two values.
	@see cpl_test()		@see cpl_test()
	The test is carried out by comparing the absolute value of the difference		The test is carried out by comparing the absolute value of the difference
	abs (@em first - @em second)		abs (@em first - @em second)
	to the product of the tolerance and the minimum of the absolute value of		to the product of the tolerance and the minimum of the absolute value of
	the two values,		the two values,
	tolerance * min(abs(@em first), abs(@em second))		tolerance * min(abs(@em first), abs(@em second))
	(The test is implemented like this to avoid division with a number that m ay		(The test is implemented like this to avoid division with a number that m ay
	skipping to change at line 1068		skipping to change at line 1098
	const char *, double, const char *, const char *,		const char *, double, const char *, const char *,
	const char *, unsigned) CPL_ATTR_NONNULL;		const char *, unsigned) CPL_ATTR_NONNULL;
	void cpl_test_abs_macro(int, double, cpl_flops, cpl_errorstate, double,		void cpl_test_abs_macro(int, double, cpl_flops, cpl_errorstate, double,
	const char *, double, const char *, double,		const char *, double, const char *, double,
	const char *, const char *, const char *,		const char *, const char *, const char *,
	unsigned) CPL_ATTR_NONNULL;		unsigned) CPL_ATTR_NONNULL;
	#ifdef _Complex_I		#ifdef _Complex_I
	void cpl_test_abs_complex_macro(int, double, cpl_flops, cpl_errorstate,		void cpl_test_abs_complex_macro(int, double, cpl_flops, cpl_errorstate,
	double complex, const char *,		_Complex double, const char *,
	double complex, const char *, double,		_Complex double, const char *, double,
	const char *, const char *, const char *,		const char *, const char *, const char *,
	unsigned) CPL_ATTR_NONNULL;		unsigned) CPL_ATTR_NONNULL;
	#endif		#endif
	void cpl_test_rel_macro(int, double, cpl_flops, cpl_errorstate, double,		void cpl_test_rel_macro(int, double, cpl_flops, cpl_errorstate, double,
	const char *, double, const char *, double,		const char *, double, const char *, double,
	const char *, const char *, const char *,		const char *, const char *, const char *,
	unsigned) CPL_ATTR_NONNULL;		unsigned) CPL_ATTR_NONNULL;
	void cpl_test_vector_abs_macro(int, double, cpl_flops, cpl_errorstate,		void cpl_test_vector_abs_macro(int, double, cpl_flops, cpl_errorstate,
	skipping to change at line 1119		skipping to change at line 1149
	void cpl_test_image_abs_macro(int, double, cpl_flops, cpl_errorstate,		void cpl_test_image_abs_macro(int, double, cpl_flops, cpl_errorstate,
	const cpl_image *, const char *,		const cpl_image *, const char *,
	const cpl_image *, const char *, double,		const cpl_image *, const char *, double,
	const char *, const char *, const char *,		const char *, const char *, const char *,
	unsigned)		unsigned)
	#ifdef CPL_HAVE_ATTR_NONNULL		#ifdef CPL_HAVE_ATTR_NONNULL
	__attribute__((nonnull(6, 8, 10, 11, 12)))		__attribute__((nonnull(6, 8, 10, 11, 12)))
	#endif		#endif
	;		;
			void cpl_test_image_rel_macro(int, double, cpl_flops, cpl_errorstate,
			const cpl_image *, const char *,
			const cpl_image *, const char *, double,
			const char *, const char *, const char *,
			unsigned)
			#ifdef CPL_HAVE_ATTR_NONNULL
			__attribute__((nonnull(6, 8, 10, 11, 12)))
			#endif
			;
	void cpl_test_imagelist_abs_macro(int, double, cpl_flops, cpl_errorstate,		void cpl_test_imagelist_abs_macro(int, double, cpl_flops, cpl_errorstate,
	const cpl_imagelist *,		const cpl_imagelist *,
	const char *,		const char *,
	const cpl_imagelist *,		const cpl_imagelist *,
	const char *,		const char *,
	double, const char *,		double, const char *,
	const char *, const char *,		const char *, const char *,
	unsigned )		unsigned )
	#ifdef CPL_HAVE_ATTR_NONNULL		#ifdef CPL_HAVE_ATTR_NONNULL
	__attribute__((nonnull(6, 8, 10, 11, 12)))		__attribute__((nonnull(6, 8, 10, 11, 12)))
End of changes. 6 change blocks.
	7 lines changed or deleted		51 lines changed or added

	cpl_type.h		cpl_type.h
	/* $Id: cpl_type.h,v 1.29 2012/05/09 09:59:26 llundin Exp $		/* $Id: cpl_type.h,v 1.29 2012-05-09 09:59:26 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 23		skipping to change at line 24
	* 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: 2012/05/09 09:59:26 $		* $Date: 2012-05-09 09:59:26 $
	* $Revision: 1.29 $		* $Revision: 1.29 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_TYPE_H		#ifndef CPL_TYPE_H
	#define CPL_TYPE_H		#define CPL_TYPE_H
	#include <cxtypes.h>		#include <cxtypes.h>
	#include <cpl_macros.h>		#include <cpl_macros.h>
	CPL_BEGIN_DECLS		CPL_BEGIN_DECLS
	skipping to change at line 162		skipping to change at line 163
	*/		*/
	CPL_TYPE_COMPLEX = 1 << 19,		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 << 20,		CPL_TYPE_UNSPECIFIED = 1 << 20,
	/**		/**
			* Type code corresponding to type @c cpl_bitmask
			* @hideinitializer
			*/
			CPL_TYPE_BITMASK = 1 << 21,
			/**
	* 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
	*/		*/
	CPL_TYPE_FLOAT_COMPLEX = (CPL_TYPE_FLOAT | CPL_TYPE_COMPLEX),		CPL_TYPE_FLOAT_COMPLEX = (CPL_TYPE_FLOAT | CPL_TYPE_COMPLEX),
	skipping to change at line 212		skipping to change at line 219
	#if defined CPL_SIZE_BITS && CPL_SIZE_BITS == 32		#if defined CPL_SIZE_BITS && CPL_SIZE_BITS == 32
	typedef int cpl_size; /* The type as is was up to CPL 5.3 */		typedef int cpl_size; /* The type as is was up to CPL 5.3 */
	#else		#else
	typedef long long cpl_size;		typedef long long cpl_size;
	#endif		#endif
			#include <stdint.h>
			/*-------------------------------------------------------------------------
			---*/
			/**
			*
			* @brief The CPL bitmask type for bitmask operations
			* @note The CPL bitmask is currently used only for bit-wise operations on
			CPL
			* images of integer pixel type, which are 32-bits wide.
			* For forward compatibility the CPL bitmask is 64 bits wide, which is cast
			to
			* 32 bits when used with a CPL_TYPE_INT.
			*/
			/*-------------------------------------------------------------------------
			---*/
			typedef uint64_t cpl_bitmask;
	/**		/**
	* @def CPL_SIZE_MIN		* @def CPL_SIZE_MIN
	*		*
	* @hideinitializer		* @hideinitializer
	* @ingroup cpl_type		* @ingroup cpl_type
	*		*
	* @brief		* @brief
	* Minimum value a variable of type @em cpl_size can hold.		* Minimum value a variable of type @em cpl_size can hold.
	*/		*/
End of changes. 5 change blocks.
	3 lines changed or deleted		28 lines changed or added

	cpl_vector.h		cpl_vector.h
	/* $Id: cpl_vector.h,v 1.66 2013/02/04 12:57:00 llundin Exp $		/* $Id: cpl_vector.h,v 1.66 2013-02-04 12:57:00 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: 2013/02/04 12:57:00 $		* $Date: 2013-02-04 12:57:00 $
	* $Revision: 1.66 $		* $Revision: 1.66 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_VECTOR_H		#ifndef CPL_VECTOR_H
	#define CPL_VECTOR_H		#define CPL_VECTOR_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Includes		Includes
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <stdio.h>		#include <stdio.h>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 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 "6.3.1"		#define CPL_VERSION_STRING "6.4"
	#define CPL_VERSION_CODE 393985		#define CPL_VERSION_CODE 394240
	#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
	/* $Id: cpl_wcs.h,v 1.14 2012/08/29 14:49:48 llundin Exp $		/* $Id: cpl_wcs.h,v 1.14 2012-08-29 14:49: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-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 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: 2012/08/29 14:49:48 $		* $Date: 2012-08-29 14:49:48 $
	* $Revision: 1.14 $		* $Revision: 1.14 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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"
	skipping to change at line 78		skipping to change at line 78
	@hideinitializer		@hideinitializer
	@ingroup cpl_wcs		@ingroup cpl_wcs
	@brief A regular expression that matches the FITS keys used for WCS		@brief A regular expression that matches the FITS keys used for WCS
	*/		*/
	/*------------------------------------------------------------------------- ---*/		/*------------------------------------------------------------------------- ---*/
	#define CPL_WCS_REGEXP "WCSAXES|WCSNAME|(PC|CD|PV|PS)[0-9]+_[0-9]+|" \		#define CPL_WCS_REGEXP "WCSAXES|WCSNAME|(PC|CD|PV|PS)[0-9]+_[0-9]+|" \
	"C(RVAL|RPIX|DELT|TYPE|UNIT|RDER|SYER)[0-9]+"		"C(RVAL|RPIX|DELT|TYPE|UNIT|RDER|SYER)[0-9]+"
	/* Function prototypes */		/* Function prototypes */
			CPL_BEGIN_DECLS
	cpl_wcs *cpl_wcs_new_from_propertylist(const cpl_propertylist *plist)		cpl_wcs *cpl_wcs_new_from_propertylist(const cpl_propertylist *plist)
	CPL_ATTR_ALLOC;		CPL_ATTR_ALLOC;
	void cpl_wcs_delete(cpl_wcs *wcs);		void cpl_wcs_delete(cpl_wcs *wcs);
	cpl_error_code cpl_wcs_convert(const cpl_wcs *wcs, const cpl_matrix *from,		cpl_error_code cpl_wcs_convert(const cpl_wcs *wcs, const cpl_matrix *from,
	cpl_matrix **to, cpl_array **status,		cpl_matrix **to, cpl_array **status,
	cpl_wcs_trans_mode transform);		cpl_wcs_trans_mode transform);
	cpl_error_code cpl_wcs_platesol(const cpl_propertylist *ilist,		cpl_error_code cpl_wcs_platesol(const cpl_propertylist *ilist,
	const cpl_matrix *cel,		const cpl_matrix *cel,
	const cpl_matrix *xy, int niter, float thre sh,		const cpl_matrix *xy, int niter, float thre sh,
	cpl_wcs_platesol_fitmode fitmode,		cpl_wcs_platesol_fitmode fitmode,
	cpl_wcs_platesol_outmode outmode,		cpl_wcs_platesol_outmode outmode,
	cpl_propertylist **olist);		cpl_propertylist **olist);
	/* Accessor routines */		/* Accessor routines */
	int cpl_wcs_get_image_naxis(const cpl_wcs *wcs);		int cpl_wcs_get_image_naxis(const cpl_wcs *wcs);
	const cpl_array *cpl_wcs_get_image_dims(const cpl_wcs *wcs);		const cpl_array *cpl_wcs_get_image_dims(const cpl_wcs *wcs);
	const cpl_array *cpl_wcs_get_crval(const cpl_wcs *wcs);		const cpl_array *cpl_wcs_get_crval(const cpl_wcs *wcs);
	const cpl_array *cpl_wcs_get_crpix(const cpl_wcs *wcs);		const cpl_array *cpl_wcs_get_crpix(const cpl_wcs *wcs);
			const cpl_array *cpl_wcs_get_ctype(const cpl_wcs *wcs);
			const cpl_array *cpl_wcs_get_cunit(const cpl_wcs *wcs);
	const cpl_matrix *cpl_wcs_get_cd(const cpl_wcs *wcs);		const cpl_matrix *cpl_wcs_get_cd(const cpl_wcs *wcs);
			CPL_END_DECLS
	#endif /* CPL_WCS_H */		#endif /* CPL_WCS_H */
End of changes. 6 change blocks.
	3 lines changed or deleted		9 lines changed or added

	cpl_wlcalib.h		cpl_wlcalib.h
	/* $Id: cpl_wlcalib.h,v 1.10 2011/12/06 09:40:21 llundin Exp $		/* $Id: cpl_wlcalib.h,v 1.11 2013-03-25 10:20:40 cgarcia Exp $
	*		*
	* This file is part of the CPL package		* This file is part of the CPL package
	* Copyright (C) 2002,2003 European Southern Observatory		* Copyright (C) 2002,2003 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A		* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
	*/		*/
	/*		/*
	* $Author: llundin $		* $Author: cgarcia $
	* $Date: 2011/12/06 09:40:21 $		* $Date: 2013-03-25 10:20:40 $
	* $Revision: 1.10 $		* $Revision: 1.11 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CPL_WLCALIB_H		#ifndef CPL_WLCALIB_H
	#define CPL_WLCALIB_H		#define CPL_WLCALIB_H
	/*------------------------------------------------------------------------- ----		/*------------------------------------------------------------------------- ----
	Include		Include
	-------------------------------------------------------------------------- ---*/		-------------------------------------------------------------------------- ---*/
	#include <cpl_polynomial.h>		#include <cpl_polynomial.h>
End of changes. 3 change blocks.
	6 lines changed or deleted		6 lines changed or added

	cxdeque.h		cxdeque.h
	/* $Id: cxdeque.h,v 1.3 2011/02/21 14:15:31 rpalsa 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.3 $		* $Revision: 1.3 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#ifndef CX_DEQUE_H		#ifndef CX_DEQUE_H
	#define CX_DEQUE_H		#define CX_DEQUE_H
	#include <cxtypes.h>		#include <cxtypes.h>
	#include <cxmemory.h>		#include <cxmemory.h>
	CX_BEGIN_DECLS		CX_BEGIN_DECLS
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cxfileutils.h		cxfileutils.h
	/* $Id: cxfileutils.h,v 1.4 2011/02/21 14:15:31 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.4 $		* $Revision: 1.4 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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.
	3 lines changed or deleted		3 lines changed or added

	cxlist.h		cxlist.h
	/* $Id: cxlist.h,v 1.4 2011/02/21 14:15:31 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.4 $		* $Revision: 1.4 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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;
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cxmacros.h		cxmacros.h
	/* $Id: cxmacros.h,v 1.7 2011/02/21 14:15:31 rpalsa 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.7 $		* $Revision: 1.7 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	/*		/*
	* 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
	/*		/*
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cxmap.h		cxmap.h
	/* $Id: cxmap.h,v 1.5 2011/02/21 14:15:31 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.5 $		* $Revision: 1.5 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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.
	3 lines changed or deleted		3 lines changed or added

	cxmemory.h		cxmemory.h
	/* $Id: cxmemory.h,v 1.5 2011/02/21 14:15:31 rpalsa 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.5 $		* $Revision: 1.5 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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.
	3 lines changed or deleted		3 lines changed or added

	cxmessages.h		cxmessages.h
	/* $Id: cxmessages.h,v 1.10 2011/02/21 14:15:31 rpalsa 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.10 $		* $Revision: 1.10 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cxmultimap.h		cxmultimap.h
	/* $Id: cxmultimap.h,v 1.6 2011/02/21 14:15:31 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.6 $		* $Revision: 1.6 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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.
	3 lines changed or deleted		3 lines changed or added

	cxslist.h		cxslist.h
	/* $Id: cxslist.h,v 1.7 2011/02/21 14:15:31 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.7 $		* $Revision: 1.7 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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.
	3 lines changed or deleted		3 lines changed or added

	cxstring.h		cxstring.h
	/* $Id: cxstring.h,v 1.8 2011/02/21 14:15:31 rpalsa 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.8 $		* $Revision: 1.8 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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>
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cxstrutils.h		cxstrutils.h
	/* $Id: cxstrutils.h,v 1.6 2011/02/21 14:15:31 rpalsa 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.6 $		* $Revision: 1.6 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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
End of changes. 3 change blocks.
	3 lines changed or deleted		3 lines changed or added

	cxtree.h		cxtree.h
	/* $Id: cxtree.h,v 1.5 2011/02/21 14:15:31 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.5 $		* $Revision: 1.5 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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.
	3 lines changed or deleted		3 lines changed or added

	cxtypes.h		cxtypes.h
	/* $Id: cxtypes.h,v 1.4 2012/08/17 13:58:45 rpalsa Exp $		/* $Id: cxtypes.h,v 1.4 2012-08-17 13:58:45 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-2011 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,
End of changes. 1 change blocks.
	1 lines changed or deleted		1 lines changed or added

	cxutils.h		cxutils.h
	/* $Id: cxutils.h,v 1.6 2011/02/21 14:15:31 rpalsa 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-2011 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,
	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: rpalsa $		* $Author: rpalsa $
	* $Date: 2011/02/21 14:15:31 $		* $Date: 2011-02-21 14:15:31 $
	* $Revision: 1.6 $		* $Revision: 1.6 $
	* $Name: cpl-6_3_1 $		* $Name: not supported by cvs2svn $
	*/		*/
	#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
End of changes. 3 change blocks.
	3 lines changed or deleted		3 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/