CPL: headers diff between 5.0.1 and 5.1.0 versions

	cpl.h	cpl.h

		/* $Id: cpl.h,v 1.31 2009/12/02 10:29:45 lbilbao Exp $
		*
		* This file is part of the ESO Common Pipeline Library
		* Copyright (C) 2001-2008 European Southern Observatory
		*
		* 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
		* the Free Software Foundation; either version 2 of the License, or
		* (at your option) any later version.
		*
		* This program is distributed in the hope that it will be useful,
		* but WITHOUT ANY WARRANTY; without even the implied warranty of
		* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
		* GNU General Public License for more details.
		*
		* You should have received a copy of the GNU General Public License
		* along with this program; if not, write to the Free Software
		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US
		A
		*/

		/*
		* $Author: lbilbao $
		* $Date: 2009/12/02 10:29:45 $
		* $Revision: 1.31 $
		* $Name: cpl-5_1_0 $
		*/

	/* CPLCORE */	/* CPLCORE */
	#include "cpl_bivector.h"	#include "cpl_bivector.h"
	#include "cpl_error.h"	#include "cpl_error.h"
	#include "cpl_errorstate.h"	#include "cpl_errorstate.h"
	#include "cpl_fits.h"	#include "cpl_fits.h"
	#include "cpl_image.h"	#include "cpl_image.h"
	#include "cpl_image_basic.h"	#include "cpl_image_basic.h"
	#include "cpl_image_iqe.h"	#include "cpl_image_iqe.h"
	#include "cpl_image_bpm.h"	#include "cpl_image_bpm.h"
	#include "cpl_image_filter.h"	#include "cpl_image_filter.h"

	skipping to change at line 63	skipping to change at line 90
	#include "cpl_apertures.h"	#include "cpl_apertures.h"
	#include "cpl_apertures_img.h"	#include "cpl_apertures_img.h"
	#include "cpl_apertures_img.h"	#include "cpl_apertures_img.h"
	#include "cpl_detector.h"	#include "cpl_detector.h"
	#include "cpl_fit.h"	#include "cpl_fit.h"
	#include "cpl_geom_img.h"	#include "cpl_geom_img.h"
	#include "cpl_photom.h"	#include "cpl_photom.h"
	#include "cpl_phys_const.h"	#include "cpl_phys_const.h"
	#include "cpl_ppm.h"	#include "cpl_ppm.h"
	#include "cpl_wcs.h"	#include "cpl_wcs.h"

		#include "cpl_fft.h"

	/* CPLDFS */	/* CPLDFS */
	#include "cpl_dfs.h"	#include "cpl_dfs.h"

End of changes. 2 change blocks.
	0 lines changed or deleted	29 lines changed or added

	cpl_apertures.h	cpl_apertures.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/12/10 14:14:24 $	* $Date: 2008/12/10 14:14:24 $
	* $Revision: 1.3 $	* $Revision: 1.3 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_APERTURES_H	#ifndef CPL_APERTURES_H
	#define CPL_APERTURES_H	#define CPL_APERTURES_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <stdio.h>	#include <stdio.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_apertures_img.h	cpl_apertures_img.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:40 $	* $Date: 2008/07/21 08:48:40 $
	* $Revision: 1.2 $	* $Revision: 1.2 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_APERTURES_IMG_H	#ifndef CPL_APERTURES_IMG_H
	#define CPL_APERTURES_IMG_H	#define CPL_APERTURES_IMG_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <stdio.h>	#include <stdio.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_bivector.h	cpl_bivector.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:40 $	* $Date: 2008/07/21 08:48:40 $
	* $Revision: 1.10 $	* $Revision: 1.10 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_BIVECTOR_H	#ifndef CPL_BIVECTOR_H
	#define CPL_BIVECTOR_H	#define CPL_BIVECTOR_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <stdio.h>	#include <stdio.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_detector.h	cpl_detector.h

	/* $Id: cpl_detector.h,v 1.3 2008/07/21 08:48:40 llundin Exp $	/* $Id: cpl_detector.h,v 1.4 2009/08/07 09:21:09 lbilbao 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*

	* $Author: llundin $	* $Author: lbilbao $
	* $Date: 2008/07/21 08:48:40 $	* $Date: 2009/08/07 09:21:09 $
	* $Revision: 1.3 $	* $Revision: 1.4 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_DETECTOR_H	#ifndef CPL_DETECTOR_H
	#define CPL_DETECTOR_H	#define CPL_DETECTOR_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <cpl_error.h>	#include <cpl_error.h>

	skipping to change at line 49	skipping to change at line 49

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Function prototypes	Function prototypes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	/* Noise computation */	/* Noise computation */
	cpl_error_code cpl_flux_get_noise_window(const cpl_image , const int , in t, int,	cpl_error_code cpl_flux_get_noise_window(const cpl_image , const int , in t, int,
	double , double ) ;	double , double ) ;

		cpl_error_code cpl_flux_get_bias_window(const cpl_image , const int , int
		, int,
		double , double ) ;
	cpl_error_code cpl_flux_get_noise_ring(const cpl_image , const double , i nt,	cpl_error_code cpl_flux_get_noise_ring(const cpl_image , const double , i nt,
	int, double , double ) ;	int, double , double ) ;

	/* Bad pixels cleaning */	/* Bad pixels cleaning */
	cpl_error_code cpl_detector_interpolate_rejected(cpl_image *) ;	cpl_error_code cpl_detector_interpolate_rejected(cpl_image *) ;

	CPL_END_DECLS	CPL_END_DECLS

	#endif	#endif

End of changes. 3 change blocks.
	5 lines changed or deleted	8 lines changed or added

	cpl_dfs.h	cpl_dfs.h

	/* $Id: cpl_dfs.h,v 1.14 2009/01/28 16:02:09 llundin Exp $	/* $Id: cpl_dfs.h,v 1.15 2009/07/02 11:00:09 llundin Exp $
	*	*

	* This file is part of the IIINSTRUMENT Pipeline	* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2002,2003 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2009/01/28 16:02:09 $	* $Date: 2009/07/02 11:00:09 $
	* $Revision: 1.14 $	* $Revision: 1.15 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_DFS_H	#ifndef CPL_DFS_H
	#define CPL_DFS_H	#define CPL_DFS_H

	#include <cpl_imagelist.h>	#include <cpl_imagelist.h>
	#include <cpl_table.h>	#include <cpl_table.h>
	#include <cpl_frameset.h>	#include <cpl_frameset.h>
	#include <cpl_propertylist.h>	#include <cpl_propertylist.h>
	#include <cpl_parameterlist.h>	#include <cpl_parameterlist.h>

End of changes. 3 change blocks.
	6 lines changed or deleted	6 lines changed or added

	cpl_error.h	cpl_error.h

	/* $Id: cpl_error.h,v 1.67 2008/07/21 08:48:38 llundin Exp $	/* $Id: cpl_error.h,v 1.70 2009/08/12 09:15: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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2008/07/21 08:48:38 $	* $Date: 2009/08/12 09:15:40 $
	* $Revision: 1.67 $	* $Revision: 1.70 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_ERROR_H	#ifndef CPL_ERROR_H
	#define CPL_ERROR_H	#define CPL_ERROR_H

	#include <stdlib.h>	#include <stdlib.h>
	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_func.h>	#include <cpl_func.h>

	#include <cxutils.h>	#include <cxutils.h>

	skipping to change at line 244	skipping to change at line 244
	/**	/**
	* @ingroup cpl_error	* @ingroup cpl_error
	* @brief	* @brief
	* Set CPL error code, function name, source file and line number where	* Set CPL error code, function name, source file and line number where
	* an error occurred.	* an error occurred.
	*	*
	* @param function Character string with function name, cpl_func	* @param function Character string with function name, cpl_func
	* @param code Error code	* @param code Error code
	*	*
	* @return The specified error code.	* @return The specified error code.

	* @note If code is CPL_ERROR_NONE, nothing is done (and code is returned).	* @note If code is CPL_ERROR_NONE, nothing is done (and code is returned),
		* if code is CPL_ERROR_HISTORY_LOST (but avoid that) then
		* CPL_ERROR_UNSPECIFIED is set and returned.
	*	*
	* @hideinitializer	* @hideinitializer
	*/	*/

	#define cpl_error_set(function, code) \	#define cpl_error_set(function, code) \
	cpl_error_set_message_macro(function, code, __FILE__, __LINE__, " " )	cpl_error_set_message_macro(function, code, __FILE__, __LINE__, " " )

	/**	/**
	* @ingroup cpl_error	* @ingroup cpl_error
	* @brief Propagate a CPL-error to the current location.	* @brief Propagate a CPL-error to the current location.

	skipping to change at line 357	skipping to change at line 359
	Extensive use of user defined error codes should be avoided. Instead a	Extensive use of user defined error codes should be avoided. Instead a
	request of new CPL error codes should be emailed to cpl-help@eso.org.	request of new CPL error codes should be emailed to cpl-help@eso.org.

	*/	*/

	enum _cpl_error_code_ {	enum _cpl_error_code_ {
	CPL_ERROR_NONE = 0,	CPL_ERROR_NONE = 0,
	/*< No error condition /	/*< No error condition /
	CPL_ERROR_UNSPECIFIED = 1,	CPL_ERROR_UNSPECIFIED = 1,
	/*< An unspecified error. FIXME: Do not set to 1 and verify correctnes s /	/*< An unspecified error. FIXME: Do not set to 1 and verify correctnes s /

		CPL_ERROR_HISTORY_LOST,
		/**< The actual CPL error has been lost. Do not use to create a CPL err
		or */
	CPL_ERROR_DUPLICATING_STREAM,	CPL_ERROR_DUPLICATING_STREAM,
	/*< Could not duplicate output stream /	/*< Could not duplicate output stream /
	CPL_ERROR_ASSIGNING_STREAM,	CPL_ERROR_ASSIGNING_STREAM,
	/*< Could not associate a stream with a file descriptor /	/*< Could not associate a stream with a file descriptor /
	CPL_ERROR_FILE_IO,	CPL_ERROR_FILE_IO,
	/*< Permission denied /	/*< Permission denied /
	CPL_ERROR_BAD_FILE_FORMAT,	CPL_ERROR_BAD_FILE_FORMAT,
	/*< Input file had not the expected format /	/*< Input file had not the expected format /
	CPL_ERROR_FILE_ALREADY_OPEN,	CPL_ERROR_FILE_ALREADY_OPEN,
	/*< Attempted to open a file twice /	/*< Attempted to open a file twice /

	skipping to change at line 421	skipping to change at line 425

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Function prototypes	Function prototypes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	void cpl_error_reset(void);	void cpl_error_reset(void);
	cpl_error_code cpl_error_set_message_macro(const char *, cpl_error_code,	cpl_error_code cpl_error_set_message_macro(const char *, cpl_error_code,
	const char *, unsigned,	const char *, unsigned,
	const char *, ...)	const char *, ...)
	#ifdef __GNUC__	#ifdef __GNUC__

	__attribute__((format (printf, 5, 6)))	#if __GNUC__ > 3 \|\| __GNUC__ == 3 && defined __GNUC_MINOR__ && __GNUC_MINOR
		__ > 2
		__attribute__((nonnull(3)))
		#endif
		__attribute__((format (printf, 5, 6)))
		#endif
		;
		cpl_error_code cpl_error_get_code(void)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;
		const char *cpl_error_get_message(void)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;
		const char *cpl_error_get_message_default(cpl_error_code)
		#ifdef __GNUC__
		__attribute__((const))
		#endif
		;
		const char *cpl_error_get_function(void)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;
		const char *cpl_error_get_file(void)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;
		unsigned cpl_error_get_line(void)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;
		const char *cpl_error_get_where(void)
		#ifdef __GNUC__
		__attribute__((pure))
	#endif	#endif
	;	;

	cpl_error_code cpl_error_get_code(void);
	const char *cpl_error_get_message(void);
	const char *cpl_error_get_message_default(cpl_error_code);
	const char *cpl_error_get_function(void);
	const char *cpl_error_get_file(void);
	unsigned cpl_error_get_line(void);
	const char *cpl_error_get_where(void);

	CPL_END_DECLS	CPL_END_DECLS

	#endif	#endif
	/* end of cpl_error.h */	/* end of cpl_error.h */

End of changes. 6 change blocks.
	13 lines changed or deleted	50 lines changed or added

	cpl_errorstate.h	cpl_errorstate.h

	/* $Id: cpl_errorstate.h,v 1.3 2008/07/21 08:48:39 llundin Exp $	/* $Id: cpl_errorstate.h,v 1.5 2009/08/11 14:19: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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2008/07/21 08:48:39 $	* $Date: 2009/08/11 14:19:39 $
	* $Revision: 1.3 $	* $Revision: 1.5 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_ERRORSTATE_H	#ifndef CPL_ERRORSTATE_H
	#define CPL_ERRORSTATE_H	#define CPL_ERRORSTATE_H

	#include <cpl_macros.h>	#include <cpl_macros.h>

	#include <cpl_type.h>	#include <cpl_type.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	skipping to change at line 51	skipping to change at line 51
	#ifndef CPL_ERROR_HISTORY_SIZE	#ifndef CPL_ERROR_HISTORY_SIZE
	#define CPL_ERROR_HISTORY_SIZE 20	#define CPL_ERROR_HISTORY_SIZE 20
	#endif	#endif

	typedef const void * cpl_errorstate;	typedef const void * cpl_errorstate;

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Prototypes of functions	Prototypes of functions
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/


	cpl_errorstate cpl_errorstate_get(void);	cpl_errorstate cpl_errorstate_get(void)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;
	void cpl_errorstate_set(cpl_errorstate);	void cpl_errorstate_set(cpl_errorstate);

	cpl_boolean cpl_errorstate_is_equal(cpl_errorstate);	cpl_boolean cpl_errorstate_is_equal(cpl_errorstate)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;

	void cpl_errorstate_dump(cpl_errorstate,	void cpl_errorstate_dump(cpl_errorstate,
	cpl_boolean,	cpl_boolean,
	void (*)(unsigned, unsigned, unsigned));	void (*)(unsigned, unsigned, unsigned));

	void cpl_errorstate_dump_one(unsigned, unsigned, unsigned);	void cpl_errorstate_dump_one(unsigned, unsigned, unsigned);

	CPL_END_DECLS	CPL_END_DECLS

	#endif	#endif

End of changes. 4 change blocks.
	6 lines changed or deleted	14 lines changed or added

	cpl_filter.h	cpl_filter.h

	/* $Id: cpl_filter.h,v 1.11 2009/02/09 14:31:58 llundin Exp $	/* $Id: cpl_filter.h,v 1.12 2009/04/27 13:05:36 lbilbao 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*

	* $Author: llundin $	* $Author: lbilbao $
	* $Date: 2009/02/09 14:31:58 $	* $Date: 2009/04/27 13:05:36 $
	* $Revision: 1.11 $	* $Revision: 1.12 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_FILTER_H	#ifndef CPL_FILTER_H
	#define CPL_FILTER_H	#define CPL_FILTER_H

	#include <cpl_macros.h>	#include <cpl_macros.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----

	skipping to change at line 163	skipping to change at line 163
	* e.g. int for two integer images. When the input and	* e.g. int for two integer images. When the input and
	* output pixel types differ, the arithmetic is done in	* output pixel types differ, the arithmetic is done in
	* double precision when one of the two images have	* double precision when one of the two images have
	* pixel type CPL_TYPE_DOUBLE, otherwise float is used.	* pixel type CPL_TYPE_DOUBLE, otherwise float is used.
	* </td>	* </td>
	* </tr>	* </tr>
	* <tr>	* <tr>
	* <td class="ecl">CPL_FILTER_AVERAGE_FAST</td>	* <td class="ecl">CPL_FILTER_AVERAGE_FAST</td>
	* <td class="ecr">	* <td class="ecr">
	* The same as CPL_FILTER_AVERAGE, except that it uses a running	* The same as CPL_FILTER_AVERAGE, except that it uses a running

	* average, which will lead to a significat loss of precision if	* average, which will lead to a significant loss of precision if
	* there are large differences in the magnitudes of the input pixels.	* there are large differences in the magnitudes of the input pixels.
	* The cost per pixel is O(1) if all elements in the kernel are used,	* The cost per pixel is O(1) if all elements in the kernel are used,
	* otherwise the filtering is done as for CPL_FILTER_AVERAGE.	* otherwise the filtering is done as for CPL_FILTER_AVERAGE.
	* </td>	* </td>
	* </tr>	* </tr>
	* <tr>	* <tr>
	* <td class="ecl">CPL_FILTER_MEDIAN</td>	* <td class="ecl">CPL_FILTER_MEDIAN</td>
	* <td class="ecr">	* <td class="ecr">
	* A median filter. The pixel types of the input and	* A median filter. The pixel types of the input and
	* output images must be identical. All border modes are	* output images must be identical. All border modes are

	skipping to change at line 198	skipping to change at line 198
	1 0 1 ... 7.0 8.0 9.0 ...	1 0 1 ... 7.0 8.0 9.0 ...
	...	...
	@endverbatim	@endverbatim
	*	*
	* The pixel with value 5.0 will have a filtered value of:	* The pixel with value 5.0 will have a filtered value of:
	* std_dev(1.0, 3.0, 5.0, 7.0, 9.0)	* std_dev(1.0, 3.0, 5.0, 7.0, 9.0)
	*	*
	* </td>	* </td>
	* </tr>	* </tr>
	* <tr>	* <tr>

		* <td class="ecl">CPL_FILTER_STDEV_FAST</td>
		* <td class="ecr">
		* The same as CPL_FILTER_STDEV, except that it uses the same running
		* method employed in CPL_FILTER_AVERAGE_FAST, which will lead to a
		* significant loss of precision if there are large differences in the
		* magnitudes of the input pixels. As for CPL_FILTER_AVERAGE_FAST, the
		cost
		* per pixel is O(1) if all elements are used, otherwise the filtering
		is
		* done as for CPL_FILTER_STDEV.
		* </td>
		* </tr>
		* <tr>
	* <td class="ecl">CPL_FILTER_MORPHO</td>	* <td class="ecl">CPL_FILTER_MORPHO</td>
	* <td class="ecr">	* <td class="ecr">
	* A Morphological filter. The kernel elements are used as weights	* A Morphological filter. The kernel elements are used as weights
	* on the sorted values covered by the kernel:	* on the sorted values covered by the kernel:
	*	*
	@verbatim	@verbatim
	Kernel 1 2 3 Image ...	Kernel 1 2 3 Image ...
	4 5 6 ... 4.0 6.0 5.0 ...	4 5 6 ... 4.0 6.0 5.0 ...
	7 8 9 ... 3.0 1.0 2.0 ...	7 8 9 ... 3.0 1.0 2.0 ...
	... 7.0 8.0 9.0 ...	... 7.0 8.0 9.0 ...

	skipping to change at line 251	skipping to change at line 262
	/*	/*
	A median filter.	A median filter.
	*/	*/

	CPL_FILTER_STDEV,	CPL_FILTER_STDEV,

	/*	/*
	A standard deviation filter.	A standard deviation filter.
	*/	*/


		CPL_FILTER_STDEV_FAST,

		/*
		A fast standard deviation filter.
		*/

	CPL_FILTER_MORPHO	CPL_FILTER_MORPHO
	/*	/*
	A Morphological filter.	A Morphological filter.
	*/	*/

	};	};

	/**	/**
	* @ingroup cpl_image_filter	* @ingroup cpl_image_filter
	*	*

End of changes. 5 change blocks.
	6 lines changed or deleted	25 lines changed or added

	cpl_fit.h	cpl_fit.h

	/* $Id: cpl_fit.h,v 1.3 2008/07/21 08:48:40 llundin Exp $	/* $Id: cpl_fit.h,v 1.6 2009/12/14 15:35: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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2008/07/21 08:48:40 $	* $Date: 2009/12/14 15:35:53 $
	* $Revision: 1.3 $	* $Revision: 1.6 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_FIT_H	#ifndef CPL_FIT_H
	#define CPL_FIT_H	#define CPL_FIT_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <cpl_vector.h>	#include <cpl_vector.h>
	#include <cpl_matrix.h>	#include <cpl_matrix.h>

		#include <cpl_array.h>
	#include <cpl_imagelist.h>	#include <cpl_imagelist.h>
	#include <cpl_error.h>	#include <cpl_error.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Defines	Defines
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/
	/*	/*
	* Default parameter values for	* Default parameter values for

	skipping to change at line 74	skipping to change at line 75
	#ifndef CPL_FIT_LVMQ_MAXITER	#ifndef CPL_FIT_LVMQ_MAXITER
	#define CPL_FIT_LVMQ_MAXITER 1000	#define CPL_FIT_LVMQ_MAXITER 1000
	#endif	#endif
	/* Should be >> 1 */	/* Should be >> 1 */

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Function prototypes	Function prototypes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	cpl_error_code cpl_fit_lvmq(const cpl_matrix x, const cpl_matrix sigma_x,	cpl_error_code cpl_fit_lvmq(const cpl_matrix x, const cpl_matrix sigma_x,

	const cpl_vector y, const cpl_vector sigma_y,	const cpl_vector y, const cpl_vector sigma_y,
	cpl_vector *a, const int ia[],	cpl_vector *a, const int ia[],
	int (*f)(const double x[],	int (*f)(const double x[],
	const double a[], double *result),	const double a[], double *result),
	int (*dfda)(const double x[],	int (*dfda)(const double x[],
	const double a[], double result[]),	const double a[], double result[]),
	double relative_tolerance,	double relative_tolerance,
	int tolerance_count,	int tolerance_count,
	int max_iterations,	int max_iterations,
	double *mse,	double *mse,
	double *red_chisq,	double *red_chisq,
	cpl_matrix **covariance);	cpl_matrix **covariance);

	cpl_imagelist * cpl_fit_imagelist_polynomial(const cpl_vector *,	cpl_imagelist * cpl_fit_imagelist_polynomial(const cpl_vector *,

	const cpl_imagelist *,	const cpl_imagelist *,
	int, int, cpl_boolean,	int, int, cpl_boolean,
	cpl_type, cpl_image *);	cpl_type, cpl_image *);

	cpl_imagelist * cpl_fit_imagelist_polynomial_window(const cpl_vector *,	cpl_imagelist * cpl_fit_imagelist_polynomial_window(const cpl_vector *,

	const cpl_imagelist *,	const cpl_imagelist *,
	int, int, int, int,	int, int, int, int,
	int, int, cpl_boolean,	int, int, cpl_boolean,
	cpl_type, cpl_image *);	cpl_type, cpl_image *);

		cpl_error_code cpl_fit_image_gaussian(const cpl_image , const cpl_image ,
		int , int , int , int
		,
		cpl_array , cpl_array , const cpl_array *, double
		*,
		double , cpl_matrix , double , double
		*,
		double , cpl_matrix *);

	CPL_END_DECLS	CPL_END_DECLS

	#endif	#endif
	/* end of cpl_fit.h */	/* end of cpl_fit.h */

End of changes. 6 change blocks.
	23 lines changed or deleted	33 lines changed or added

	cpl_fits.h	cpl_fits.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: lbilbao $	* $Author: lbilbao $
	* $Date: 2008/11/27 13:19:26 $	* $Date: 2008/11/27 13:19:26 $
	* $Revision: 1.4 $	* $Revision: 1.4 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_FITS_H	#ifndef CPL_FITS_H
	#define CPL_FITS_H	#define CPL_FITS_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <cpl_macros.h>	#include <cpl_macros.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_frame.h	cpl_frame.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: scastro $	* $Author: scastro $
	* $Date: 2009/02/11 12:10:06 $	* $Date: 2009/02/11 12:10:06 $
	* $Revision: 1.16 $	* $Revision: 1.16 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_FRAME_H	#ifndef CPL_FRAME_H
	#define CPL_FRAME_H	#define CPL_FRAME_H

	#include <stdio.h>	#include <stdio.h>
	#include <cpl_error.h>	#include <cpl_error.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_framedata.h	cpl_framedata.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2006/10/31 14:49:02 $	* $Date: 2006/10/31 14:49:02 $
	* $Revision: 1.1 $	* $Revision: 1.1 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_FRAMEDATA_H	#ifndef CPL_FRAMEDATA_H
	#define CPL_FRAMEDATA_H	#define CPL_FRAMEDATA_H

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_error.h>	#include <cpl_error.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_frameset.h	cpl_frameset.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: scastro $	* $Author: scastro $
	* $Date: 2009/02/11 12:10:40 $	* $Date: 2009/02/11 12:10:40 $
	* $Revision: 1.17 $	* $Revision: 1.17 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_FRAMESET_H	#ifndef CPL_FRAMESET_H
	#define CPL_FRAMESET_H	#define CPL_FRAMESET_H

	#include <stdio.h>	#include <stdio.h>

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_frame.h>	#include <cpl_frame.h>


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_frameset_io.h	cpl_frameset_io.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:25 $	* $Date: 2008/07/21 08:48:25 $
	* $Revision: 1.3 $	* $Revision: 1.3 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_FRAMESET_IO_H	#ifndef CPL_FRAMESET_IO_H
	#define CPL_FRAMESET_IO_H	#define CPL_FRAMESET_IO_H

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_frameset.h>	#include <cpl_frameset.h>
	#include <cpl_imagelist.h>	#include <cpl_imagelist.h>
	#include <cpl_type.h>	#include <cpl_type.h>


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_geom_img.h	cpl_geom_img.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2009/01/20 10:14:28 $	* $Date: 2009/01/20 10:14:28 $
	* $Revision: 1.3 $	* $Revision: 1.3 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_GEOM_IMG_H	#ifndef CPL_GEOM_IMG_H
	#define CPL_GEOM_IMG_H	#define CPL_GEOM_IMG_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <cpl_image.h>	#include <cpl_image.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_image.h	cpl_image.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:38 $	* $Date: 2008/07/21 08:48:38 $
	* $Revision: 1.49 $	* $Revision: 1.49 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGE_H	#ifndef CPL_IMAGE_H
	#define CPL_IMAGE_H	#define CPL_IMAGE_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_image_io.h"	#include "cpl_image_io.h"

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_image_basic.h	cpl_image_basic.h

	/* $Id: cpl_image_basic.h,v 1.44 2008/07/21 08:48:38 llundin Exp $	/* $Id: cpl_image_basic.h,v 1.45 2009/09/11 14:49:25 cizzo Exp $
	*	*
	* This file is part of the ESO Common Pipeline Library	* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory	* Copyright (C) 2001-2008 European Southern Observatory
	*	*
	* This program is free software; you can redistribute it and/or modify	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or	* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.	* (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*

	* $Author: llundin $	* $Author: cizzo $
	* $Date: 2008/07/21 08:48:38 $	* $Date: 2009/09/11 14:49:25 $
	* $Revision: 1.44 $	* $Revision: 1.45 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGE_BASIC_H	#ifndef CPL_IMAGE_BASIC_H
	#define CPL_IMAGE_BASIC_H	#define CPL_IMAGE_BASIC_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_image.h"	#include "cpl_image.h"

	skipping to change at line 126	skipping to change at line 126
	cpl_error_code cpl_image_copy(cpl_image , const cpl_image , int, int);	cpl_error_code cpl_image_copy(cpl_image , const cpl_image , int, int);

	/* Symmetry function */	/* Symmetry function */
	cpl_error_code cpl_image_flip(cpl_image *, int) ;	cpl_error_code cpl_image_flip(cpl_image *, int) ;

	/* Pixels re-organization */	/* Pixels re-organization */
	cpl_error_code cpl_image_move(cpl_image , int, const int ) ;	cpl_error_code cpl_image_move(cpl_image , int, const int ) ;

	/* Gaussian fit of an image zone */	/* Gaussian fit of an image zone */
	cpl_error_code cpl_image_fit_gaussian(const cpl_image *, int, int, int,	cpl_error_code cpl_image_fit_gaussian(const cpl_image *, int, int, int,

	double , double , double , double , double , double , double	double , double , double , double , double , double , double
	*) ;	*)

		#ifdef __GNUC__
		__attribute__((deprecated))
		#endif
		;

	/* FWHM computation on a local maximum */	/* FWHM computation on a local maximum */
	cpl_error_code cpl_image_get_fwhm(const cpl_image , int, int, double ,	cpl_error_code cpl_image_get_fwhm(const cpl_image , int, int, double ,
	double *) ;	double *) ;

	/* FFT computation */	/* FFT computation */
	cpl_error_code cpl_image_fft(cpl_image , cpl_image , unsigned) ;	cpl_error_code cpl_image_fft(cpl_image , cpl_image , unsigned) ;

	CPL_END_DECLS	CPL_END_DECLS


End of changes. 3 change blocks.
	7 lines changed or deleted	12 lines changed or added

	cpl_image_bpm.h	cpl_image_bpm.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:39 $	* $Date: 2008/07/21 08:48:39 $
	* $Revision: 1.16 $	* $Revision: 1.16 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGE_BPM_H	#ifndef CPL_IMAGE_BPM_H
	#define CPL_IMAGE_BPM_H	#define CPL_IMAGE_BPM_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_image.h"	#include "cpl_image.h"

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_image_filter.h	cpl_image_filter.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/12/16 10:21:56 $	* $Date: 2008/12/16 10:21:56 $
	* $Revision: 1.23 $	* $Revision: 1.23 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGE_FILTER_H	#ifndef CPL_IMAGE_FILTER_H
	#define CPL_IMAGE_FILTER_H	#define CPL_IMAGE_FILTER_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_image.h"	#include "cpl_image.h"

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_image_gen.h	cpl_image_gen.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:26 $	* $Date: 2008/07/21 08:48:26 $
	* $Revision: 1.17 $	* $Revision: 1.17 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGE_GEN_H	#ifndef CPL_IMAGE_GEN_H
	#define CPL_IMAGE_GEN_H	#define CPL_IMAGE_GEN_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_image.h"	#include "cpl_image.h"

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_image_io.h	cpl_image_io.h

	/* $Id: cpl_image_io.h,v 1.64 2009/03/17 12:14:04 llundin Exp $	/* $Id: cpl_image_io.h,v 1.67 2009/09/15 13:05: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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2009/03/17 12:14:04 $	* $Date: 2009/09/15 13:05:53 $
	* $Revision: 1.64 $	* $Revision: 1.67 $
	* $Name: $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGE_IO_H	#ifndef CPL_IMAGE_IO_H
	#define CPL_IMAGE_IO_H	#define CPL_IMAGE_IO_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	New types	New types
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	typedef struct _cpl_image_ cpl_image;	typedef struct _cpl_image_ cpl_image;

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/


	/* CPL based applications using -ansi -pedantic need this check */	#include <stdio.h>
	/* CPL itself cannot be built with -ansi -pedantic, so no need
	to support this mode within CPL itself */
	/* The below check is copied from cplcore/cpl_error.h */
	#if defined __STRICT_ANSI__
	/* gcc -ansi and gcc -std=... enters here */
	# if !defined __STDC_VERSION__ \|\| __STDC_VERSION__ <= 199409L
	/* gcc -ansi enters here, but gcc -std=... does not
	(The value 199409L signifies the 1989 C standard as amended in 1994)
	*/
	# else
	# define CPL_DEFINE_IMAGE_COMPLEX 1
	# endif
	#else
	# define CPL_DEFINE_IMAGE_COMPLEX 1
	#endif

	#include <limits.h>

	#ifdef CPL_DEFINE_IMAGE_COMPLEX
	#include <complex.h>
	#endif

	#include "cpl_io.h"	#include "cpl_io.h"
	#include "cpl_propertylist.h"	#include "cpl_propertylist.h"
	#include "cpl_mask.h"	#include "cpl_mask.h"

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Function prototypes	Function prototypes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	/* Image constructors */	/* Image constructors */
	cpl_image * cpl_image_new(int, int, cpl_type);	cpl_image * cpl_image_new(int, int, cpl_type);
	cpl_image * cpl_image_wrap_double(int, int, double *);	cpl_image * cpl_image_wrap_double(int, int, double *);
	cpl_image * cpl_image_wrap_float(int, int, float *);	cpl_image * cpl_image_wrap_float(int, int, float *);
	cpl_image * cpl_image_wrap_int(int, int, int *);	cpl_image * cpl_image_wrap_int(int, int, int *);

	#ifdef CPL_DEFINE_IMAGE_COMPLEX	#ifdef _Complex_I
	cpl_image * cpl_image_wrap_double_complex(int, int, double complex *);	cpl_image * cpl_image_wrap_double_complex(int, int, double complex *);
	cpl_image * cpl_image_wrap_float_complex(int, int, float complex *);	cpl_image * cpl_image_wrap_float_complex(int, int, float complex *);
	#endif	#endif
	cpl_image * cpl_image_load(const char *, cpl_type, int, int) ;	cpl_image * cpl_image_load(const char *, cpl_type, int, int) ;
	cpl_image * cpl_image_load_window(const char *, cpl_type, int, int, int, in t,	cpl_image * cpl_image_load_window(const char *, cpl_type, int, int, int, in t,
	int, int) ;	int, int) ;
	cpl_image * cpl_image_new_from_mask(const cpl_mask *) ;	cpl_image * cpl_image_new_from_mask(const cpl_mask *) ;
	cpl_image * cpl_image_labelise_mask_create(const cpl_mask , int ) ;	cpl_image * cpl_image_labelise_mask_create(const cpl_mask , int ) ;

	/* Get functions */	/* Get functions */
	cpl_type cpl_image_get_type(const cpl_image *) ;	cpl_type cpl_image_get_type(const cpl_image *) ;
	int cpl_image_get_size_x(const cpl_image *) ;	int cpl_image_get_size_x(const cpl_image *) ;
	int cpl_image_get_size_y(const cpl_image *) ;	int cpl_image_get_size_y(const cpl_image *) ;
	double cpl_image_get(const cpl_image , int, int, int ) ;	double cpl_image_get(const cpl_image , int, int, int ) ;


	#ifdef CPL_DEFINE_IMAGE_COMPLEX	#ifdef _Complex_I
	double complex cpl_image_get_complex(const cpl_image , int, int, int ) ;	double complex cpl_image_get_complex(const cpl_image , int, int, int ) ;
	cpl_error_code cpl_image_set_complex(cpl_image *, int, int, double complex) ;	cpl_error_code cpl_image_set_complex(cpl_image *, int, int, double complex) ;
	#endif	#endif

	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 CPL_DEFINE_IMAGE_COMPLEX	#ifdef _Complex_I
	double complex * cpl_image_get_data_double_complex(cpl_image *) ;	double complex * cpl_image_get_data_double_complex(cpl_image *) ;
	const double complex * cpl_image_get_data_double_complex_const(const cpl_im age *) ;	const double complex * cpl_image_get_data_double_complex_const(const cpl_im age *) ;
	float complex * cpl_image_get_data_float_complex(cpl_image *) ;	float complex * cpl_image_get_data_float_complex(cpl_image *) ;
	const float complex * cpl_image_get_data_float_complex_const(const cpl_imag e *) ;	const float complex * cpl_image_get_data_float_complex_const(const cpl_imag e *) ;
	#endif	#endif

	/* Set functions */	/* Set functions */
	cpl_error_code cpl_image_set(cpl_image *, int, int, double) ;	cpl_error_code cpl_image_set(cpl_image *, int, int, double) ;
	cpl_error_code cpl_image_fill_rejected(cpl_image *, double) ;	cpl_error_code cpl_image_fill_rejected(cpl_image *, double) ;


End of changes. 6 change blocks.
	29 lines changed or deleted	8 lines changed or added

	cpl_image_iqe.h	cpl_image_iqe.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:40 $	* $Date: 2008/07/21 08:48:40 $
	* $Revision: 1.4 $	* $Revision: 1.4 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGE_IQE_H	#ifndef CPL_IMAGE_IQE_H
	#define CPL_IMAGE_IQE_H	#define CPL_IMAGE_IQE_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_image.h"	#include "cpl_image.h"

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_image_resample.h	cpl_image_resample.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: cizzo $	* $Author: cizzo $
	* $Date: 2008/12/19 13:48:36 $	* $Date: 2008/12/19 13:48:36 $
	* $Revision: 1.16 $	* $Revision: 1.16 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGE_RESAMPLE_H	#ifndef CPL_IMAGE_RESAMPLE_H
	#define CPL_IMAGE_RESAMPLE_H	#define CPL_IMAGE_RESAMPLE_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <stdio.h>	#include <stdio.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_image_stats.h	cpl_image_stats.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/10/17 14:24:01 $	* $Date: 2008/10/17 14:24:01 $
	* $Revision: 1.26 $	* $Revision: 1.26 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGE_STATS_H	#ifndef CPL_IMAGE_STATS_H
	#define CPL_IMAGE_STATS_H	#define CPL_IMAGE_STATS_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_image.h"	#include "cpl_image.h"

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_imagelist.h	cpl_imagelist.h

	/* $Id: cpl_imagelist.h,v 1.4 2008/07/21 08:48:38 llundin Exp $	/* $Id: cpl_imagelist.h,v 1.5 2009/12/14 15:35: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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2008/07/21 08:48:38 $	* $Date: 2009/12/14 15:35:53 $
	* $Revision: 1.4 $	* $Revision: 1.5 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGELIST_H	#ifndef CPL_IMAGELIST_H
	#define CPL_IMAGELIST_H	#define CPL_IMAGELIST_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	New types	New types
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	typedef struct _cpl_imagelist_ cpl_imagelist ;	typedef struct _cpl_imagelist_ cpl_imagelist ;

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----

	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_imagelist_io.h"	#include "cpl_imagelist_io.h"
	#include "cpl_imagelist_basic.h"	#include "cpl_imagelist_basic.h"

	#endif	#endif

End of changes. 3 change blocks.
	5 lines changed or deleted	5 lines changed or added

	cpl_imagelist_basic.h	cpl_imagelist_basic.h

	/* $Id: cpl_imagelist_basic.h,v 1.19 2009/02/03 14:18:11 lbilbao Exp $	/* $Id: cpl_imagelist_basic.h,v 1.20 2009/04/29 09:46:38 lbilbao 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: lbilbao $	* $Author: lbilbao $

	* $Date: 2009/02/03 14:18:11 $	* $Date: 2009/04/29 09:46:38 $
	* $Revision: 1.19 $	* $Revision: 1.20 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGELIST_BASIC_H	#ifndef CPL_IMAGELIST_BASIC_H
	#define CPL_IMAGELIST_BASIC_H	#define CPL_IMAGELIST_BASIC_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_image.h"	#include "cpl_image.h"
	#include "cpl_imagelist.h"	#include "cpl_imagelist.h"

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----

	Includes	Defines
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	enum _cpl_swap_axis_ {	enum _cpl_swap_axis_ {
	CPL_SWAP_AXIS_XZ,	CPL_SWAP_AXIS_XZ,
	CPL_SWAP_AXIS_YZ	CPL_SWAP_AXIS_YZ
	};	};

	typedef enum _cpl_swap_axis_ cpl_swap_axis;	typedef enum _cpl_swap_axis_ cpl_swap_axis;


		#define CPL_COLLAPSE_MEAN ((unsigned)1 << 1)
		#define CPL_COLLAPSE_MEDIAN ((unsigned)1 << 2)

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Function prototypes	Function prototypes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	/* Imagelist modifying functions */	/* Imagelist modifying functions */
	cpl_error_code cpl_imagelist_add(cpl_imagelist , const cpl_imagelist ) ;	cpl_error_code cpl_imagelist_add(cpl_imagelist , const cpl_imagelist ) ;
	cpl_error_code cpl_imagelist_subtract(cpl_imagelist , const cpl_imagelist ) ;	cpl_error_code cpl_imagelist_subtract(cpl_imagelist , const cpl_imagelist ) ;
	cpl_error_code cpl_imagelist_multiply(cpl_imagelist , const cpl_imagelist ) ;	cpl_error_code cpl_imagelist_multiply(cpl_imagelist , const cpl_imagelist ) ;
	cpl_error_code cpl_imagelist_divide(cpl_imagelist , const cpl_imagelist ) ;	cpl_error_code cpl_imagelist_divide(cpl_imagelist , const cpl_imagelist ) ;


End of changes. 4 change blocks.
	5 lines changed or deleted	8 lines changed or added

	cpl_imagelist_io.h	cpl_imagelist_io.h

	/* $Id: cpl_imagelist_io.h,v 1.21 2008/11/07 10:39:18 lbilbao Exp $	/* $Id: cpl_imagelist_io.h,v 1.22 2009/12/14 15:35: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,
	* 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*

	* $Author: lbilbao $	* $Author: llundin $
	* $Date: 2008/11/07 10:39:18 $	* $Date: 2009/12/14 15:35:53 $
	* $Revision: 1.21 $	* $Revision: 1.22 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IMAGELIST_IO_H	#ifndef CPL_IMAGELIST_IO_H
	#define CPL_IMAGELIST_IO_H	#define CPL_IMAGELIST_IO_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_image.h"	#include "cpl_image.h"

	skipping to change at line 68	skipping to change at line 68
	/* Imagelist destructor */	/* Imagelist destructor */
	void cpl_imagelist_delete(cpl_imagelist *) ;	void cpl_imagelist_delete(cpl_imagelist *) ;

	/* Others */	/* Others */
	cpl_imagelist * cpl_imagelist_duplicate(const cpl_imagelist *) ;	cpl_imagelist * cpl_imagelist_duplicate(const cpl_imagelist *) ;
	cpl_error_code cpl_imagelist_erase(cpl_imagelist , const cpl_vector ) ;	cpl_error_code cpl_imagelist_erase(cpl_imagelist , const cpl_vector ) ;
	int cpl_imagelist_is_uniform(const cpl_imagelist *) ;	int cpl_imagelist_is_uniform(const cpl_imagelist *) ;

	cpl_error_code cpl_imagelist_dump_structure(const cpl_imagelist , FILE );	cpl_error_code cpl_imagelist_dump_structure(const cpl_imagelist , FILE );
	cpl_error_code cpl_imagelist_dump_window(const cpl_imagelist *,	cpl_error_code cpl_imagelist_dump_window(const cpl_imagelist *,

	int, int, int, int, FILE *);	int, int, int, int, FILE *);

	/* Saving function */	/* Saving function */
	cpl_error_code cpl_imagelist_save(const cpl_imagelist , const char ,	cpl_error_code cpl_imagelist_save(const cpl_imagelist , const char ,
	cpl_type_bpp, const cpl_propertylist *,	cpl_type_bpp, const cpl_propertylist *,
	unsigned);	unsigned);
	CPL_END_DECLS	CPL_END_DECLS

	#endif	#endif

End of changes. 3 change blocks.
	6 lines changed or deleted	6 lines changed or added

	cpl_init.h	cpl_init.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:40 $	* $Date: 2008/07/21 08:48:40 $
	* $Revision: 1.8 $	* $Revision: 1.8 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_INIT_H	#ifndef CPL_INIT_H
	#define CPL_INIT_H	#define CPL_INIT_H

	#include <cpl_macros.h>	#include <cpl_macros.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	#define CPL_INIT_DEFAULT 0	#define CPL_INIT_DEFAULT 0

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_io.h	cpl_io.h

	/* $Id: cpl_io.h,v 1.11 2008/11/28 15:48:19 lbilbao Exp $	/* $Id: cpl_io.h,v 1.13 2009/12/04 14:54: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-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*

	* $Author: lbilbao $	* $Author: llundin $
	* $Date: 2008/11/28 15:48:19 $	* $Date: 2009/12/04 14:54:26 $
	* $Revision: 1.11 $	* $Revision: 1.13 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_IO_H	#ifndef CPL_IO_H
	#define CPL_IO_H	#define CPL_IO_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <cpl_macros.h>	#include <cpl_macros.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Defines	Defines
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/
	/**	/**
	* Each FITS IO mode is listed below.	* Each FITS IO mode is listed below.
	* The modes can be combined with bitwise or.	* The modes can be combined with bitwise or.

		* No mode has the value 1, which makes the (mis)use of logical or detectab le.
	*/	*/


	/* The default FITS IO mode.	/* CPL_IO_CREATE: files opened for writing will be overwritten */
	* In this mode files opened for writing will be overwritten
	* CPL_IO_DEFAULT is unneccesary together with other IO modes
	*/
	#define CPL_IO_CREATE ((unsigned)1 << 1)	#define CPL_IO_CREATE ((unsigned)1 << 1)


	/* FITS append mode */	/* CPL_IO_EXTEND: Data is saved in an new extension appended to the file */
	#define CPL_IO_EXTEND ((unsigned)1 << 2)	#define CPL_IO_EXTEND ((unsigned)1 << 2)


		/* CPL_IO_APPEEND: Data is appended to the last data unit */
		#define CPL_IO_APPEND ((unsigned)1 << 3)

	/* The maximum value for the IO mode bitmask */	/* The maximum value for the IO mode bitmask */

	#define CPL_IO_MAX (CPL_IO_EXTEND)	#define CPL_IO_MAX (CPL_IO_APPEND)

	/* For backwards compatibility */	/* For backwards compatibility */
	#define CPL_IO_DEFAULT ((unsigned)CPL_IO_CREATE)	#define CPL_IO_DEFAULT ((unsigned)CPL_IO_CREATE)

	typedef enum {	typedef enum {
	/* FITS pixel depths */	/* FITS pixel depths */

	/**	/**
	* FITS BITPIX=8	* FITS BITPIX=8
	* @hideinitializer	* @hideinitializer

End of changes. 7 change blocks.
	11 lines changed or deleted	12 lines changed or added

	cpl_macros.h	cpl_macros.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2005/02/01 15:28:50 $	* $Date: 2005/02/01 15:28:50 $
	* $Revision: 1.3 $	* $Revision: 1.3 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	/*	/*
	* This file must not include any other file than cxmacros.h	* This file must not include any other file than cxmacros.h
	*/	*/

	#ifndef CPL_MACROS_H	#ifndef CPL_MACROS_H
	#define CPL_MACROS_H	#define CPL_MACROS_H

	#include <cxmacros.h>	#include <cxmacros.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_math_const.h	cpl_math_const.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:38 $	* $Date: 2008/07/21 08:48:38 $
	* $Revision: 1.7 $	* $Revision: 1.7 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_MATH_CONST_H	#ifndef CPL_MATH_CONST_H
	#define CPL_MATH_CONST_H	#define CPL_MATH_CONST_H

	#include <cpl_macros.h>	#include <cpl_macros.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/**	/**

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_matrix.h	cpl_matrix.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:40 $	* $Date: 2008/07/21 08:48:40 $
	* $Revision: 1.34 $	* $Revision: 1.34 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_MATRIX_H	#ifndef CPL_MATRIX_H
	#define CPL_MATRIX_H	#define CPL_MATRIX_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <stdio.h>	#include <stdio.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_memory.h	cpl_memory.h

	/* $Id: cpl_memory.h,v 1.11 2007/04/23 14:00:07 llundin Exp $	/* $Id: cpl_memory.h,v 1.17 2009/12/08 09:33: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-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2007/04/23 14:00:07 $	* $Date: 2009/12/08 09:33:22 $
	* $Revision: 1.11 $	* $Revision: 1.17 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_MEMORY_H	#ifndef CPL_MEMORY_H
	#define CPL_MEMORY_H	#define CPL_MEMORY_H

	#include <sys/types.h>	#include <sys/types.h>
	#include <stdarg.h>	#include <stdarg.h>

	#include <cpl_macros.h>	#include <cpl_macros.h>


		/*-------------------------------------------------------------------------
		---
		Defines
		--------------------------------------------------------------------------
		--*/

		#undef CPL_HAVE_GNUC_ALLOC_SIZE

		#if defined __GNUC__
		#if __GNUC__ > 4 \|\| __GNUC__ == 4 && defined __GNUC_MINOR__ && __GNUC_MINOR
		__ > 2
		#define CPL_HAVE_GNUC_ALLOC_SIZE
		#endif
		#endif

		#undef CPL_HAVE_GNUC_UNUSED_RESULT

		#if defined __GNUC__ && __GNUC__ > 3
		#define CPL_HAVE_GNUC_UNUSED_RESULT
		#endif

		/*-------------------------------------------------------------------------
		---
		Function prototypes
		--------------------------------------------------------------------------
		--*/

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS


	void *cpl_malloc(size_t);	void *cpl_malloc(size_t)
	void *cpl_calloc(size_t, size_t);	#ifdef CPL_HAVE_GNUC_ALLOC_SIZE
	void cpl_realloc(void , size_t);	__attribute__((warn_unused_result, alloc_size(1)))
		#endif
		;
		void *cpl_calloc(size_t, size_t)
		#ifdef CPL_HAVE_GNUC_ALLOC_SIZE
		__attribute__((warn_unused_result, alloc_size(1,2)))
		#endif
		;
		void cpl_realloc(void , size_t)
		#ifdef CPL_HAVE_GNUC_ALLOC_SIZE
		__attribute__((warn_unused_result, alloc_size(2)))
		#endif
		;

	void cpl_free(void *);	void cpl_free(void *);


	char cpl_strdup(const char );	char cpl_strdup(const char )
		#ifdef CPL_HAVE_GNUC_UNUSED_RESULT
		__attribute__((warn_unused_result, malloc))
		#endif
		;
	char cpl_vsprintf(const char , va_list)	char cpl_vsprintf(const char , va_list)

	#ifdef __GNUC__	#ifdef CPL_HAVE_GNUC_UNUSED_RESULT
	__attribute__((format (printf, 1, 0)))	__attribute__((warn_unused_result, malloc, format (printf, 1, 0)))
		#elif defined __GNUC__
		__attribute__((malloc, format (printf, 1, 0)))
	#endif	#endif
	;	;

	char * cpl_sprintf(const char *, ...)	char * cpl_sprintf(const char *, ...)

	#ifdef __GNUC__	#ifdef CPL_HAVE_GNUC_UNUSED_RESULT
	__attribute__((format (printf, 1, 2)))	__attribute__((warn_unused_result, malloc, format (printf, 1, 2)))
		#elif defined __GNUC__
		__attribute__((malloc, format (printf, 1, 2)))
	#endif	#endif
	;	;


	int cpl_memory_is_empty(void);	int cpl_memory_is_empty(void)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;
	void cpl_memory_dump(void);	void cpl_memory_dump(void);

	CPL_END_DECLS	CPL_END_DECLS

	#endif /* CPL_MEMORY_H */	#endif /* CPL_MEMORY_H */

End of changes. 8 change blocks.
	13 lines changed or deleted	65 lines changed or added

	cpl_msg.h	cpl_msg.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:38 $	* $Date: 2008/07/21 08:48:38 $
	* $Revision: 1.13 $	* $Revision: 1.13 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_MSG_H	#ifndef CPL_MSG_H
	#define CPL_MSG_H	#define CPL_MSG_H

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_error.h>	#include <cpl_error.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_parameter.h	cpl_parameter.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: scastro $	* $Author: scastro $
	* $Date: 2007/07/17 09:36:49 $	* $Date: 2007/07/17 09:36:49 $
	* $Revision: 1.13 $	* $Revision: 1.13 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PARAMETER_H	#ifndef CPL_PARAMETER_H
	#define CPL_PARAMETER_H	#define CPL_PARAMETER_H

	#include <stdio.h>	#include <stdio.h>

	#include <cpl_error.h>	#include <cpl_error.h>
	#include <cpl_type.h>	#include <cpl_type.h>


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_parameterlist.h	cpl_parameterlist.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: scastro $	* $Author: scastro $
	* $Date: 2007/07/16 11:55:39 $	* $Date: 2007/07/16 11:55:39 $
	* $Revision: 1.7 $	* $Revision: 1.7 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PARAMETERLIST_H	#ifndef CPL_PARAMETERLIST_H
	#define CPL_PARAMETERLIST_H	#define CPL_PARAMETERLIST_H

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_parameter.h>	#include <cpl_parameter.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_photom.h	cpl_photom.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:40 $	* $Date: 2008/07/21 08:48:40 $
	* $Revision: 1.2 $	* $Revision: 1.2 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PHOTOM_H	#ifndef CPL_PHOTOM_H
	#define CPL_PHOTOM_H	#define CPL_PHOTOM_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <stdio.h>	#include <stdio.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_phys_const.h	cpl_phys_const.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:40 $	* $Date: 2008/07/21 08:48:40 $
	* $Revision: 1.6 $	* $Revision: 1.6 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PHYS_CONST_H	#ifndef CPL_PHYS_CONST_H
	#define CPL_PHYS_CONST_H	#define CPL_PHYS_CONST_H

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Defines	Defines
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_plot.h	cpl_plot.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 08:48:40 $	* $Date: 2008/07/21 08:48:40 $
	* $Revision: 1.7 $	* $Revision: 1.7 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PLOT_H	#ifndef CPL_PLOT_H
	#define CPL_PLOT_H	#define CPL_PLOT_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include "cpl_error.h"	#include "cpl_error.h"

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_plugin.h	cpl_plugin.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: scastro $	* $Author: scastro $
	* $Date: 2007/07/18 13:45:17 $	* $Date: 2007/07/18 13:45:17 $
	* $Revision: 1.11 $	* $Revision: 1.11 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PLUGIN_H	#ifndef CPL_PLUGIN_H
	#define CPL_PLUGIN_H	#define CPL_PLUGIN_H

	#include <stdio.h>	#include <stdio.h>

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_error.h>	#include <cpl_error.h>


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_pluginlist.h	cpl_pluginlist.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2005/02/10 14:29:26 $	* $Date: 2005/02/10 14:29:26 $
	* $Revision: 1.6 $	* $Revision: 1.6 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PLUGINLIST_H	#ifndef CPL_PLUGINLIST_H
	#define CPL_PLUGINLIST_H	#define CPL_PLUGINLIST_H

	#include <stdio.h>	#include <stdio.h>

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_error.h>	#include <cpl_error.h>
	#include <cpl_plugin.h>	#include <cpl_plugin.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_polynomial.h	cpl_polynomial.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2009/01/21 14:07:37 $	* $Date: 2009/01/21 14:07:37 $
	* $Revision: 1.34 $	* $Revision: 1.34 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_POLYNOMIAL_H	#ifndef CPL_POLYNOMIAL_H
	#define CPL_POLYNOMIAL_H	#define CPL_POLYNOMIAL_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <stdio.h>	#include <stdio.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_ppm.h	cpl_ppm.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US A	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/07/21 11:13:25 $	* $Date: 2008/07/21 11:13:25 $
	* $Revision: 1.9 $	* $Revision: 1.9 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PPM_H	#ifndef CPL_PPM_H
	#define CPL_PPM_H	#define CPL_PPM_H

	#include <cpl_bivector.h>	#include <cpl_bivector.h>
	#include <cpl_array.h>	#include <cpl_array.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_property.h	cpl_property.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: scastro $	* $Author: scastro $
	* $Date: 2007/07/17 09:37:33 $	* $Date: 2007/07/17 09:37:33 $
	* $Revision: 1.10 $	* $Revision: 1.10 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PROPERTY_H	#ifndef CPL_PROPERTY_H
	#define CPL_PROPERTY_H	#define CPL_PROPERTY_H

	#include <cpl_error.h>	#include <cpl_error.h>
	#include <cpl_type.h>	#include <cpl_type.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_propertylist.h	cpl_propertylist.h

	/* $Id: cpl_propertylist.h,v 1.19 2009/05/06 12:19:35 scastro Exp $	/* $Id: cpl_propertylist.h,v 1.21 2009/12/14 15:35: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-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*

	* $Author: scastro $	* $Author: llundin $
	* $Date: 2009/05/06 12:19:35 $	* $Date: 2009/12/14 15:35:53 $
	* $Revision: 1.19 $	* $Revision: 1.21 $
	* $Name: $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PROPERTYLIST_H	#ifndef CPL_PROPERTYLIST_H
	#define CPL_PROPERTYLIST_H	#define CPL_PROPERTYLIST_H

	#include <stdio.h>	#include <stdio.h>

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_type.h>	#include <cpl_type.h>
	#include <cpl_property.h>	#include <cpl_property.h>

	skipping to change at line 325	skipping to change at line 325
	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);
	cpl_error_code	cpl_error_code
	cpl_propertylist_copy_property_regexp(cpl_propertylist *self,	cpl_propertylist_copy_property_regexp(cpl_propertylist *self,
	const cpl_propertylist *other,	const cpl_propertylist *other,
	const char *regexp,	const char *regexp,
	int invert);	int invert);


		cpl_error_code
		cpl_propertylist_append_property(cpl_propertylist *self,
		const cpl_property *property);

		cpl_error_code
		cpl_propertylist_prepend_property(cpl_propertylist *self,
		const cpl_property *property);
		cpl_error_code
		cpl_propertylist_insert_property(cpl_propertylist *self,
		const char *here,
		const cpl_property *property);
		cpl_error_code
		cpl_propertylist_insert_after_property(cpl_propertylist *self,
		const char *after,
		const cpl_property *property);

	/*	/*
	* Sorting	* Sorting
	*/	*/

	cpl_error_code	cpl_error_code
	cpl_propertylist_sort(cpl_propertylist *self,	cpl_propertylist_sort(cpl_propertylist *self,
	cpl_propertylist_compare_func compare);	cpl_propertylist_compare_func compare);

	/*	/*
	* Loading, saving and conversion operations.	* Loading, saving and conversion operations.

End of changes. 3 change blocks.
	5 lines changed or deleted	21 lines changed or added

	cpl_recipe.h	cpl_recipe.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2006/10/31 14:54:34 $	* $Date: 2006/10/31 14:54:34 $
	* $Revision: 1.6 $	* $Revision: 1.6 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_RECIPE_H	#ifndef CPL_RECIPE_H
	#define CPL_RECIPE_H	#define CPL_RECIPE_H

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_plugin.h>	#include <cpl_plugin.h>
	#include <cpl_frameset.h>	#include <cpl_frameset.h>
	#include <cpl_parameterlist.h>	#include <cpl_parameterlist.h>
	#include <cpl_recipeconfig.h>	#include <cpl_recipeconfig.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_recipeconfig.h	cpl_recipeconfig.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2007/07/16 08:52:52 $	* $Date: 2007/07/16 08:52:52 $
	* $Revision: 1.2 $	* $Revision: 1.2 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_RECIPECONFIG_H	#ifndef CPL_RECIPECONFIG_H
	#define CPL_RECIPECONFIG_H	#define CPL_RECIPECONFIG_H

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_framedata.h>	#include <cpl_framedata.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_recipedefine.h	cpl_recipedefine.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1307 U SA
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/11/10 14:01:36 $	* $Date: 2008/11/10 14:01:36 $
	* $Revision: 1.6 $	* $Revision: 1.6 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_RECIPEDEFINE_H	#ifndef CPL_RECIPEDEFINE_H
	#define CPL_RECIPEDEFINE_H	#define CPL_RECIPEDEFINE_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <cpl_recipe.h>	#include <cpl_recipe.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_stats.h	cpl_stats.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $
	* $Date: 2008/10/17 14:24:01 $	* $Date: 2008/10/17 14:24:01 $
	* $Revision: 1.11 $	* $Revision: 1.11 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_STATS_H	#ifndef CPL_STATS_H
	#define CPL_STATS_H	#define CPL_STATS_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <stdio.h>	#include <stdio.h>

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cpl_table.h	cpl_table.h

	/* $Id: cpl_table.h,v 1.57 2008/12/24 12:10:03 cizzo Exp $	/* $Id: cpl_table.h,v 1.60 2009/12/07 10:38:44 cizzo Exp $
	*	*
	* This file is part of the ESO Common Pipeline Library	* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-2008 European Southern Observatory	* Copyright (C) 2001-2008 European Southern Observatory
	*	*
	* This program is free software; you can redistribute it and/or modify	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or	* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.	* (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,

	skipping to change at line 23	skipping to change at line 23
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: cizzo $	* $Author: cizzo $

	* $Date: 2008/12/24 12:10:03 $	* $Date: 2009/12/07 10:38:44 $
	* $Revision: 1.57 $	* $Revision: 1.60 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_TABLE_H	#ifndef CPL_TABLE_H
	#define CPL_TABLE_H	#define CPL_TABLE_H

	#include <stdio.h>	#include <stdio.h>

	#include "cpl_io.h"	#include "cpl_io.h"
	#include "cpl_type.h"	#include "cpl_type.h"
	#include "cpl_propertylist.h"	#include "cpl_propertylist.h"

	skipping to change at line 100	skipping to change at line 100
	const char *unit);	const char *unit);
	const char cpl_table_get_column_unit(const cpl_table , const char *name);	const char cpl_table_get_column_unit(const cpl_table , const char *name);

	cpl_error_code cpl_table_set_column_format(cpl_table , const char name,	cpl_error_code cpl_table_set_column_format(cpl_table , const char name,
	const char *format);	const char *format);
	const char cpl_table_get_column_format(const cpl_table , const char *name );	const char cpl_table_get_column_format(const cpl_table , const char *name );

	cpl_error_code cpl_table_set_column_depth(cpl_table , const char , int);	cpl_error_code cpl_table_set_column_depth(cpl_table , const char , int);
	int cpl_table_get_column_depth(const cpl_table , const char );	int cpl_table_get_column_depth(const cpl_table , const char );
	int cpl_table_get_column_dimensions(const cpl_table , const char );	int cpl_table_get_column_dimensions(const cpl_table , const char );

	cpl_error_code cpl_table_set_column_dimensions(cpl_table *,	cpl_error_code cpl_table_set_column_dimensions(cpl_table , const char ,
	const char , cpl_array );	const cpl_array *);
	int cpl_table_get_column_dimension(cpl_table , const char , int);	int cpl_table_get_column_dimension(const cpl_table , const char , int);

	int cpl_table_get_data_int(cpl_table , const char *name);	int cpl_table_get_data_int(cpl_table , const char *name);
	const int cpl_table_get_data_int_const(const cpl_table ,	const int cpl_table_get_data_int_const(const cpl_table ,
	const char *name);	const char *name);
	float cpl_table_get_data_float(cpl_table , const char *name);	float cpl_table_get_data_float(cpl_table , const char *name);
	const float cpl_table_get_data_float_const(const cpl_table ,	const float cpl_table_get_data_float_const(const cpl_table ,
	const char *name);	const char *name);
	double cpl_table_get_data_double(cpl_table , const char *name);	double cpl_table_get_data_double(cpl_table , const char *name);
	const double cpl_table_get_data_double_const(const cpl_table ,	const double cpl_table_get_data_double_const(const cpl_table ,
	const char *name);	const char *name);

	skipping to change at line 145	skipping to change at line 145

	cpl_error_code cpl_table_fill_column_window(cpl_table , const char ,	cpl_error_code cpl_table_fill_column_window(cpl_table , const char ,
	int, int, double);	int, int, double);
	cpl_error_code cpl_table_fill_column_window_int(cpl_table , const char ,	cpl_error_code cpl_table_fill_column_window_int(cpl_table , const char ,
	int, int, int);	int, int, int);
	cpl_error_code cpl_table_fill_column_window_float(cpl_table , const char ,	cpl_error_code cpl_table_fill_column_window_float(cpl_table , const char ,
	int, int, float);	int, int, float);
	cpl_error_code cpl_table_fill_column_window_double(cpl_table , const char ,	cpl_error_code cpl_table_fill_column_window_double(cpl_table , const char ,
	int, int, double);	int, int, double);
	cpl_error_code cpl_table_fill_column_window_string(cpl_table , const char ,	cpl_error_code cpl_table_fill_column_window_string(cpl_table , const char ,

	int, int, char *);	int, int, const char *);
	cpl_error_code cpl_table_fill_column_window_array(cpl_table , const char ,	cpl_error_code cpl_table_fill_column_window_array(cpl_table , const char ,

	int, int, cpl_array *);	int, int, const cpl_array *);

	cpl_error_code cpl_table_copy_data_int(cpl_table , const char , const int *);	cpl_error_code cpl_table_copy_data_int(cpl_table , const char , const int *);
	cpl_error_code cpl_table_copy_data_float(cpl_table , const char ,	cpl_error_code cpl_table_copy_data_float(cpl_table , const char ,
	const float *);	const float *);
	cpl_error_code cpl_table_copy_data_double(cpl_table , const char ,	cpl_error_code cpl_table_copy_data_double(cpl_table , const char ,
	const double *);	const double *);
	cpl_error_code cpl_table_copy_data_string(cpl_table , const char ,	cpl_error_code cpl_table_copy_data_string(cpl_table , const char ,
	const char **);	const char **);

	cpl_error_code cpl_table_shift_column(cpl_table , const char , int);	cpl_error_code cpl_table_shift_column(cpl_table , const char , int);

	skipping to change at line 285	skipping to change at line 285
	int cpl_table_or_selected(cpl_table , const char ,	int cpl_table_or_selected(cpl_table , const char ,
	cpl_table_select_operator, const char *);	cpl_table_select_operator, const char *);
	int cpl_table_is_selected(const cpl_table *, int);	int cpl_table_is_selected(const cpl_table *, int);

	int cpl_table_count_selected(const cpl_table *);	int cpl_table_count_selected(const cpl_table *);

	void cpl_table_dump_structure(const cpl_table , FILE );	void cpl_table_dump_structure(const cpl_table , FILE );
	void cpl_table_dump(const cpl_table , int, int, FILE );	void cpl_table_dump(const cpl_table , int, int, FILE );

	cpl_table cpl_table_load(const char , int, int);	cpl_table cpl_table_load(const char , int, int);

	cpl_table cpl_table_load_window(const char , int, int, cpl_array *, int,	cpl_table cpl_table_load_window(const char , int, int, const cpl_array *,
	int);	int, int);
	cpl_error_code cpl_table_save(const cpl_table , const cpl_propertylist ,	cpl_error_code cpl_table_save(const cpl_table , const cpl_propertylist ,
	const cpl_propertylist , const char filenam e,	const cpl_propertylist , const char filenam e,
	unsigned mode);	unsigned mode);

	CPL_END_DECLS	CPL_END_DECLS

	#endif	#endif
	/* end of cpl_table.h */	/* end of cpl_table.h */

End of changes. 6 change blocks.
	11 lines changed or deleted	11 lines changed or added

	cpl_test.h	cpl_test.h

	/* $Id: cpl_test.h,v 1.28 2009/01/09 10:36:03 llundin Exp $	/* $Id: cpl_test.h,v 1.40 2009/12/01 10:59:55 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2009/01/09 10:36:03 $	* $Date: 2009/12/01 10:59:55 $
	* $Revision: 1.28 $	* $Revision: 1.40 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_TEST_H	#ifndef CPL_TEST_H
	#define CPL_TEST_H	#define CPL_TEST_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#ifdef HAVE_CONFIG_H	#ifdef HAVE_CONFIG_H
	#include <config.h>	#include <config.h>
	#endif	#endif

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_msg.h>	#include <cpl_msg.h>
	#include <cpl_type.h>	#include <cpl_type.h>


	#include <cpl_image.h>	#include <cpl_array.h>
		#include <cpl_imagelist.h>
	#include <cpl_polynomial.h>	#include <cpl_polynomial.h>

		#include <cpl_errorstate.h>

		#include <errno.h>

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Defines	Defines
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#undef CPL_HAVE_GNUC_NONNULL	#undef CPL_HAVE_GNUC_NONNULL

	#if defined __GNUC__	#if defined __GNUC__
	#if __GNUC__ > 3 \|\| __GNUC__ == 3 && defined __GNUC_MINOR__ && __GNUC_MINOR __ > 2	#if __GNUC__ > 3 \|\| __GNUC__ == 3 && defined __GNUC_MINOR__ && __GNUC_MINOR __ > 2
	#define CPL_HAVE_GNUC_NONNULL	#define CPL_HAVE_GNUC_NONNULL

	skipping to change at line 98	skipping to change at line 102

	Example of usage:	Example of usage:
	@code	@code

	cpl_test(myfunc()); // myfunc() is expected to return non-zero	cpl_test(myfunc()); // myfunc() is expected to return non-zero

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test(bool) cpl_test_macro((int)(bool), CPL_TRUE, #bool, \	#define cpl_test(bool) do { \
	cpl_func, __FILE__, __LINE__)	const int cpl_test_errno = errno; \
		cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_macro(cpl_test_errno, cpl_test_state, \
		(bool) ? 1 : 0, CPL_TRUE, #bool, cpl_func, \
		__FILE__, __LINE__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**
	@ingroup cpl_test	@ingroup cpl_test
	@brief Evaluate an expression and increment an internal counter if non- zero	@brief Evaluate an expression and increment an internal counter if non- zero
	@param zero The numerical expression to evaluate, side-effects are al lowed	@param zero The numerical expression to evaluate, side-effects are al lowed
	@note A zero value of the expression is a success, other values are no t	@note A zero value of the expression is a success, other values are no t
	@return void	@return void
	@see cpl_test()	@see cpl_test()
	@note This macro should be used for unit tests	@note This macro should be used for unit tests

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_zero(myfunc()); // myfunc() is expected to return zero	cpl_test_zero(myfunc()); // myfunc() is expected to return zero

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_zero(zero) cpl_test_macro((int)(zero), CPL_FALSE, #zero, \	#define cpl_test_zero(zero) do { \
	cpl_func, __FILE__, __LINE__)	const int cpl_test_errno = errno; \
		cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_macro(cpl_test_errno, cpl_test_state, \
		(zero) ? 1 : 0, CPL_FALSE, #zero, \
		cpl_func, __FILE__, __LINE__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test if a pointer is NULL and update an internal counter on failu re	@brief Test if a pointer is NULL and update an internal counter on failu re
	@param pointer The NULL-pointer to check, side-effects are allowed	@param pointer The NULL-pointer to check, side-effects are allowed

	@see cpl_test()	@see cpl_test()
	@return void	@return void

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_null(pointer); // pointer is expected to be NULL	cpl_test_null(pointer); // pointer is expected to be NULL

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_null(pointer)	#define cpl_test_null(pointer) do { \
	\	const int cpl_test_errno = errno; \
	cpl_test_null_macro(pointer, #pointer, cpl_func, __FILE__, __LINE__	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	)	errno = 0; \
		cpl_test_null_macro(cpl_test_errno, cpl_test_state, pointer, \
		#pointer, cpl_func, __FILE__, __LINE__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test if a pointer is non-NULL	@brief Test if a pointer is non-NULL
	@param pointer The pointer to check, side-effects are allowed	@param pointer The pointer to check, side-effects are allowed

	@see cpl_test_nonnull()	@see cpl_test_nonnull()
	@return void	@return void

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_nonnull(pointer); // pointer is expected to be non-NULL	cpl_test_nonnull(pointer); // pointer is expected to be non-NULL

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_nonnull(pointer)	#define cpl_test_nonnull(pointer) do { \
	\	const int cpl_test_errno = errno; \
	cpl_test_nonnull_macro(pointer, #pointer, cpl_func, __FILE__, __LIN	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	E__)	errno = 0; \
		cpl_test_nonnull_macro(cpl_test_errno, cpl_test_state, \
		pointer, #pointer, cpl_func, \
		__FILE__, __LINE__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test and reset the CPL error code	@brief Test and reset the CPL error code
	@param error The expected CPL error code (incl. CPL_ERROR_NONE)	@param error The expected CPL error code (incl. CPL_ERROR_NONE)

	@see cpl_test()	@see cpl_test()
	@note After the test, the CPL errorstate is reset	@note After the test, the CPL errorstate is reset
	@return void	@return void

	Example of usage:	Example of usage:
	@code	@code


	skipping to change at line 187	skipping to change at line 217
	cpl_test_error(CPL_ERROR_NULL_INPUT); // ... and to set this error code	cpl_test_error(CPL_ERROR_NULL_INPUT); // ... and to set this error code

	// The errorstate has been reset.	// The errorstate has been reset.

	cpl_test( !my_func(p) ); // my_func(p) is expected to return zero	cpl_test( !my_func(p) ); // my_func(p) is expected to return zero

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_error(error)	#define cpl_test_error(error) do { \
	\	const int cpl_test_errno = errno; \
	cpl_test_error_macro(error, #error,	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	\	errno = 0; \
	cpl_func, __FILE__, __LINE__)	cpl_test_error_macro(cpl_test_errno, cpl_test_state, error, \
		#error, cpl_func, __FILE__, __LINE__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
		@brief Test if two error expressions are equal and reset the CPL error c
		ode
		@param first The first value in the comparison
		@param second The second value in the comparison
		@see cpl_test_error
		@note If the two CPL error expressions are equal they will also be test
		ed
		against the current CPL error code. After the test(s), the CPL
		errorstate is reset.

		Example of usage:
		@code

		cpl_error_code error = my_func(NULL);

		// my_func(NULL) is expected to return CPL_ERROR_NULL_INPUT
		// and to set the same error code
		cpl_test_eq_error(error, CPL_ERROR_NULL_INPUT);

		// The errorstate has been reset.

		error = my_func(p); // Successful call
		cpl_test_eq_error(error, CPL_ERROR_NONE);

		@endcode

		*/
		/*-------------------------------------------------------------------------
		---*/
		#define cpl_test_eq_error(first, second) do { \
		const int cpl_test_errno = errno; \
		cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_eq_error_macro(cpl_test_errno, cpl_test_state, first, \
		#first, second, #second, cpl_func, \
		__FILE__, __LINE__); \
		} while (0)

		/*-------------------------------------------------------------------------
		---*/
		/**
		@ingroup cpl_test
	@brief Test if two integer expressions are equal	@brief Test if two integer expressions are equal
	@param first The first value in the comparison, side-effects are al lowed	@param first The first value in the comparison, side-effects are al lowed
	@param second The second value in the comparison, side-effects are a llowed	@param second The second value in the comparison, side-effects are a llowed

	@see cpl_test()	@see cpl_test()
	@return void	@return void

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_eq(computed, expected);	cpl_test_eq(computed, expected);

	@endcode	@endcode

	For comparison of floating point values, see cpl_test_abs() and	For comparison of floating point values, see cpl_test_abs() and
	cpl_test_rel().	cpl_test_rel().

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_eq(first, second)	#define cpl_test_eq(first, second) do { \
	\	const int cpl_test_errno = errno; \
	cpl_test_eq_macro(first, #first, second, #second,	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	\	errno = 0; \
	cpl_func, __FILE__, __LINE__)	cpl_test_eq_macro(cpl_test_errno, cpl_test_state, first, #first, \
		second, #second, cpl_func, __FILE__, __LINE__);
		\
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test if two integer expressions are not equal	@brief Test if two integer expressions are not equal
	@param first The first value in the comparison, side-effects are al lowed	@param first The first value in the comparison, side-effects are al lowed
	@param second The second value in the comparison, side-effects are a llowed	@param second The second value in the comparison, side-effects are a llowed

	@see cpl_test_eq()	@see cpl_test_eq()
	@return void	@return void

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_noneq(computed, wrong);	cpl_test_noneq(computed, wrong);

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_noneq(first, second) \	#define cpl_test_noneq(first, second) do { \
	cpl_test_noneq_macro(first, #first, second, #second, \	const int cpl_test_errno = errno; \
	cpl_func, __FILE__, __LINE__)	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_noneq_macro(cpl_test_errno, cpl_test_state, first, #first,
		\
		second, #second, cpl_func, __FILE__, __LINE__)
		; \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
		@brief Test if two pointer expressions are equal
		@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
		@see cpl_test_eq()
		@return void

		Example of usage:
		@code

		cpl_test_eq_ptr(computed, expected);

		@endcode

		*/
		/*-------------------------------------------------------------------------
		---*/
		#define cpl_test_eq_ptr(first, second) do { \
		const int cpl_test_errno = errno; \
		cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_eq_ptr_macro(cpl_test_errno, cpl_test_state, first, #first
		, \
		second, #second, cpl_func, __FILE__, __LINE__
		); \
		} while (0)

		/*-------------------------------------------------------------------------
		---*/
		/**
		@ingroup cpl_test
		@brief Test if two pointer expressions are not equal
		@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
		@see cpl_test_eq_ptr()
		@return void

		Example of usage:
		@code

		cpl_test_noneq_ptr(computed, wrong);

		@endcode

		*/
		/*-------------------------------------------------------------------------
		---*/
		#define cpl_test_noneq_ptr(first, second) do { \
		const int cpl_test_errno = errno; \
		cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_noneq_ptr_macro(cpl_test_errno, cpl_test_state, first, \
		#first, second, #second, cpl_func, \
		__FILE__, __LINE__); \
		} while (0)

		/*-------------------------------------------------------------------------
		---*/
		/**
		@ingroup cpl_test
	@brief Test if two strings are equal	@brief Test if two strings are equal
	@param first The first string or NULL of the comparison	@param first The first string or NULL of the comparison
	@param second The second string or NULL of the comparison	@param second The second string or NULL of the comparison
	@note One or two NULL pointer(s) is considered a failure.	@note One or two NULL pointer(s) is considered a failure.

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_eq_string(computed, expected);	cpl_test_eq_string(computed, expected);

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_eq_string(first, second) \	#define cpl_test_eq_string(first, second) do { \
	cpl_test_eq_string_macro(first, #first, second, #second, \	const int cpl_test_errno = errno; \
	cpl_func, __FILE__, __LINE__)	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_eq_string_macro(cpl_test_errno, cpl_test_state, first, \
		#first, second, #second, cpl_func, \
		__FILE__, __LINE__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test if a file is valid FITS using an external verification utili ty	@brief Test if a file is valid FITS using an external verification utili ty
	@param fitsfile The file to verify, NULL causes failure	@param fitsfile The file to verify, NULL causes failure
	@note The external verification utility is specified with the environemt	@note The external verification utility is specified with the environemt
	variable CPL_TEST_FITS, if is not set the test will pass on any	variable CPL_TEST_FITS, if is not set the test will pass on any
	non-NULL file.	non-NULL file.

	Example of usage:	Example of usage:
	@code	@code

	export CPL_TEST_FITS=/usr/local/bin/fitsverify	export CPL_TEST_FITS=/usr/local/bin/fitsverify

	skipping to change at line 281	skipping to change at line 423
	@endcode	@endcode

	@code	@code

	cpl_test_fits(fitsfile);	cpl_test_fits(fitsfile);

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_fits(fitsfile) \	#define cpl_test_fits(fitsfile) do { \
	cpl_test_fits_macro(fitsfile, #fitsfile, \	const int cpl_test_errno = errno; \
	cpl_func, __FILE__, __LINE__)	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_fits_macro(cpl_test_errno, cpl_test_state, fitsfile, \
		#fitsfile, cpl_func, __FILE__, __LINE__);
		\
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test if two CPL masks are equal	@brief Test if two CPL masks are equal
	@param first The first mask or NULL of the comparison	@param first The first mask or NULL of the comparison
	@param second The second mask or NULL of the comparison	@param second The second mask or NULL of the comparison
	@note One or two NULL pointer(s) is considered a failure.	@note One or two NULL pointer(s) is considered a failure.

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_eq_mask(computed, expected);	cpl_test_eq_mask(computed, expected);

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_eq_mask(first, second) \	#define cpl_test_eq_mask(first, second) do { \
	cpl_test_eq_mask_macro(first, #first, second, #second, \	const int cpl_test_errno = errno; \
	cpl_func, __FILE__, __LINE__)	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_eq_mask_macro(cpl_test_errno, cpl_test_state, first, #firs
		t, \
		second, #second, cpl_func, __FILE__, __LINE_
		_); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**
	@ingroup cpl_test	@ingroup cpl_test
	@brief Evaluate A <= B and increment an internal counter if it is not t rue	@brief Evaluate A <= B and increment an internal counter if it is not t rue
	@param value The number to test	@param value The number to test
	@param tolerance The upper limit to compare against	@param tolerance The upper limit to compare against
	@return void	@return void
	@see cpl_test_init()	@see cpl_test_init()
	@note This macro should be used for unit tests	@note This macro should be used for unit tests

	skipping to change at line 325	skipping to change at line 476
	Example of usage:	Example of usage:
	@code	@code

	cpl_test_leq(fabs(myfunc(&p)), DBL_EPSILON);	cpl_test_leq(fabs(myfunc(&p)), DBL_EPSILON);
	cpl_test_nonnull(p);	cpl_test_nonnull(p);

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_leq(value, tolerance)	#define cpl_test_leq(value, tolerance) do { \
	\	const int cpl_test_errno = errno; \
	cpl_test_leq_macro(value, #value, tolerance, #tolerance, cpl_func,	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	\	errno = 0; \
	__FILE__, __LINE__)	cpl_test_leq_macro(cpl_test_errno, cpl_test_state, value, #value, \
		tolerance, #tolerance, cpl_func, __FILE__, __LIN
		E__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**
	@ingroup cpl_test	@ingroup cpl_test
	@brief Evaluate A < B and increment an internal counter if it is not tr ue	@brief Evaluate A < B and increment an internal counter if it is not tr ue
	@param value The number to test	@param value The number to test
	@param tolerance The upper limit to compare against	@param tolerance The upper limit to compare against
	@return void	@return void
	@see cpl_test_init()	@see cpl_test_init()
	@note This macro should be used for unit tests	@note This macro should be used for unit tests

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_lt(0.0, myfunc());	cpl_test_lt(0.0, myfunc());

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_lt(value, tolerance)	#define cpl_test_lt(value, tolerance) do { \
	\	const int cpl_test_errno = errno; \
	cpl_test_lt_macro(value, #value, tolerance, #tolerance, cpl_func,	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	\	errno = 0; \
	__FILE__, __LINE__)	cpl_test_lt_macro(cpl_test_errno, cpl_test_state, value, #value, \
		tolerance, #tolerance, cpl_func, __FILE__, __LINE
		__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test if two numerical expressions are within a given absolute tol erance	@brief Test if two numerical expressions are within a given absolute tol erance
	@param first The first value in the comparison, side-effects are al lowed	@param first The first value in the comparison, side-effects are al lowed
	@param second The second value in the comparison, side-effects are a llowed	@param second The second value in the comparison, side-effects are a llowed
	@param tolerance A non-negative tolerance	@param tolerance A non-negative tolerance
	@note If the tolerance is negative, the test will always fail	@note If the tolerance is negative, the test will always fail
	@see cpl_test()	@see cpl_test()
	@return void	@return void

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_abs(computed, expected, DBL_EPSILON);	cpl_test_abs(computed, expected, DBL_EPSILON);

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_abs(first, second, tolerance)	#define cpl_test_abs(first, second, tolerance) do { \
	\	const int cpl_test_errno = errno; \
	cpl_test_abs_macro(first, #first, second, #second,	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	\	errno = 0; \
	tolerance, #tolerance,	cpl_test_abs_macro(cpl_test_errno, cpl_test_state, first, \
	\	#first, second, #second, tolerance, \
	cpl_func, __FILE__, __LINE__)	#tolerance, cpl_func, __FILE__, __LINE__); \
		} while (0)

		/*-------------------------------------------------------------------------
		---*/
		/**
		@ingroup cpl_test
		@brief Test if two vectors are identical within a given (absolute) toler
		ance
		@param first The first vector in the comparison
		@param second The second vector of identical size in the comparison
		@param tolerance A non-negative tolerance
		@return void
		@see cpl_test_abs()
		@note The test will fail if one or both the vectors are NULL

		*/
		/*-------------------------------------------------------------------------
		---*/
		#define cpl_test_vector_abs(first, second, tolerance) do { \
		const int cpl_test_errno = errno; \
		cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_vector_abs_macro(cpl_test_errno, cpl_test_state, first, \
		#first, second, #second, tolerance, \
		#tolerance, cpl_func, __FILE__, __LINE__
		); \
		} while (0)

		/*-------------------------------------------------------------------------
		---*/
		/**
		@ingroup cpl_test
		@brief Test if two numerical arrays are identical within a given (absolu
		te)
		tolerance
		@param first The first array in the comparison
		@param second The second array of identical size in the comparison
		@param tolerance A non-negative tolerance
		@return void
		@see cpl_test_abs()
		@note The test will fail if one or both the arrays are NULL or of a
		non-numerical type

		*/
		/*-------------------------------------------------------------------------
		---*/
		#define cpl_test_array_abs(first, second, tolerance) do { \
		const int cpl_test_errno = errno; \
		cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_array_abs_macro(cpl_test_errno, cpl_test_state, first, \
		#first, second, #second, tolerance, \
		#tolerance, cpl_func, __FILE__, __LINE__)
		; \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test if two images are identical within a given (absolute) tolera nce	@brief Test if two images are identical within a given (absolute) tolera nce
	@param first The first image in the comparison	@param first The first image in the comparison
	@param second The second image of identical size in the comparison	@param second The second image of identical size in the comparison
	@param tolerance A non-negative tolerance	@param tolerance A non-negative tolerance
	@return void	@return void
	@see cpl_test_abs()	@see cpl_test_abs()
	@note The test will fail if one or both the images are NULL	@note The test will fail if one or both the images are NULL

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_image_abs(first, second, tolerance) \	#define cpl_test_image_abs(first, second, tolerance) do { \
	cpl_test_image_abs_macro(first, #first, second, #second, \	const int cpl_test_errno = errno; \
	tolerance, #tolerance, \	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	cpl_func, __FILE__, __LINE__)	errno = 0; \
		cpl_test_image_abs_macro(cpl_test_errno, cpl_test_state, first, \
		#first, second, #second, tolerance, \
		#tolerance, cpl_func, __FILE__, __LINE__)
		; \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
		@brief Test if two imagelists are identical within a given (absolute)
		tolerance
		@param first The first imagelist in the comparison
		@param second The second imagelist of identical size in the compari
		son
		@param tolerance A non-negative tolerance
		@return void
		@see cpl_test_image_abs()
		@note The test will fail if one or both the imagelists are NULL

		*/
		/*-------------------------------------------------------------------------
		---*/
		#define cpl_test_imagelist_abs(first, second, tolerance) do { \
		const int cpl_test_errno = errno; \
		cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_imagelist_abs_macro(cpl_test_errno, cpl_test_state, \
		first, #first, second, #second, \
		tolerance, #tolerance, cpl_func, \
		__FILE__, __LINE__); \
		} while (0)

		/*-------------------------------------------------------------------------
		---*/
		/**
		@ingroup cpl_test
	@brief Test if two polynomials are identical within a given (absolute)	@brief Test if two polynomials are identical within a given (absolute)
	tolerance	tolerance
	@param first The first polynomial in the comparison	@param first The first polynomial in the comparison
	@param second The second polynomial in the comparison	@param second The second polynomial in the comparison
	@param tolerance A non-negative tolerance	@param tolerance A non-negative tolerance
	@return void	@return void
	@see cpl_test_abs()	@see cpl_test_abs()
	@note The test will fail if one or both the polynomials are NULL	@note The test will fail if one or both the polynomials are NULL

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_polynomial_abs(first, second, tolerance) \	#define cpl_test_polynomial_abs(first, second, tolerance) do { \
	cpl_test_polynomial_abs_macro(first, #first, second, #second, \	const int cpl_test_errno = errno; \
	tolerance, #tolerance, \	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	cpl_func, __FILE__, __LINE__)	errno = 0; \
		cpl_test_polynomial_abs_macro(cpl_test_errno, cpl_test_state, first
		, \
		#first, second, #second, tolerance, \
		#tolerance, cpl_func, __FILE__, __LIN
		E__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test if two numerical expressions are within a given relative tol erance	@brief Test if two numerical expressions are within a given relative tol erance
	@param first The first value in the comparison, side-effects are al lowed	@param first The first value in the comparison, side-effects are al lowed
	@param second The second value in the comparison, side-effects are a llowed	@param second The second value in the comparison, side-effects are a llowed
	@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 va lues	@note If the tolerance is negative or if one but not both of the two va lues
	is zero, the test will always fail. if both values are zero, the test	is zero, the test will always fail. if both values are zero, the test
	will succeed for any non-negative tolerance. The test is commutat ive in	will succeed for any non-negative tolerance. The test is commutat ive in
	the two values.	the two values.
	@see cpl_test()	@see cpl_test()
	@return void	@return void

	skipping to change at line 441	skipping to change at line 686

	Example of usage:	Example of usage:
	@code	@code

	cpl_test_rel(computed, expected, 0.001);	cpl_test_rel(computed, expected, 0.001);

	@endcode	@endcode

	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_rel(first, second, tolerance)	#define cpl_test_rel(first, second, tolerance) do { \
	\	const int cpl_test_errno = errno; \
	cpl_test_rel_macro(first, #first, second, #second,	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
	\	errno = 0; \
	tolerance, #tolerance,	cpl_test_rel_macro(cpl_test_errno, cpl_test_state, first, #first, \
	\	second, #second, tolerance, #tolerance, \
	cpl_func, __FILE__, __LINE__)	cpl_func, __FILE__, __LINE__); \
		} while (0)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**

		@ingroup cpl_test
	@brief Test if the memory system is empty	@brief Test if the memory system is empty
	@see cpl_memory_is_empty()	@see cpl_memory_is_empty()
	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_test_memory_is_empty()	#define cpl_test_memory_is_empty() do { \
	\	const int cpl_test_errno = errno; \
	cpl_test_memory_is_empty_macro(cpl_func, __FILE__, __LINE__)	cpl_errorstate cpl_test_state = cpl_errorstate_get(); \
		errno = 0; \
		cpl_test_memory_is_empty_macro(cpl_test_errno, cpl_test_state, \
		cpl_func, __FILE__, __LINE__)

	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/
	/**	/**
	@ingroup cpl_test	@ingroup cpl_test
	@brief Evaluate an expression and return if it fails	@brief Evaluate an expression and return if it fails
	@param bool The (boolean) expression to evaluate, side-effects are al lowed	@param bool The (boolean) expression to evaluate, side-effects are al lowed
	@note A zero value of the expression is a failure, other values are no t	@note A zero value of the expression is a failure, other values are no t
	@return void	@return void
	@see cpl_test()	@see cpl_test()
	@note This macro should be used for unit tests that cannot continue aft er	@note This macro should be used for unit tests that cannot continue aft er

	skipping to change at line 484	skipping to change at line 738
	cpl_test(myfunc(&p));	cpl_test(myfunc(&p));
	cpl_assert(p != NULL);	cpl_assert(p != NULL);
	cpl_test(*p);	cpl_test(*p);

	return cpl_test_end(0);	return cpl_test_end(0);
	}	}

	@endcode	@endcode
	*/	*/
	/------------------------------------------------------------------------- ---/	/------------------------------------------------------------------------- ---/

	#define cpl_assert(bool) do {	#define cpl_assert(bool) do { \
	\	const int cpl_assert_errno = errno; \
	/* Evaluate bool just once */	cpl_errorstate cpl_assert_state = cpl_errorstate_get(); \
	\	/* Evaluate bool just once */ \
	const cpl_boolean cpl_assert_ok = (bool) ? CPL_TRUE : CPL_FALSE;	const cpl_boolean cpl_assert_ok = (bool) ? CPL_TRUE : CPL_FALSE; \
	\	cpl_test_macro(cpl_assert_errno, cpl_assert_state, cpl_assert_ok, \
	cpl_test(cpl_assert_ok);	CPL_TRUE, #bool, cpl_func, __FILE__, __LINE__); \
	\	if (cpl_assert_ok == CPL_FALSE) return cpl_test_end(0); \
	if (cpl_assert_ok == CPL_FALSE) return cpl_test_end(1);	} while (0)
	\
	} while (0)

	/* Acceptable error margin */	/* Acceptable error margin */
	/* Should be set to 1.0 in development, can be set to 2.0 in deliveries */	/* Should be set to 1.0 in development, can be set to 2.0 in deliveries */
	#ifndef cpl_error_margin	#ifndef cpl_error_margin
	#define cpl_error_margin 2.0	#define cpl_error_margin 2.0
	#endif	#endif

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Function prototypes	Function prototypes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	void cpl_test_init_macro(const char , const char , cpl_msg_severity)	void cpl_test_init_macro(const char , const char , cpl_msg_severity)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull))	__attribute__((nonnull))
	#endif	#endif

	;	;
	int cpl_test_end(int);	int cpl_test_end(int);

	void cpl_test_macro(int, cpl_boolean, const char , const char , const cha	void cpl_test_macro(int, cpl_errorstate, int, cpl_boolean, const char *,
	r *,	const char , const char , unsigned)
	unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull))	__attribute__((nonnull))
	#endif	#endif

	;	;


	void cpl_test_error_macro(cpl_error_code, const char , const char ,	void cpl_test_error_macro(int, cpl_errorstate, cpl_error_code, const char *
	const char *, unsigned)	,
		const char , const char , unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull))	__attribute__((nonnull))
	#endif	#endif

	;	;


	void cpl_test_null_macro(const void , const char , const char *,	void cpl_test_eq_error_macro(int, cpl_errorstate, cpl_error_code, const cha
	const char *, unsigned)	r *,
		cpl_error_code, const char *,
		const char , const char , unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull(2, 3, 4)))	__attribute__((nonnull))
	#endif	#endif

	;	;
	void cpl_test_nonnull_macro(const void , const char , const char *,
	const char *, unsigned)	void cpl_test_null_macro(int, cpl_errorstate, const void , const char ,
		const char , const char , unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull(2, 3, 4)))	__attribute__((nonnull(4, 5, 6)))
	#endif	#endif

	;	;
	void cpl_test_eq_macro(int, const char , int, const char , const char *,	void cpl_test_nonnull_macro(int, cpl_errorstate, const void , const char
	const char *, unsigned)	,
		const char , const char , unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull))	__attribute__((nonnull(4, 5, 6)))
	#endif	#endif

	;	;
		void cpl_test_eq_macro(int, cpl_errorstate, int, const char *, int,
		const char , const char , const char *, unsigned)
		#ifdef CPL_HAVE_GNUC_NONNULL
		__attribute__((nonnull))
		#endif
		;


	void cpl_test_noneq_macro(int, const char , int, const char , const char	void cpl_test_noneq_macro(int, cpl_errorstate, int, const char *, int,
	*,	const char , const char , const char *, unsigne
	const char *, unsigned)	d)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull))	__attribute__((nonnull))
	#endif	#endif

	;	;


	void cpl_test_eq_string_macro(const char , const char , const char *,	void cpl_test_eq_ptr_macro(int, cpl_errorstate, const void , const char ,
	const char , const char , const char *,	const void , const char , const char *,
	unsigned)	const char *, unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull(2, 4, 5, 6)))	__attribute__((nonnull(4, 6, 7, 8)))
	#endif	#endif

	;	;


	void cpl_test_fits_macro(const char , const char , const char *,	void cpl_test_noneq_ptr_macro(int, cpl_errorstate, const void *, const char
	const char *, unsigned)	*,
		const void , const char , const char *,
		const char *, unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull(2, 3, 4)))	__attribute__((nonnull(4, 6, 7, 8)))
	#endif	#endif
	;	;


	void cpl_test_eq_mask_macro(const cpl_mask , const char , const cpl_mask	void cpl_test_eq_string_macro(int, cpl_errorstate, const char *, const cha
	*,	r *,
	const char , const char , const char *,	const char , const char , const char *,
	unsigned)	const char *, unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull(2, 4, 5, 6)))	__attribute__((nonnull(4, 6, 7, 8)))
	#endif	#endif
	;	;


	void cpl_test_leq_macro(double, const char , double, const char ,	void cpl_test_fits_macro(int, cpl_errorstate, const char , const char ,
	const char , const char , unsigned)	const char , const char , unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull))	__attribute__((nonnull(4, 5, 6)))
	#endif	#endif

	;	;


	void cpl_test_lt_macro(double, const char , double, const char ,	void cpl_test_eq_mask_macro(int, cpl_errorstate, const cpl_mask *,
	const char , const char , unsigned)	const char , const cpl_mask , const char *,
		const char , const char , unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull))	__attribute__((nonnull(4, 6, 7, 8)))
	#endif	#endif

	;	;


	void cpl_test_abs_macro(double, const char , double, const char , double ,	void cpl_test_leq_macro(int, cpl_errorstate, double, const char *, double,
	const char , const char , const char *, unsigned)	const char , const char , const char *, unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull))	__attribute__((nonnull))
	#endif	#endif

	;	;


	void cpl_test_rel_macro(double, const char , double, const char , double	void cpl_test_lt_macro(int, cpl_errorstate, double, const char *, double,
	,	const char , const char , const char *, unsigned)
	const char , const char , const char *, unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull))	__attribute__((nonnull))
	#endif	#endif

	;	;


	void cpl_test_image_abs_macro(const cpl_image , const char ,	void cpl_test_abs_macro(int, cpl_errorstate, double, const char *, double,
	const cpl_image , const char ,	const char , double, const char , const char *,
		const char *, unsigned)
		#ifdef CPL_HAVE_GNUC_NONNULL
		__attribute__((nonnull))
		#endif
		;

		void cpl_test_rel_macro(int, cpl_errorstate, double, const char *, double,
		const char , double, const char , const char *,
		const char *, unsigned)
		#ifdef CPL_HAVE_GNUC_NONNULL
		__attribute__((nonnull))
		#endif
		;

		void cpl_test_vector_abs_macro(int, cpl_errorstate, const cpl_vector *,
		const char , const cpl_vector , const char
		*,
	double, const char , const char , const cha r *,	double, const char , const char , const cha r *,
	unsigned)	unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull(2, 4, 6, 7, 8)))	__attribute__((nonnull(4, 6, 8, 9, 10)))
	#endif	#endif

	;	;


	void cpl_test_polynomial_abs_macro(const cpl_polynomial , const char ,	void cpl_test_array_abs_macro(int, cpl_errorstate, const cpl_array *,
	const cpl_polynomial , const char ,	const char , const cpl_array , const char *
	double, const char , const char ,	,
	const char *, unsigned)	double, const char , const char , const cha
		r *,
		unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL

	__attribute__((nonnull(2, 4, 6, 7, 8)))	__attribute__((nonnull(4, 6, 8, 9, 10)))
	#endif	#endif
	;	;


	void cpl_test_memory_is_empty_macro(const char , const char ,	void cpl_test_image_abs_macro(int, cpl_errorstate, const cpl_image *,
	unsigned)	const char , const cpl_image , const char *
		,
		double, const char , const char , const cha
		r *,
		unsigned)
		#ifdef CPL_HAVE_GNUC_NONNULL
		__attribute__((nonnull(4, 6, 8, 9, 10)))
		#endif
		;

		void cpl_test_imagelist_abs_macro(int, cpl_errorstate,
		const cpl_imagelist *,
		const char *,
		const cpl_imagelist *,
		const char *,
		double, const char *,
		const char , const char ,
		unsigned )
		#ifdef CPL_HAVE_GNUC_NONNULL
		__attribute__((nonnull(4, 6, 8, 9, 10)))
		#endif
		;

		void cpl_test_polynomial_abs_macro(int, cpl_errorstate, const cpl_polynomia
		l *,
		const char , const cpl_polynomial ,
		const char , double, const char ,
		const char , const char , unsigned)
		#ifdef CPL_HAVE_GNUC_NONNULL
		__attribute__((nonnull(4, 6, 8, 9, 10)))
		#endif
		;

		void cpl_test_memory_is_empty_macro(int, cpl_errorstate, const char *,
		const char *, unsigned)
	#ifdef CPL_HAVE_GNUC_NONNULL	#ifdef CPL_HAVE_GNUC_NONNULL
	__attribute__((nonnull))	__attribute__((nonnull))
	#endif	#endif

	;	;


	double cpl_test_get_cputime(void);	double cpl_test_get_cputime(void)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;

		double cpl_test_get_walltime(void)
		#ifdef __GNUC__
		__attribute__((pure))
		#endif
		;

	CPL_END_DECLS	CPL_END_DECLS

	#endif	#endif

End of changes. 80 change blocks.
	155 lines changed or deleted	499 lines changed or added

	cpl_type.h	cpl_type.h

	/* $Id: cpl_type.h,v 1.11 2008/11/28 08:47:31 lbilbao Exp $	/* $Id: cpl_type.h,v 1.15 2009/10/19 07:44:57 cizzo Exp $
	*	*
	* This file is part of the ESO Common Pipeline Library	* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*

	* $Author: lbilbao $	* $Author: cizzo $
	* $Date: 2008/11/28 08:47:31 $	* $Date: 2009/10/19 07:44:57 $
	* $Revision: 1.11 $	* $Revision: 1.15 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_TYPE_H	#ifndef CPL_TYPE_H
	#define CPL_TYPE_H	#define CPL_TYPE_H

	#include <cpl_macros.h>	#include <cpl_macros.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/**	/**

	skipping to change at line 126	skipping to change at line 126
	/**	/**
	* Type code corresponding to a pointer type.	* Type code corresponding to a pointer type.
	* @hideinitializer	* @hideinitializer
	*/	*/
	CPL_TYPE_POINTER = 1 << 14,	CPL_TYPE_POINTER = 1 << 14,

	/**	/**
	* Type code corresponding to type @c float complex.	* Type code corresponding to type @c float complex.
	* @hideinitializer	* @hideinitializer
	*/	*/

	CPL_TYPE_FLOAT_COMPLEX = 1 << 15,	CPL_TYPE_COMPLEX = 1 << 15,

	/**	/**

	* Type code corresponding to type @c double complex.	* Type code to be used for inheritance of original FITS type.
	* @hideinitializer	* @hideinitializer
	*/	*/

	CPL_TYPE_DOUBLE_COMPLEX = 1 << 16,	CPL_TYPE_UNSPECIFIED = 1 << 16,

	/**	/**

	* Type code to be used for inheritance of original FITS type.	* Type code corresponding to a character array.
	* @hideinitializer	* @hideinitializer
	*/	*/

	CPL_TYPE_UNSPECIFIED = 1 << 17,	CPL_TYPE_STRING = (CPL_TYPE_CHAR \| CPL_TYPE_FLAG_ARRAY),

	/**	/**

	* Type code corresponding to a character array.	* Type code corresponding to type @c float complex.
	* @hideinitializer	* @hideinitializer
	*/	*/

	CPL_TYPE_STRING = (CPL_TYPE_CHAR \| CPL_TYPE_FLAG_ARRAY)	CPL_TYPE_FLOAT_COMPLEX = (CPL_TYPE_FLOAT \| CPL_TYPE_COMPLEX),


		/**
		* Type code corresponding to type @c double complex.
		* @hideinitializer
		*/
		CPL_TYPE_DOUBLE_COMPLEX = (CPL_TYPE_DOUBLE \| CPL_TYPE_COMPLEX)
	};	};

	/**	/**
	* @ingroup cpl_type	* @ingroup cpl_type
	*	*
	* @brief	* @brief
	* The type code type.	* The type code type.
	*/	*/

	typedef enum _cpl_type_ cpl_type;	typedef enum _cpl_type_ cpl_type;

	enum _cpl_boolean_ {	enum _cpl_boolean_ {
	CPL_FALSE = 0,	CPL_FALSE = 0,
	CPL_TRUE = !CPL_FALSE	CPL_TRUE = !CPL_FALSE
	};	};

	typedef enum _cpl_boolean_ cpl_boolean;	typedef enum _cpl_boolean_ cpl_boolean;


	size_t cpl_type_get_sizeof(cpl_type type);	size_t cpl_type_get_sizeof(cpl_type type)
		#ifdef __GNUC__
		__attribute__((const))
		#endif
		;

	const char * cpl_type_get_name(cpl_type type);	const char * cpl_type_get_name(cpl_type type);

	CPL_END_DECLS	CPL_END_DECLS

	#endif /* CPL_TYPE_H */	#endif /* CPL_TYPE_H */

End of changes. 11 change blocks.
	13 lines changed or deleted	22 lines changed or added

	cpl_vector.h	cpl_vector.h

	/* $Id: cpl_vector.h,v 1.57 2008/11/13 12:17:22 llundin Exp $	/* $Id: cpl_vector.h,v 1.58 2009/12/14 15:35: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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2008/11/13 12:17:22 $	* $Date: 2009/12/14 15:35:53 $
	* $Revision: 1.57 $	* $Revision: 1.58 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_VECTOR_H	#ifndef CPL_VECTOR_H
	#define CPL_VECTOR_H	#define CPL_VECTOR_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Includes	Includes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	#include <stdio.h>	#include <stdio.h>

	skipping to change at line 165	skipping to change at line 165

	/* Filtering */	/* Filtering */
	cpl_vector * cpl_vector_filter_lowpass_create(const cpl_vector *, cpl_lowpa ss,	cpl_vector * cpl_vector_filter_lowpass_create(const cpl_vector *, cpl_lowpa ss,
	int);	int);
	cpl_vector * cpl_vector_filter_median_create(const cpl_vector *, int);	cpl_vector * cpl_vector_filter_median_create(const cpl_vector *, int);

	cpl_error_code cpl_vector_fill_kernel_profile(cpl_vector *, cpl_kernel, dou ble);	cpl_error_code cpl_vector_fill_kernel_profile(cpl_vector *, cpl_kernel, dou ble);

	/* Fitting */	/* Fitting */
	cpl_error_code cpl_vector_fit_gaussian(const cpl_vector , const cpl_vector ,	cpl_error_code cpl_vector_fit_gaussian(const cpl_vector , const cpl_vector ,

	const cpl_vector *, const cpl_vector	const cpl_vector , const cpl_vector ,
	*,	cpl_fit_mode,
	cpl_fit_mode,	double , double ,
	double , double ,	double , double ,
	double , double ,	double , double ,
	double , double ,	cpl_matrix **);
	cpl_matrix **);

	/* FIXME: Will disappear. Do not use in new code! */	/* FIXME: Will disappear. Do not use in new code! */
	cpl_vector * cpl_vector_new_lss_kernel(double, double)	cpl_vector * cpl_vector_new_lss_kernel(double, double)
	#ifdef __GNUC__	#ifdef __GNUC__
	__attribute__((deprecated))	__attribute__((deprecated))
	#endif	#endif
	;	;
	cpl_error_code cpl_vector_convolve_symmetric(cpl_vector , const cpl_vector )	cpl_error_code cpl_vector_convolve_symmetric(cpl_vector , const cpl_vector )
	#ifdef __GNUC__	#ifdef __GNUC__
	__attribute__((deprecated))	__attribute__((deprecated))

End of changes. 3 change blocks.
	11 lines changed or deleted	10 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_CODE 327681	#define CPL_VERSION_STRING "5.1.0"
		#define CPL_VERSION_CODE 327936

	#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);	unsigned int cpl_version_get_major(void)
	unsigned int cpl_version_get_minor(void);	#ifdef __GNUC__
	unsigned int cpl_version_get_micro(void);	__attribute__((const))
		#endif
		;
		unsigned int cpl_version_get_minor(void)
		#ifdef __GNUC__
		__attribute__((const))
		#endif
		;
		unsigned int cpl_version_get_micro(void)
		#ifdef __GNUC__
		__attribute__((const))
		#endif
		;


	unsigned int cpl_version_get_interface_age(void);	unsigned int cpl_version_get_interface_age(void)
	unsigned int cpl_version_get_binary_age(void);	#ifdef __GNUC__
		__attribute__((const))
		#endif
		;
		unsigned int cpl_version_get_binary_age(void)
		#ifdef __GNUC__
		__attribute__((const))
		#endif
		;


	const char *cpl_version_get_version(void);	const char *cpl_version_get_version(void)
	unsigned int cpl_version_get_binary_version(void);	#ifdef __GNUC__
		__attribute__((const))
		#endif
		;
		unsigned int cpl_version_get_binary_version(void)
		#ifdef __GNUC__
		__attribute__((const))
		#endif
		;

	CPL_END_DECLS	CPL_END_DECLS

	#endif /* CPL_VERSION_H */	#endif /* CPL_VERSION_H */

End of changes. 4 change blocks.
	8 lines changed or deleted	37 lines changed or added

	cpl_wcs.h	cpl_wcs.h

	/* $Id: cpl_wcs.h,v 1.10 2008/06/02 12:53:26 scastro Exp $	/* $Id: cpl_wcs.h,v 1.11 2009/08/05 09:32:57 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*

	* $Author: scastro $	* $Author: llundin $
	* $Date: 2008/06/02 12:53:26 $	* $Date: 2009/08/05 09:32:57 $
	* $Revision: 1.10 $	* $Revision: 1.11 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_WCS_H	#ifndef CPL_WCS_H
	#define CPL_WCS_H	#define CPL_WCS_H

	#include "cpl_error.h"	#include "cpl_error.h"
	#include "cpl_propertylist.h"	#include "cpl_propertylist.h"
	#include "cpl_matrix.h"	#include "cpl_matrix.h"
	#include "cpl_array.h"	#include "cpl_array.h"


	skipping to change at line 71	skipping to change at line 71

	typedef enum cpl_wcs_platesol_outmode cpl_wcs_platesol_outmode;	typedef enum cpl_wcs_platesol_outmode cpl_wcs_platesol_outmode;

	/* Function prototypes */	/* Function prototypes */

	cpl_wcs cpl_wcs_new_from_propertylist(const cpl_propertylist plist);	cpl_wcs cpl_wcs_new_from_propertylist(const cpl_propertylist plist);
	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(cpl_propertylist ilist, cpl_matrix cel,	cpl_error_code cpl_wcs_platesol(const cpl_propertylist *ilist,
	cpl_matrix *xy, int niter, float thresh,	const cpl_matrix *cel,
		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);

End of changes. 3 change blocks.
	7 lines changed or deleted	9 lines changed or added

	cxdeque.h	cxdeque.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*
	* $Author: scastro $	* $Author: scastro $
	* $Date: 2007/07/04 12:14:04 $	* $Date: 2007/07/04 12:14:04 $
	* $Revision: 1.2 $	* $Revision: 1.2 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_DEQUE_H	#ifndef CX_DEQUE_H
	#define CX_DEQUE_H	#define CX_DEQUE_H

	#include <cxmemory.h>	#include <cxmemory.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS

	typedef struct _cx_deque_ cx_deque;	typedef struct _cx_deque_ cx_deque;

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cxfileutils.h	cxfileutils.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2006/06/12 09:57:33 $	* $Date: 2006/06/12 09:57:33 $
	* $Revision: 1.3 $	* $Revision: 1.3 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_FILEUTILS_H	#ifndef CX_FILEUTILS_H
	#define CX_FILEUTILS_H	#define CX_FILEUTILS_H

	#include <cxtypes.h>	#include <cxtypes.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS

	cxlong cx_path_max(const cxchar *);	cxlong cx_path_max(const cxchar *);

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cxlist.h	cxlist.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2006/06/12 09:57:33 $	* $Date: 2006/06/12 09:57:33 $
	* $Revision: 1.3 $	* $Revision: 1.3 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_LIST_H	#ifndef CX_LIST_H
	#define CX_LIST_H	#define CX_LIST_H

	#include <cxmemory.h>	#include <cxmemory.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS

	typedef struct _cx_lnode_ *cx_list_iterator;	typedef struct _cx_lnode_ *cx_list_iterator;

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cxmacros.h	cxmacros.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*
	* $Author: scastro $	* $Author: scastro $
	* $Date: 2007/12/12 12:09:41 $	* $Date: 2007/12/12 12:09:41 $
	* $Revision: 1.6 $	* $Revision: 1.6 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	/*	/*
	* This file MUST not include any other cext header file.	* This file MUST not include any other cext header file.
	*/	*/

	#ifndef CX_MACROS_H	#ifndef CX_MACROS_H
	#define CX_MACROS_H	#define CX_MACROS_H

	/*	/*

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cxmap.h	cxmap.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2006/06/12 09:57:33 $	* $Date: 2006/06/12 09:57:33 $
	* $Revision: 1.4 $	* $Revision: 1.4 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_MAP_H	#ifndef CX_MAP_H
	#define CX_MAP_H	#define CX_MAP_H

	#include <cxmemory.h>	#include <cxmemory.h>
	#include <cxtree.h>	#include <cxtree.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cxmemory.h	cxmemory.h

	/* $Id: cxmemory.h,v 1.3 2006/06/12 09:57:33 rpalsa Exp $	/* $Id: cxmemory.h,v 1.4 2009/03/25 13:01:22 llundin Exp $
	*	*
	* This file is part of the ESO C Extension Library	* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory	* Copyright (C) 2001-2006 European Southern Observatory
	*	*
	* This program is free software; you can redistribute it and/or modify	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or	* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.	* (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*

	* $Author: rpalsa $	* $Author: llundin $
	* $Date: 2006/06/12 09:57:33 $	* $Date: 2009/03/25 13:01:22 $
	* $Revision: 1.3 $	* $Revision: 1.4 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_MEMORY_H	#ifndef CX_MEMORY_H
	#define CX_MEMORY_H	#define CX_MEMORY_H

	#include <cxtypes.h>	#include <cxtypes.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS

	struct _cx_memory_vtable_ {	struct _cx_memory_vtable_ {

	skipping to change at line 48	skipping to change at line 48
	cxptr (*realloc) (cxptr, cxsize);	cxptr (*realloc) (cxptr, cxsize);
	void (*free) (cxptr);	void (*free) (cxptr);
	};	};

	typedef struct _cx_memory_vtable_ cx_memory_vtable;	typedef struct _cx_memory_vtable_ cx_memory_vtable;

	/*	/*
	* Memory allocation functions	* Memory allocation functions
	*/	*/


	void cx_memory_vtable_set(cx_memory_vtable *);	void cx_memory_vtable_set(const cx_memory_vtable *);
	cxbool cx_memory_is_system_malloc(void);	cxbool cx_memory_is_system_malloc(void);

	cxptr cx_malloc(cxsize);	cxptr cx_malloc(cxsize);
	cxptr cx_malloc_clear(cxsize);	cxptr cx_malloc_clear(cxsize);
	cxptr cx_calloc(cxsize, cxsize);	cxptr cx_calloc(cxsize, cxsize);
	cxptr cx_realloc(cxptr, cxsize);	cxptr cx_realloc(cxptr, cxsize);
	void cx_free(cxptr);	void cx_free(cxptr);

	CX_END_DECLS	CX_END_DECLS


End of changes. 3 change blocks.
	6 lines changed or deleted	6 lines changed or added

	cxmessages.h	cxmessages.h

	/* $Id: cxmessages.h,v 1.8 2007/06/12 07:39:16 rpalsa Exp $	/* $Id: cxmessages.h,v 1.9 2009/12/07 15:48:15 llundin Exp $
	*	*
	* This file is part of the ESO C Extension Library	* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory	* Copyright (C) 2001-2006 European Southern Observatory
	*	*
	* This program is free software; you can redistribute it and/or modify	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or	* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.	* (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*

	* $Author: rpalsa $	* $Author: llundin $
	* $Date: 2007/06/12 07:39:16 $	* $Date: 2009/12/07 15:48:15 $
	* $Revision: 1.8 $	* $Revision: 1.9 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_MESSAGES_H	#ifndef CX_MESSAGES_H
	#define CX_MESSAGES_H	#define CX_MESSAGES_H

	#include <stdarg.h>	#include <stdarg.h>

	#include <cxmacros.h>	#include <cxmacros.h>
	#include <cxtypes.h>	#include <cxtypes.h>


	skipping to change at line 93	skipping to change at line 93
	cxuint cx_log_set_handler(const cxchar *, cx_log_level_flags,	cxuint cx_log_set_handler(const cxchar *, cx_log_level_flags,
	cx_log_func, cxptr);	cx_log_func, cxptr);
	void cx_log_remove_handler(const cxchar *, cxuint);	void cx_log_remove_handler(const cxchar *, cxuint);

	cx_log_level_flags cx_log_set_fatal_mask(const cxchar *, cx_log_level_flags );	cx_log_level_flags cx_log_set_fatal_mask(const cxchar *, cx_log_level_flags );
	cx_log_level_flags cx_log_set_always_fatal(cx_log_level_flags);	cx_log_level_flags cx_log_set_always_fatal(cx_log_level_flags);

	cxsize cx_log_get_domain_count(void);	cxsize cx_log_get_domain_count(void);
	const cxchar *cx_log_get_domain_name(cxsize);	const cxchar *cx_log_get_domain_name(cxsize);


	void cx_log(const cxchar , cx_log_level_flags, const cxchar , ...);	void cx_log(const cxchar , cx_log_level_flags, const cxchar , ...)
	void cx_logv(const cxchar , cx_log_level_flags, const cxchar , va_list);	#ifdef __GNUC__
		__attribute__((format (printf, 3, 4)))
		#endif
		;
		void cx_logv(const cxchar , cx_log_level_flags, const cxchar , va_list)
		#ifdef __GNUC__
		__attribute__((format (printf, 3, 0)))
		#endif
		;

	cx_print_func cx_print_set_handler(cx_print_func);	cx_print_func cx_print_set_handler(cx_print_func);
	cx_print_func cx_printerr_set_handler(cx_print_func);	cx_print_func cx_printerr_set_handler(cx_print_func);


	void cx_print(const cxchar *, ...);	void cx_print(const cxchar *, ...)
	void cx_printerr(const cxchar *, ...);	#ifdef __GNUC__
		__attribute__((format (printf, 1, 2)))
		#endif
		;
		void cx_printerr(const cxchar *, ...)
		#ifdef __GNUC__
		__attribute__((format (printf, 1, 0)))
		#endif
		;

	/*	/*
	* Convenience functions	* Convenience functions
	*/	*/


	void cx_error(const cxchar *, ...);	void cx_error(const cxchar *, ...)
	void cx_critical(const cxchar *, ...);	#ifdef __GNUC__
	void cx_warning(const cxchar *, ...);	__attribute__((format (printf, 1, 2)))
	void cx_message(const cxchar *, ...);	#endif
		;
		void cx_critical(const cxchar *, ...)
		#ifdef __GNUC__
		__attribute__((format (printf, 1, 2)))
		#endif
		;
		void cx_warning(const cxchar *, ...)
		#ifdef __GNUC__
		__attribute__((format (printf, 1, 2)))
		#endif
		;
		void cx_message(const cxchar *, ...)
		#ifdef __GNUC__
		__attribute__((format (printf, 1, 2)))
		#endif
		;

	#ifndef CX_LOG_DOMAIN	#ifndef CX_LOG_DOMAIN
	# define CX_LOG_DOMAIN ((cxchar *)0)	# define CX_LOG_DOMAIN ((cxchar *)0)
	#endif	#endif

	/*	/*
	* Macros for error handling.	* Macros for error handling.
	*/	*/

	#ifdef CX_DISABLE_ASSERT	#ifdef CX_DISABLE_ASSERT

End of changes. 5 change blocks.
	13 lines changed or deleted	45 lines changed or added

	cxmultimap.h	cxmultimap.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2006/06/12 09:57:33 $	* $Date: 2006/06/12 09:57:33 $
	* $Revision: 1.5 $	* $Revision: 1.5 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_MULTIMAP_H	#ifndef CX_MULTIMAP_H
	#define CX_MULTIMAP_H	#define CX_MULTIMAP_H

	#include <cxmemory.h>	#include <cxmemory.h>
	#include <cxtree.h>	#include <cxtree.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS


End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cxslist.h	cxslist.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2006/06/12 09:54:44 $	* $Date: 2006/06/12 09:54:44 $
	* $Revision: 1.6 $	* $Revision: 1.6 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_SLIST_H	#ifndef CX_SLIST_H
	#define CX_SLIST_H	#define CX_SLIST_H

	#include <cxmemory.h>	#include <cxmemory.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS

	typedef struct _cx_slnode_ *cx_slist_iterator;	typedef struct _cx_slnode_ *cx_slist_iterator;

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cxstring.h	cxstring.h

	/* $Id: cxstring.h,v 1.6 2006/06/12 09:54:44 rpalsa Exp $	/* $Id: cxstring.h,v 1.7 2009/12/07 15:48:15 llundin Exp $
	*	*
	* This file is part of the ESO C Extension Library	* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory	* Copyright (C) 2001-2006 European Southern Observatory
	*	*
	* This program is free software; you can redistribute it and/or modify	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or	* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.	* (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*

	* $Author: rpalsa $	* $Author: llundin $
	* $Date: 2006/06/12 09:54:44 $	* $Date: 2009/12/07 15:48:15 $
	* $Revision: 1.6 $	* $Revision: 1.7 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_STRING_H_	#ifndef CX_STRING_H_
	#define CX_STRING_H_ 1	#define CX_STRING_H_ 1

	#include <stdarg.h>	#include <stdarg.h>
	#include <string.h>	#include <string.h>
	#include <ctype.h>	#include <ctype.h>

	#include <cxtypes.h>	#include <cxtypes.h>

	skipping to change at line 121	skipping to change at line 121

	cxbool cx_string_equal (const cx_string , const cx_string );	cxbool cx_string_equal (const cx_string , const cx_string );
	cxint cx_string_compare(const cx_string , const cx_string );	cxint cx_string_compare(const cx_string , const cx_string );
	cxint cx_string_casecmp(const cx_string , const cx_string );	cxint cx_string_casecmp(const cx_string , const cx_string );
	cxint cx_string_ncasecmp(const cx_string , const cx_string , cxsize);	cxint cx_string_ncasecmp(const cx_string , const cx_string , cxsize);

	/*	/*
	* I/O functions	* I/O functions
	*/	*/


	cxint cx_string_sprintf(cx_string , const cxchar , ...);	cxint cx_string_sprintf(cx_string , const cxchar , ...)
	cxint cx_string_vsprintf(cx_string , const cxchar , va_list);	#ifdef __GNUC__
		__attribute__((format (printf, 2, 3)))
		#endif
		;
		cxint cx_string_vsprintf(cx_string , const cxchar , va_list)
		#ifdef __GNUC__
		__attribute__((format (printf, 2, 0)))
		#endif
		;

	/*	/*
	* Debugging utilities	* Debugging utilities
	*/	*/

	void cx_string_print(const cx_string *);	void cx_string_print(const cx_string *);

	CX_END_DECLS	CX_END_DECLS

	#endif /* CX_STRING_H */	#endif /* CX_STRING_H */

End of changes. 3 change blocks.
	7 lines changed or deleted	15 lines changed or added

	cxstrutils.h	cxstrutils.h

	/* $Id: cxstrutils.h,v 1.4 2006/06/12 09:54:44 rpalsa Exp $	/* $Id: cxstrutils.h,v 1.5 2009/12/07 15:48:15 llundin Exp $
	*	*
	* This file is part of the ESO C Extension Library	* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory	* Copyright (C) 2001-2006 European Southern Observatory
	*	*
	* This program is free software; you can redistribute it and/or modify	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or	* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.	* (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*

	* $Author: rpalsa $	* $Author: llundin $
	* $Date: 2006/06/12 09:54:44 $	* $Date: 2009/12/07 15:48:15 $
	* $Revision: 1.4 $	* $Revision: 1.5 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_STRUTILS_H	#ifndef CX_STRUTILS_H
	#define CX_STRUTILS_H	#define CX_STRUTILS_H

	#include <stdarg.h>	#include <stdarg.h>
	#include <cxtypes.h>	#include <cxtypes.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS


	skipping to change at line 67	skipping to change at line 67
	*/	*/

	cxchar cx_strskip(const cxchar , cxint (*)(cxint));	cxchar cx_strskip(const cxchar , cxint (*)(cxint));

	/*	/*
	* Utilities returning a newly allocated string.	* Utilities returning a newly allocated string.
	*/	*/

	cxchar cx_strdup(const cxchar );	cxchar cx_strdup(const cxchar );
	cxchar cx_strndup(const cxchar , cxsize);	cxchar cx_strndup(const cxchar , cxsize);

	cxchar cx_strvdupf(const cxchar , va_list);	cxchar cx_strvdupf(const cxchar , va_list)
		#ifdef __GNUC__
		__attribute__((format (printf, 1, 0)))
		#endif
		;

	cxchar cx_stpcpy(cxchar , const cxchar *);	cxchar cx_stpcpy(cxchar , const cxchar *);

	cxchar *cx_strsplit(const cxchar , const cxchar *, cxint);	cxchar *cx_strsplit(const cxchar , const cxchar *, cxint);
	void cx_strfreev(cxchar **sarray);	void cx_strfreev(cxchar **sarray);

	cxchar cx_strjoinv(const cxchar , cxchar **);	cxchar cx_strjoinv(const cxchar , cxchar **);

	CX_END_DECLS	CX_END_DECLS


End of changes. 3 change blocks.
	6 lines changed or deleted	10 lines changed or added

	cxtree.h	cxtree.h

	skipping to change at line 25	skipping to change at line 25
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*
	* $Author: rpalsa $	* $Author: rpalsa $
	* $Date: 2006/06/12 09:54:44 $	* $Date: 2006/06/12 09:54:44 $
	* $Revision: 1.4 $	* $Revision: 1.4 $

	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_TREE_H	#ifndef CX_TREE_H
	#define CX_TREE_H	#define CX_TREE_H

	#include <cxmemory.h>	#include <cxmemory.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS

	typedef struct _cx_tnode_ *cx_tree_iterator;	typedef struct _cx_tnode_ *cx_tree_iterator;

End of changes. 1 change blocks.
	1 lines changed or deleted	1 lines changed or added

	cxutils.h	cxutils.h

	/* $Id: cxutils.h,v 1.4 2006/06/12 09:54:44 rpalsa Exp $	/* $Id: cxutils.h,v 1.5 2009/12/07 15:48:15 llundin Exp $
	*	*
	* This file is part of the ESO C Extension Library	* This file is part of the ESO C Extension Library
	* Copyright (C) 2001-2006 European Southern Observatory	* Copyright (C) 2001-2006 European Southern Observatory
	*	*
	* This program is free software; you can redistribute it and/or modify	* This program is free software; you can redistribute it and/or modify
	* it under the terms of the GNU General Public License as published by	* it under the terms of the GNU General Public License as published by
	* the Free Software Foundation; either version 2 of the License, or	* the Free Software Foundation; either version 2 of the License, or
	* (at your option) any later version.	* (at your option) any later version.
	*	*
	* This program is distributed in the hope that it will be useful,	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU General Public License for more details.	* GNU General Public License for more details.
	*	*
	* You should have received a copy of the GNU General Public License	* You should have received a copy of the GNU General Public License
	* along with this program; if not, write to the Free Software	* along with this program; if not, write to the Free Software
	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA	* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 U SA
	*/	*/

	/*	/*

	* $Author: rpalsa $	* $Author: llundin $
	* $Date: 2006/06/12 09:54:44 $	* $Date: 2009/12/07 15:48:15 $
	* $Revision: 1.4 $	* $Revision: 1.5 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CX_UTILS_H	#ifndef CX_UTILS_H
	#define CX_UTILS_H	#define CX_UTILS_H

	#include <stdarg.h>	#include <stdarg.h>
	#include <cxtypes.h>	#include <cxtypes.h>

	CX_BEGIN_DECLS	CX_BEGIN_DECLS


	skipping to change at line 56	skipping to change at line 56
	* Bit tests	* Bit tests
	*/	*/

	cxint cx_bits_find(cxuint32, cxint);	cxint cx_bits_find(cxuint32, cxint);
	cxint cx_bits_rfind(cxuint32, cxint);	cxint cx_bits_rfind(cxuint32, cxint);

	/*	/*
	* Miscellaneous utility functions	* Miscellaneous utility functions
	*/	*/


	cxint cx_snprintf(cxchar , cxsize, const cxchar , ...);	cxint cx_snprintf(cxchar , cxsize, const cxchar , ...)
	cxint cx_vsnprintf(cxchar , cxsize, const cxchar , va_list);	#ifdef __GNUC__
	cxint cx_asprintf(cxchar *, const cxchar , ...);	__attribute__((format (printf, 3, 4)))
	cxint cx_vasprintf(cxchar *, const cxchar , va_list);	#endif
		;
		cxint cx_vsnprintf(cxchar , cxsize, const cxchar , va_list)
		#ifdef __GNUC__
		__attribute__((format (printf, 3, 0)))
		#endif
		;
		cxint cx_asprintf(cxchar *, const cxchar , ...)
		#ifdef __GNUC__
		__attribute__((format (printf, 2, 3)))
		#endif
		;
		cxint cx_vasprintf(cxchar *, const cxchar , va_list)
		#ifdef __GNUC__
		__attribute__((format (printf, 2, 0)))
		#endif
		;

	cxchar *cx_line_alloc(void);	cxchar *cx_line_alloc(void);

	CX_END_DECLS	CX_END_DECLS

	#endif /* CX_UTILS_H */	#endif /* CX_UTILS_H */

End of changes. 3 change blocks.
	9 lines changed or deleted	25 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/

	cpl_array.h	cpl_array.h

	/* $Id: cpl_array.h,v 1.11 2009/02/10 18:23:34 cizzo Exp $	/* $Id: cpl_array.h,v 1.14 2009/11/18 13:10:42 cizzo Exp $
	*	*
	* This file is part of the ESO Common Pipeline Library	* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-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: cizzo $	* $Author: cizzo $

	* $Date: 2009/02/10 18:23:34 $	* $Date: 2009/11/18 13:10:42 $
	* $Revision: 1.11 $	* $Revision: 1.14 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_ARRAY_H	#ifndef CPL_ARRAY_H
	#define CPL_ARRAY_H	#define CPL_ARRAY_H


		#include <stdio.h>
	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_type.h>	#include <cpl_type.h>
	#include <cpl_error.h>	#include <cpl_error.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	typedef struct _cpl_array_ cpl_array;	typedef struct _cpl_array_ cpl_array;

	cpl_array *cpl_array_new(int, cpl_type);	cpl_array *cpl_array_new(int, cpl_type);
	cpl_array cpl_array_wrap_int(int , int);	cpl_array cpl_array_wrap_int(int , int);

	skipping to change at line 56	skipping to change at line 57
	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 *);
	void cpl_array_delete(cpl_array *);	void cpl_array_delete(cpl_array *);
	void cpl_array_unwrap(cpl_array );	void cpl_array_unwrap(cpl_array );
	int cpl_array_get_size(const cpl_array *);	int cpl_array_get_size(const cpl_array *);
	cpl_error_code cpl_array_set_size(cpl_array *, int);	cpl_error_code cpl_array_set_size(cpl_array *, int);
	cpl_type cpl_array_get_type(const cpl_array *);	cpl_type cpl_array_get_type(const cpl_array *);
	int cpl_array_has_invalid(const cpl_array *);	int cpl_array_has_invalid(const cpl_array *);
	int cpl_array_has_valid(const cpl_array *);	int cpl_array_has_valid(const cpl_array *);

		int cpl_array_is_valid(const cpl_array *, int);
	int cpl_array_count_invalid(const cpl_array *);	int cpl_array_count_invalid(const cpl_array *);
	int cpl_array_get_data_int(cpl_array );	int cpl_array_get_data_int(cpl_array );
	const int cpl_array_get_data_int_const(const cpl_array );	const int cpl_array_get_data_int_const(const cpl_array );
	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 );
	char *cpl_array_get_data_string(cpl_array );	char *cpl_array_get_data_string(cpl_array );
	const char *cpl_array_get_data_string_const(const cpl_array );	const char *cpl_array_get_data_string_const(const cpl_array );
	double cpl_array_get(const cpl_array , int, int );	double cpl_array_get(const cpl_array , int, int );

	skipping to change at line 110	skipping to change at line 112
	cpl_error_code cpl_array_exponential(cpl_array *, double);	cpl_error_code cpl_array_exponential(cpl_array *, double);

	double cpl_array_get_mean(const cpl_array *);	double cpl_array_get_mean(const cpl_array *);
	double cpl_array_get_median(const cpl_array *);	double cpl_array_get_median(const cpl_array *);
	double cpl_array_get_stdev(const cpl_array *);	double cpl_array_get_stdev(const cpl_array *);

	double cpl_array_get_max(const cpl_array *);	double cpl_array_get_max(const cpl_array *);
	double cpl_array_get_min(const cpl_array *);	double cpl_array_get_min(const cpl_array *);
	cpl_error_code cpl_array_get_maxpos(const cpl_array , int );	cpl_error_code cpl_array_get_maxpos(const cpl_array , int );
	cpl_error_code cpl_array_get_minpos(const cpl_array , int );	cpl_error_code cpl_array_get_minpos(const cpl_array , int );

		void cpl_array_dump_structure(const cpl_array , FILE );
		void cpl_array_dump(const cpl_array , int start, int count, FILE );

	CPL_END_DECLS	CPL_END_DECLS

	#endif	#endif
	/* end of cpl_array.h */	/* end of cpl_array.h */

End of changes. 5 change blocks.
	4 lines changed or deleted	8 lines changed or added

	cpl_mask.h	cpl_mask.h

	/* $Id: cpl_mask.h,v 1.22 2008/07/21 08:48:40 llundin Exp $	/* $Id: cpl_mask.h,v 1.23 2009/03/26 14:52: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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*
	* $Author: llundin $	* $Author: llundin $

	* $Date: 2008/07/21 08:48:40 $	* $Date: 2009/03/26 14:52:39 $
	* $Revision: 1.22 $	* $Revision: 1.23 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_MASK_H	#ifndef CPL_MASK_H
	#define CPL_MASK_H	#define CPL_MASK_H

	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	New types	New types
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	typedef struct _cpl_mask_ cpl_mask ;	typedef struct _cpl_mask_ cpl_mask ;

	skipping to change at line 69	skipping to change at line 69
	/*------------------------------------------------------------------------- ----	/*------------------------------------------------------------------------- ----
	Function prototypes	Function prototypes
	-------------------------------------------------------------------------- ---*/	-------------------------------------------------------------------------- ---*/

	/* IO operations */	/* IO operations */
	cpl_mask * cpl_mask_new(int, int) ;	cpl_mask * cpl_mask_new(int, int) ;
	cpl_mask * cpl_mask_wrap(int, int, cpl_binary *) ;	cpl_mask * cpl_mask_wrap(int, int, cpl_binary *) ;
	cpl_mask * cpl_mask_duplicate(const cpl_mask *) ;	cpl_mask * cpl_mask_duplicate(const cpl_mask *) ;
	void cpl_mask_delete(cpl_mask *) ;	void cpl_mask_delete(cpl_mask *) ;
	void * cpl_mask_unwrap(cpl_mask *) ;	void * cpl_mask_unwrap(cpl_mask *) ;

		cpl_error_code cpl_mask_dump_window(const cpl_mask *, int, int,
		int, int, FILE *);

	/* Accessor functions */	/* Accessor functions */
	cpl_binary * cpl_mask_get_data(cpl_mask *) ;	cpl_binary * cpl_mask_get_data(cpl_mask *) ;
	const cpl_binary * cpl_mask_get_data_const(const cpl_mask *) ;	const cpl_binary * cpl_mask_get_data_const(const cpl_mask *) ;
	cpl_binary cpl_mask_get(const cpl_mask *, int, int) ;	cpl_binary cpl_mask_get(const cpl_mask *, int, int) ;
	cpl_error_code cpl_mask_set(cpl_mask *, int, int, cpl_binary) ;	cpl_error_code cpl_mask_set(cpl_mask *, int, int, cpl_binary) ;
	int cpl_mask_get_size_x(const cpl_mask *) ;	int cpl_mask_get_size_x(const cpl_mask *) ;
	int cpl_mask_get_size_y(const cpl_mask *) ;	int cpl_mask_get_size_y(const cpl_mask *) ;

	/* Basic operations */	/* Basic operations */

End of changes. 3 change blocks.
	4 lines changed or deleted	6 lines changed or added

	cpl_plugininfo.h	cpl_plugininfo.h

	/* $Id: cpl_plugininfo.h,v 1.3 2005/02/01 15:31:05 rpalsa Exp $	/* $Id: cpl_plugininfo.h,v 1.4 2009/12/15 10:05:27 llundin Exp $
	*	*
	* This file is part of the ESO Common Pipeline Library	* This file is part of the ESO Common Pipeline Library
	* Copyright (C) 2001-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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A	* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 US A
	*/	*/

	/*	/*

	* $Author: rpalsa $	* $Author: llundin $
	* $Date: 2005/02/01 15:31:05 $	* $Date: 2009/12/15 10:05:27 $
	* $Revision: 1.3 $	* $Revision: 1.4 $
	* $Name: cpl-5_0_0 $	* $Name: cpl-5_1_0 $
	*/	*/

	#ifndef CPL_PLUGININFO_H	#ifndef CPL_PLUGININFO_H
	#define CPL_PLUGININFO_H	#define CPL_PLUGININFO_H

	#include <cpl_macros.h>	#include <cpl_macros.h>
	#include <cpl_pluginlist.h>	#include <cpl_pluginlist.h>

	CPL_BEGIN_DECLS	CPL_BEGIN_DECLS

	/**	/**
	* @ingroup cpl_plugin	* @ingroup cpl_plugin
	*	*
	* @brief	* @brief
	* Append the plugin information to the given list.	* Append the plugin information to the given list.
	*	*

	* @param list A plugin list.	* @param cpl_plugin_list A plugin list.
	*	*
	* @return The function must return 0 on success and 1 in case of an error.	* @return The function must return 0 on success and 1 in case of an error.
	*	*
	* This function must be implemented by plugin developers. There must	* This function must be implemented by plugin developers. There must
	* be one such implementation per plugin library, regardless of how many	* be one such implementation per plugin library, regardless of how many
	* plugins the library actually offers, provided that there is at least	* plugins the library actually offers, provided that there is at least
	* one plugin implemented in this library.	* one plugin implemented in this library.
	*	*
	* This prototype is only provided in order to allow the compiler to do	* This prototype is only provided in order to allow the compiler to do
	* some basic checks when compiling a plugin library. To have the	* some basic checks when compiling a plugin library. To have the

	skipping to change at line 71	skipping to change at line 71
	* The purpose of this function is to create a plugin object for each	* The purpose of this function is to create a plugin object for each
	* plugin implementation provided by the plugin library, fill the	* plugin implementation provided by the plugin library, fill the
	* basic plugin interface (the @c cpl_plugin part of the created plugin	* basic plugin interface (the @c cpl_plugin part of the created plugin
	* object) and append the created object to the plugin list @em list.	* object) and append the created object to the plugin list @em list.
	*	*
	* The list will be provided by the application which is going to use the	* The list will be provided by the application which is going to use the
	* plugin and it may be expected that @em list points to a valid plugin lis t	* plugin and it may be expected that @em list points to a valid plugin lis t
	* when this function is called.	* when this function is called.
	*/	*/


	int cpl_plugin_get_info(cpl_pluginlist *list);	int cpl_plugin_get_info(cpl_pluginlist *cpl_plugin_list);

	CPL_END_DECLS	CPL_END_DECLS

	#endif /* CPL_PLUGININFO_H */	#endif /* CPL_PLUGININFO_H */

End of changes. 4 change blocks.
	7 lines changed or deleted	7 lines changed or added