cpl_image_io.h   cpl_image_io.h 
/* $Id: cpl_image_io.h,v 1.63 2009/03/04 10:45:17 lbilbao Exp $ /* $Id: cpl_image_io.h,v 1.64 2009/03/17 12:14:04 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: 2009/03/04 10:45:17 $ * $Date: 2009/03/17 12:14:04 $
* $Revision: 1.63 $ * $Revision: 1.64 $
* $Name: cpl-5_0_0 $ * $Name: $
*/ */
#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 */
/* 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> #include <limits.h>
#ifdef CPL_DEFINE_IMAGE_COMPLEX
#include <complex.h> #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
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
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
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
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
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
/* 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) ;
/* Image destructor */ /* Image destructor */
void cpl_image_delete(cpl_image *) ; void cpl_image_delete(cpl_image *) ;
void * cpl_image_unwrap(cpl_image *) ; void * cpl_image_unwrap(cpl_image *) ;
/* Debugging functions */ /* Debugging functions */
 End of changes. 11 change blocks. 
5 lines changed or deleted 30 lines changed or added


 cpl_propertylist.h   cpl_propertylist.h 
/* $Id: cpl_propertylist.h,v 1.14 2008/07/09 11:55:55 scastro Exp $ /* $Id: cpl_propertylist.h,v 1.19 2009/05/06 12:19:35 scastro 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: scastro $ * $Author: scastro $
* $Date: 2008/07/09 11:55:55 $ * $Date: 2009/05/06 12:19:35 $
* $Revision: 1.14 $ * $Revision: 1.19 $
* $Name: cpl-5_0_0 $ * $Name: $
*/ */
#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 311 skipping to change at line 311
cpl_error_code cpl_error_code
cpl_propertylist_update_float(cpl_propertylist *self, const char *name, cpl_propertylist_update_float(cpl_propertylist *self, const char *name,
float value); float value);
cpl_error_code cpl_error_code
cpl_propertylist_update_double(cpl_propertylist *self, const char *name, cpl_propertylist_update_double(cpl_propertylist *self, const char *name,
double value); double value);
cpl_error_code cpl_error_code
cpl_propertylist_update_string(cpl_propertylist *self, const char *name, cpl_propertylist_update_string(cpl_propertylist *self, const char *name,
const char *value); const char *value);
/*
* Working on properties
*/
cpl_error_code cpl_error_code
cpl_propertylist_copy_property(cpl_propertylist *self, cpl_propertylist_copy_property(cpl_propertylist *self,
const cpl_propertylist *other, const cpl_propertylist *other,
const char *name); const char *name);
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);
 End of changes. 3 change blocks. 
4 lines changed or deleted 8 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 327680 #define CPL_VERSION_CODE 327681
#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); unsigned int cpl_version_get_minor(void);
unsigned int cpl_version_get_micro(void); unsigned int cpl_version_get_micro(void);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/