bitentry.h | bitentry.h | |||
---|---|---|---|---|
// (C) 2008-2010 D. V. Wiebe | // Copyright (C) 2008-2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class BitEntry : public Entry { | class BitEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
BitEntry() : Entry::Entry() { E.field_type = GD_BIT_ENTRY; }; | BitEntry() : Entry() { E.field_type = GD_BIT_ENTRY; }; | |||
BitEntry(const char* field_code, const char* in_field, gd_bit_t bitnu m, | BitEntry(const char* field_code, const char* in_field, gd_bit_t bitnu m, | |||
gd_bit_t numbits = 1, int fragment_index = 0); | gd_bit_t numbits = 1, int fragment_index = 0); | |||
virtual const char *Input() const { return E.in_fields[0]; }; | virtual const char *Input() const { return E.in_fields[0]; }; | |||
virtual gd_bit_t FirstBit() const { return E.u.bit.bitnum; }; | virtual gd_bit_t FirstBit() const { return E.u.bit.bitnum; }; | |||
virtual gd_bit_t NumBits() const { return E.u.bit.numbits; }; | virtual gd_bit_t NumBits() const { return E.u.bit.numbits; }; | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
carrayentry.h | carrayentry.h | |||
---|---|---|---|---|
// (C) 2010 D. V. Wiebe | // Copyright (C) 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class CarrayEntry : public Entry { | class CarrayEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
CarrayEntry() : Entry::Entry() { E.field_type = GD_CARRAY_ENTRY; }; | CarrayEntry() : Entry() { E.field_type = GD_CARRAY_ENTRY; }; | |||
CarrayEntry(const char* field_code, DataType type, size_t array_len, | CarrayEntry(const char* field_code, DataType type, size_t array_len, | |||
int fragment_index = 0); | int fragment_index = 0); | |||
virtual DataType ConstType() const | virtual DataType ConstType() const | |||
{ | { | |||
return (DataType)E.u.scalar.const_type; | return (DataType)E.u.scalar.const_type; | |||
} | } | |||
virtual size_t ArrayLen() const { return E.u.scalar.array_len; } | virtual size_t ArrayLen() const { return E.u.scalar.array_len; } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
constentry.h | constentry.h | |||
---|---|---|---|---|
// (C) 2008, 2010 D. V. Wiebe | // Copyright (C) 2008, 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class ConstEntry : public Entry { | class ConstEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
ConstEntry() : Entry::Entry() { E.field_type = GD_CONST_ENTRY; }; | ConstEntry() : Entry() { E.field_type = GD_CONST_ENTRY; }; | |||
ConstEntry(const char* field_code, DataType type, int fragment_index = 0); | ConstEntry(const char* field_code, DataType type, int fragment_index = 0); | |||
virtual DataType ConstType() const | virtual DataType ConstType() const | |||
{ | { | |||
return (DataType)E.u.scalar.const_type; | return (DataType)E.u.scalar.const_type; | |||
} | } | |||
int SetType(DataType type); | int SetType(DataType type); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
dirfile.h | dirfile.h | |||
---|---|---|---|---|
// (C) 2008-2010 D. V. Wiebe | // Copyright (C) 2008-2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 26 | skipping to change at line 26 | |||
// | // | |||
// You should have received a copy of the GNU Lesser General Public License | // You should have received a copy of the GNU Lesser General Public License | |||
// along with GetData; if not, write to the Free Software Foundation, Inc., | // along with GetData; if not, write to the Free Software Foundation, Inc., | |||
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | |||
// | // | |||
#ifndef GETDATA_DIRFILE_H | #ifndef GETDATA_DIRFILE_H | |||
#define GETDATA_DIRFILE_H | #define GETDATA_DIRFILE_H | |||
// We don't want the legacy API since its symbols clash with us. | // We don't want the legacy API since its symbols clash with us. | |||
#define GD_NO_LEGACY_API | #ifndef GD_NO_LEGACY_API | |||
# define GD_NO_LEGACY_API | ||||
#endif | ||||
// We use the C89 API since C++ compilers aren't required to support the | // We use the C89 API since C++ compilers aren't required to support the | |||
// C99 _Complex keyword | // C99 _Complex keyword | |||
#define GD_C89_API | #ifndef GD_C89_API | |||
# define GD_C89_API | ||||
#endif | ||||
#include <getdata.h> | #include <getdata.h> | |||
#include <getdata/fragment.h> | #include <getdata/fragment.h> | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
#include <getdata/rawentry.h> | #include <getdata/rawentry.h> | |||
#include <getdata/lincomentry.h> | #include <getdata/lincomentry.h> | |||
#include <getdata/linterpentry.h> | #include <getdata/linterpentry.h> | |||
#include <getdata/bitentry.h> | #include <getdata/bitentry.h> | |||
#include <getdata/sbitentry.h> | #include <getdata/sbitentry.h> | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 7 lines changed or added | |||
divideentry.h | divideentry.h | |||
---|---|---|---|---|
// (C) 2010 D. V. Wiebe | // Copyright (C) 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class DivideEntry : public Entry { | class DivideEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
DivideEntry() : Entry::Entry() { E.field_type = GD_DIVIDE_ENTRY; }; | DivideEntry() : Entry() { E.field_type = GD_DIVIDE_ENTRY; }; | |||
DivideEntry(const char* field_code, const char* in_field1, | DivideEntry(const char* field_code, const char* in_field1, | |||
const char* in_field2, int fragment_index = 0); | const char* in_field2, int fragment_index = 0); | |||
virtual const char *Input(int index = 0) const { | virtual const char *Input(int index = 0) const { | |||
return E.in_fields[(index == 0) ? 0 : 1]; | return E.in_fields[(index == 0) ? 0 : 1]; | |||
}; | }; | |||
int SetInput(const char* field, int index); | int SetInput(const char* field, int index); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
entry.h | entry.h | |||
---|---|---|---|---|
// (C) 2008-2010 D. V. Wiebe | // Copyright (C) 2008-2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 29 | skipping to change at line 29 | |||
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | |||
// | // | |||
#ifndef GETDATA_ENTRY_H | #ifndef GETDATA_ENTRY_H | |||
#define GETDATA_ENTRY_H | #define GETDATA_ENTRY_H | |||
#ifndef _FILE_OFFSET_BITS | #ifndef _FILE_OFFSET_BITS | |||
# define _FILE_OFFSET_BITS 64 | # define _FILE_OFFSET_BITS 64 | |||
#endif | #endif | |||
#define GD_NO_LEGACY_API | #ifndef GD_NO_LEGACY_API | |||
#define GD_C89_API | # define GD_NO_LEGACY_API | |||
#endif | ||||
#ifndef GD_C89_API | ||||
# define GD_C89_API | ||||
#endif | ||||
extern "C" { | extern "C" { | |||
#include <getdata.h> | #include <getdata.h> | |||
} | } | |||
#include <complex> | #include <complex> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 7 lines changed or added | |||
fragment.h | fragment.h | |||
---|---|---|---|---|
// (C) 2008, 2010 D. V. Wiebe | // Copyright (C) 2008, 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 29 | skipping to change at line 29 | |||
// 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | // 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | |||
// | // | |||
#ifndef GETDATA_FRAGMENT_H | #ifndef GETDATA_FRAGMENT_H | |||
#define GETDATA_FRAGMENT_H | #define GETDATA_FRAGMENT_H | |||
#ifndef _FILE_OFFSET_BITS | #ifndef _FILE_OFFSET_BITS | |||
# define _FILE_OFFSET_BITS 64 | # define _FILE_OFFSET_BITS 64 | |||
#endif | #endif | |||
#define GD_NO_LEGACY_API | #ifndef GD_NO_LEGACY_API | |||
#define GD_C89_API | # define GD_NO_LEGACY_API | |||
#endif | ||||
#ifndef GD_C89_API | ||||
# define GD_C89_API | ||||
#endif | ||||
extern "C" { | extern "C" { | |||
#include <getdata.h> | #include <getdata.h> | |||
} | } | |||
#include <sys/types.h> | #include <sys/types.h> | |||
#include <unistd.h> | ||||
namespace GetData { | namespace GetData { | |||
enum EncodingScheme { | enum EncodingScheme { | |||
AutoEncoding = GD_AUTO_ENCODED, RawEncoding = GD_UNENCODED, | AutoEncoding = GD_AUTO_ENCODED, RawEncoding = GD_UNENCODED, | |||
TextEncoding = GD_TEXT_ENCODED, SlimEncoding = GD_SLIM_ENCODED, | TextEncoding = GD_TEXT_ENCODED, SlimEncoding = GD_SLIM_ENCODED, | |||
GzipEncoding = GD_GZIP_ENCODED, Bzip2Encoding = GD_BZIP2_ENCODED, | GzipEncoding = GD_GZIP_ENCODED, Bzip2Encoding = GD_BZIP2_ENCODED, | |||
UnsupportedEncoding = GD_ENC_UNSUPPORTED | UnsupportedEncoding = GD_ENC_UNSUPPORTED | |||
}; | }; | |||
End of changes. 3 change blocks. | ||||
4 lines changed or deleted | 7 lines changed or added | |||
getdata.f | getdata.f | |||
---|---|---|---|---|
C (C) 2008-2010 D. V. Wiebe | C Copyright (C) 2008-2010 D. V. Wiebe | |||
C | C | |||
C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC | C CCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCCC | |||
C | C | |||
C This file is part of the GetData project. | C This file is part of the GetData project. | |||
C | C | |||
C GetData is free software; you can redistribute it and/or modify it un der | C GetData is free software; you can redistribute it and/or modify it un der | |||
C the terms of the GNU Lesser General Public License as published by th e | C the terms of the GNU Lesser General Public License as published by th e | |||
C Free Software Foundation; either version 2.1 of the License, or (at y our | C Free Software Foundation; either version 2.1 of the License, or (at y our | |||
C option) any later version. | C option) any later version. | |||
C | C | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
getdata.h | getdata.h | |||
---|---|---|---|---|
/* src/getdata.h. Generated from getdata.h.in by configure. */ | /* src/getdata.h. Generated from getdata.ah by configure. */ | |||
/* (C) 2002-2005 C. Barth Netterfield | /* Copyright (C) 2002-2005 C. Barth Netterfield | |||
* (C) 2003-2005 Theodore Kisner | * Copyright (C) 2003-2005 Theodore Kisner | |||
* (C) 2005-2010 D. V. Wiebe | * Copyright (C) 2005-2011 D. V. Wiebe | |||
* | * | |||
************************************************************************** * | ************************************************************************** * | |||
* | * | |||
* This file is part of the GetData project. | * This file is part of the GetData project. | |||
* | * | |||
* GetData is free software; you can redistribute it and/or modify it under | * GetData is free software; you can redistribute it and/or modify it under | |||
* the terms of the GNU Lesser General Public License as published by the | * the terms of the GNU Lesser General Public License as published by the | |||
* Free Software Foundation; either version 2.1 of the License, or (at your | * Free Software Foundation; either version 2.1 of the License, or (at your | |||
* option) any later version. | * option) any later version. | |||
* | * | |||
skipping to change at line 56 | skipping to change at line 56 | |||
#ifndef GETDATA_H | #ifndef GETDATA_H | |||
#define GETDATA_H | #define GETDATA_H | |||
#ifdef __cplusplus | #ifdef __cplusplus | |||
extern "C" { | extern "C" { | |||
#endif | #endif | |||
/* The most recent standards version supported by this library */ | /* The most recent standards version supported by this library */ | |||
#define GD_DIRFILE_STANDARDS_VERSION 8 | #define GD_DIRFILE_STANDARDS_VERSION 8 | |||
/* one or more of these should give us: | #include <math.h> | |||
* size_t, off_t, __REDIRECT, &c., if present | ||||
*/ | ||||
#include <sys/types.h> | #include <sys/types.h> | |||
#include <unistd.h> | ||||
/* If this symbol is defined here, the C99-API is not present in the librar y */ | /* If this symbol is defined here, the C99-API is not present in the librar y */ | |||
/* #undef GD_NO_C99_API */ | /* #undef GD_NO_C99_API */ | |||
#if defined(GD_NO_C99_API) && ! defined(GD_C89_API) | #if defined(GD_NO_C99_API) && ! defined(GD_C89_API) | |||
# define GD_C89_API | # define GD_C89_API | |||
#endif | #endif | |||
/* MSVC build system defines GD_C89_API */ | ||||
#if defined(GD_C89_API) | ||||
# define GD_NO_C99_API | ||||
#endif | ||||
/* define function attributes */ | /* define function attributes */ | |||
#if defined __GNUC__ && defined __GNUC_MINOR__ | #if defined __GNUC__ && defined __GNUC_MINOR__ | |||
# define gd_gnu_enough ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) | # define gd_gnu_enough ((__GNUC__ * 100 + __GNUC_MINOR__) >= 303) | |||
#else | #else | |||
# define gd_gnu_enough 0 | # define gd_gnu_enough 0 | |||
#endif | #endif | |||
#ifdef __attribute_deprecated__ | #ifdef __attribute_deprecated__ | |||
# define gd_deprecated __attribute_deprecated__ | # define gd_deprecated __attribute_deprecated__ | |||
#elif gd_gnu_enough | #elif gd_gnu_enough | |||
skipping to change at line 228 | skipping to change at line 230 | |||
GD_DIVIDE_ENTRY = 0x0A, | GD_DIVIDE_ENTRY = 0x0A, | |||
GD_RECIP_ENTRY = 0x0B, | GD_RECIP_ENTRY = 0x0B, | |||
GD_CONST_ENTRY = GD_SCALAR_ENTRY | 0x00, | GD_CONST_ENTRY = GD_SCALAR_ENTRY | 0x00, | |||
GD_STRING_ENTRY = GD_SCALAR_ENTRY | 0x01, | GD_STRING_ENTRY = GD_SCALAR_ENTRY | 0x01, | |||
GD_CARRAY_ENTRY = GD_SCALAR_ENTRY | 0x02 | GD_CARRAY_ENTRY = GD_SCALAR_ENTRY | 0x02 | |||
} gd_entype_t; | } gd_entype_t; | |||
/* GD_NO_ENTRY is not part of this count */ | /* GD_NO_ENTRY is not part of this count */ | |||
#define GD_N_ENTYPES 14 | #define GD_N_ENTYPES 14 | |||
#define _gd_int16_t short int | #define gd_int16_t short int | |||
#define _gd_uint16_t unsigned short int | #define gd_uint16_t unsigned short int | |||
#define _gd_int64_t long long int | #define gd_int64_t long long int | |||
#if ! defined GD_C89_API | #if ! defined GD_C89_API | |||
# include <inttypes.h> | # include <inttypes.h> | |||
# define GD_DCOMPLEXM(v) double _Complex v | # define GD_DCOMPLEXM(v) double _Complex v | |||
# define GD_DCOMPLEXP(v) double _Complex *v | # define GD_DCOMPLEXP(v) double _Complex *v | |||
typedef int16_t gd_bit_t; | typedef int16_t gd_bit_t; | |||
typedef uint16_t gd_spf_t; | typedef uint16_t gd_spf_t; | |||
typedef int64_t gd_shift_t; | typedef int64_t gd_shift_t; | |||
#else | #else | |||
# define GD_DCOMPLEXM(v) double v[2] | # define GD_DCOMPLEXM(v) double v[2] | |||
# define GD_DCOMPLEXP(v) double *v | # define GD_DCOMPLEXP(v) double *v | |||
typedef _gd_int16_t gd_bit_t; | typedef gd_int16_t gd_bit_t; | |||
typedef _gd_uint16_t gd_spf_t; | typedef gd_uint16_t gd_spf_t; | |||
typedef _gd_int64_t gd_shift_t; | typedef gd_int64_t gd_shift_t; | |||
#endif | #endif | |||
/* Data types -- No valid type may set 0x40 */ | /* Data types -- No valid type may set 0x40 */ | |||
#define GD_SIZE8 0x001 | #define GD_SIZE8 0x001 | |||
#define GD_SIZE16 0x002 | #define GD_SIZE16 0x002 | |||
#define GD_SIZE32 0x004 | #define GD_SIZE32 0x004 | |||
#define GD_SIZE64 0x008 | #define GD_SIZE64 0x008 | |||
#define GD_SIZE128 0x010 | #define GD_SIZE128 0x010 | |||
#define GD_SIZE(x) (x & 0x01f) | #define GD_SIZE(x) (x & 0x01f) | |||
skipping to change at line 415 | skipping to change at line 418 | |||
extern int gd_add_bit(DIRFILE *dirfile, const char *field_code, | extern int gd_add_bit(DIRFILE *dirfile, const char *field_code, | |||
const char *in_field, gd_bit_t bitnum, gd_bit_t numbits, int fragment_i ndex) | const char *in_field, gd_bit_t bitnum, gd_bit_t numbits, int fragment_i ndex) | |||
gd_nothrow gd_nonnull ((1,2,3)); | gd_nothrow gd_nonnull ((1,2,3)); | |||
extern int gd_add_clincom(DIRFILE *dirfile, const char *field_code, | extern int gd_add_clincom(DIRFILE *dirfile, const char *field_code, | |||
int n_fields, const char **in_fields, const GD_DCOMPLEXP(cm), | int n_fields, const char **in_fields, const GD_DCOMPLEXP(cm), | |||
const GD_DCOMPLEXP(cb), int fragment_index) gd_nothrow | const GD_DCOMPLEXP(cb), int fragment_index) gd_nothrow | |||
gd_nonnull ((1,2,4,5,6)); | gd_nonnull ((1,2,4,5,6)); | |||
extern int gd_add_carray(DIRFILE* D, const char* field_code, | extern int gd_add_carray(DIRFILE *dirfile, const char *field_code, | |||
gd_type_t const_type, size_t array_len, gd_type_t data_type, | gd_type_t const_type, size_t array_len, gd_type_t data_type, | |||
const void* values, int fragment_index) gd_nothrow gd_nonnull((1,2,6)); | const void *values, int fragment_index) gd_nothrow gd_nonnull((1,2,6)); | |||
extern int gd_add_const(DIRFILE *dirfile, const char *field_code, | extern int gd_add_const(DIRFILE *dirfile, const char *field_code, | |||
gd_type_t const_type, gd_type_t data_type, const void* value, | gd_type_t const_type, gd_type_t data_type, const void *value, | |||
int fragment_index) gd_nothrow gd_nonnull ((1,2,5)); | int fragment_index) gd_nothrow gd_nonnull ((1,2,5)); | |||
extern int gd_add_cpolynom(DIRFILE *dirfile, const char *field_code, | extern int gd_add_cpolynom(DIRFILE *dirfile, const char *field_code, | |||
int poly_ord, const char *in_field, const GD_DCOMPLEXP(ca), | int poly_ord, const char *in_field, const GD_DCOMPLEXP(ca), | |||
int fragment_index) gd_nothrow gd_nonnull ((1,2,4)); | int fragment_index) gd_nothrow gd_nonnull ((1,2,4)); | |||
/* The native gd_add_crecip cannot be used in C89 mode */ | /* The native gd_add_crecip cannot be used in C89 mode */ | |||
#if ! defined GD_C89_API | #if ! defined GD_C89_API | |||
extern int gd_add_crecip(DIRFILE *dirfile, const char *field_code, | extern int gd_add_crecip(DIRFILE *dirfile, const char *field_code, | |||
const char *in_field, _Complex double cdividend, int fragment_index) | const char *in_field, _Complex double cdividend, int fragment_index) | |||
skipping to change at line 479 | skipping to change at line 482 | |||
const char *in_field, gd_bit_t bitnum, gd_bit_t numbits, | const char *in_field, gd_bit_t bitnum, gd_bit_t numbits, | |||
int fragment_index) gd_nothrow gd_nonnull ((1,2,3)); | int fragment_index) gd_nothrow gd_nonnull ((1,2,3)); | |||
extern int gd_add_string(DIRFILE *dirfile, const char *field_code, | extern int gd_add_string(DIRFILE *dirfile, const char *field_code, | |||
const char *value, int fragment_index) gd_nothrow gd_nonnull((1,2,3)); | const char *value, int fragment_index) gd_nothrow gd_nonnull((1,2,3)); | |||
extern int gd_alter_bit(DIRFILE *dirfile, const char *field_code, | extern int gd_alter_bit(DIRFILE *dirfile, const char *field_code, | |||
const char *in_field, gd_bit_t bitnum, gd_bit_t numbits) gd_nothrow | const char *in_field, gd_bit_t bitnum, gd_bit_t numbits) gd_nothrow | |||
gd_nonnull((1,2)); | gd_nonnull((1,2)); | |||
extern int gd_alter_carray(DIRFILE* D, const char* field_code, | extern int gd_alter_carray(DIRFILE *dirfile, const char *field_code, | |||
gd_type_t const_type, size_t array_len) gd_nothrow gd_nonnull((1,2)); | gd_type_t const_type, size_t array_len) gd_nothrow gd_nonnull((1,2)); | |||
extern int gd_alter_clincom(DIRFILE *dirfile, const char *field_code, | extern int gd_alter_clincom(DIRFILE *dirfile, const char *field_code, | |||
int n_fields, const char **in_fields, const GD_DCOMPLEXP(m), | int n_fields, const char **in_fields, const GD_DCOMPLEXP(m), | |||
const GD_DCOMPLEXP(b)) gd_nothrow gd_nonnull((1,2)); | const GD_DCOMPLEXP(b)) gd_nothrow gd_nonnull((1,2)); | |||
extern int gd_alter_const(DIRFILE *dirfile, const char *field_code, | extern int gd_alter_const(DIRFILE *dirfile, const char *field_code, | |||
gd_type_t const_type) gd_nothrow gd_nonnull((1,2)); | gd_type_t const_type) gd_nothrow gd_nonnull((1,2)); | |||
extern int gd_alter_cpolynom(DIRFILE *dirfile, const char *field_code, | extern int gd_alter_cpolynom(DIRFILE *dirfile, const char *field_code, | |||
skipping to change at line 529 | skipping to change at line 532 | |||
int poly_ord, const char *in_field, const double *a) gd_nothrow | int poly_ord, const char *in_field, const double *a) gd_nothrow | |||
gd_nonnull((1,2)); | gd_nonnull((1,2)); | |||
extern int gd_alter_recip(DIRFILE *dirfile, const char *field_code, | extern int gd_alter_recip(DIRFILE *dirfile, const char *field_code, | |||
const char *in_field, double cdividend) gd_nothrow gd_nonnull((1,2)); | const char *in_field, double cdividend) gd_nothrow gd_nonnull((1,2)); | |||
extern int gd_alter_sbit(DIRFILE *dirfile, const char *field_code, | extern int gd_alter_sbit(DIRFILE *dirfile, const char *field_code, | |||
const char *in_field, gd_bit_t bitnum, gd_bit_t numbits) gd_nothrow | const char *in_field, gd_bit_t bitnum, gd_bit_t numbits) gd_nothrow | |||
gd_nonnull((1,2)); | gd_nonnull((1,2)); | |||
extern size_t gd_carray_len(DIRFILE *D, const char *field_code_in) gd_nothr ow | extern size_t gd_carray_len(DIRFILE *dirfile, const char *field_code) gd_no throw | |||
gd_nonnull((1,2)); | gd_nonnull((1,2)); | |||
extern int gd_get_carray(DIRFILE *D, const char *field_code_in, | extern int gd_get_carray(DIRFILE *dirfile, const char *field_code, | |||
gd_type_t return_type, void *data_out) gd_nothrow gd_nonnull((1,2)); | gd_type_t return_type, void *data_out) gd_nothrow gd_nonnull((1,2)); | |||
extern int gd_get_carray_slice(DIRFILE* D, const char *field_code_in, | extern int gd_get_carray_slice(DIRFILE *dirfile, const char *field_code, | |||
unsigned int start, size_t n, gd_type_t return_type, void *data_out) | unsigned int start, size_t n, gd_type_t return_type, void *data_out) | |||
gd_nothrow gd_nonnull((1,2)); | gd_nothrow gd_nonnull((1,2)); | |||
extern int gd_put_carray(DIRFILE* D, const char *field_code_in, | extern int gd_put_carray(DIRFILE *dirfile, const char *field_code, | |||
gd_type_t data_type, const void *data_in) gd_nothrow gd_nonnull((1,2,4)); | gd_type_t data_type, const void *data_in) gd_nothrow gd_nonnull((1,2,4)); | |||
extern int gd_put_carray_slice(DIRFILE* D, const char *field_code_in, | extern int gd_put_carray_slice(DIRFILE *dirfile, const char *field_code, | |||
unsigned int first, size_t n, gd_type_t data_type, const void *data_in) | unsigned int first, size_t n, gd_type_t data_type, const void *data_in) | |||
gd_nothrow gd_nonnull((1,2,6)); | gd_nothrow gd_nonnull((1,2,6)); | |||
extern int gd_get_constant(DIRFILE *dirfile, const char *field_code, | extern int gd_get_constant(DIRFILE *dirfile, const char *field_code, | |||
gd_type_t return_type, void *data) gd_nothrow gd_nonnull ((1, 2)); | gd_type_t return_type, void *data) gd_nothrow gd_nonnull ((1, 2)); | |||
extern int gd_put_constant(DIRFILE *dirfile, const char *field_code, | extern int gd_put_constant(DIRFILE *dirfile, const char *field_code, | |||
gd_type_t data_type, const void *data) gd_nothrow gd_nonnull ((1, 2, 4) ); | gd_type_t data_type, const void *data) gd_nothrow gd_nonnull ((1, 2, 4) ); | |||
extern const void *gd_constants(DIRFILE *dirfile, | extern const void *gd_constants(DIRFILE *dirfile, | |||
gd_type_t return_type) gd_nothrow gd_nonnull ((1)); | gd_type_t return_type) gd_nothrow gd_nonnull ((1)); | |||
const gd_carray_t *gd_carrays(DIRFILE* D, gd_type_t return_type) gd_nothrow | extern const gd_carray_t *gd_carrays(DIRFILE *dirfile, | |||
gd_nonnull ((1)); | gd_type_t return_type) gd_nothrow gd_nonnull ((1)); | |||
extern gd_entry_t *gd_free_entry_strings(gd_entry_t *entry) gd_nothrow; | extern gd_entry_t *gd_free_entry_strings(gd_entry_t *entry) gd_nothrow; | |||
extern unsigned long int gd_encoding(DIRFILE *dirfile, | extern unsigned long int gd_encoding(DIRFILE *dirfile, | |||
int fragment) gd_nothrow gd_nonnull ((1)); | int fragment) gd_nothrow gd_nonnull ((1)); | |||
extern unsigned long int gd_endianness(DIRFILE *dirfile, | extern unsigned long int gd_endianness(DIRFILE *dirfile, | |||
int fragment) gd_nothrow gd_nonnull((1)); | int fragment) gd_nothrow gd_nonnull((1)); | |||
extern int gd_entry(DIRFILE *dirfile, const char *field_code, | extern int gd_entry(DIRFILE *dirfile, const char *field_code, | |||
skipping to change at line 588 | skipping to change at line 591 | |||
extern const char **gd_field_list_by_type(DIRFILE *dirfile, | extern const char **gd_field_list_by_type(DIRFILE *dirfile, | |||
gd_entype_t type) gd_nothrow gd_nonnull ((1)); | gd_entype_t type) gd_nothrow gd_nonnull ((1)); | |||
extern int gd_fragment_index(DIRFILE *dirfile, | extern int gd_fragment_index(DIRFILE *dirfile, | |||
const char *field_code) gd_nothrow gd_nonnull ((1)); | const char *field_code) gd_nothrow gd_nonnull ((1)); | |||
extern const char *gd_fragmentname(DIRFILE *dirfile, | extern const char *gd_fragmentname(DIRFILE *dirfile, | |||
int index) gd_nothrow gd_nonnull ((1)); | int index) gd_nothrow gd_nonnull ((1)); | |||
DIRFILE* gd_invalid_dirfile(void) gd_nothrow; | extern DIRFILE *gd_invalid_dirfile(void) gd_nothrow; | |||
extern int gd_madd(DIRFILE *dirfile, const gd_entry_t *entry, | extern int gd_madd(DIRFILE *dirfile, const gd_entry_t *entry, | |||
const char *parent) gd_nothrow gd_nonnull ((1,2,3)); | const char *parent) gd_nothrow gd_nonnull ((1,2,3)); | |||
extern int gd_madd_bit(DIRFILE *dirfile, const char *parent, | extern int gd_madd_bit(DIRFILE *dirfile, const char *parent, | |||
const char *field_code, const char *in_field, gd_bit_t bitnum, | const char *field_code, const char *in_field, gd_bit_t bitnum, | |||
gd_bit_t numbits) gd_nothrow gd_nonnull ((1,2,3,4)); | gd_bit_t numbits) gd_nothrow gd_nonnull ((1,2,3,4)); | |||
int gd_madd_carray(DIRFILE* D, const char* parent, const char* field_code, | extern int gd_madd_carray(DIRFILE *dirfile, const char *parent, | |||
gd_type_t const_type, size_t array_len, gd_type_t data_type, | const char *field_code, gd_type_t const_type, size_t array_len, | |||
const void* values) gd_nothrow gd_nonnull((1,2,3,7)); | gd_type_t data_type, const void *values) gd_nothrow gd_nonnull((1,2,3,7 | |||
)); | ||||
extern int gd_madd_clincom(DIRFILE *dirfile, const char *parent, | extern int gd_madd_clincom(DIRFILE *dirfile, const char *parent, | |||
const char *field_code, int n_fields, const char **in_fields, | const char *field_code, int n_fields, const char **in_fields, | |||
const GD_DCOMPLEXP(cm), const GD_DCOMPLEXP(cb)) gd_nothrow | const GD_DCOMPLEXP(cm), const GD_DCOMPLEXP(cb)) gd_nothrow | |||
gd_nonnull((1,2,3,5,6,7)); | gd_nonnull((1,2,3,5,6,7)); | |||
extern int gd_madd_const(DIRFILE *dirfile, const char *parent, | extern int gd_madd_const(DIRFILE *dirfile, const char *parent, | |||
const char *field_code, gd_type_t const_type, gd_type_t data_type, | const char *field_code, gd_type_t const_type, gd_type_t data_type, | |||
const void *value) gd_nothrow gd_nonnull ((1,2,3,6)); | const void *value) gd_nothrow gd_nonnull ((1,2,3,6)); | |||
skipping to change at line 665 | skipping to change at line 668 | |||
const char *field_code, const char *in_field, gd_bit_t bitnum, | const char *field_code, const char *in_field, gd_bit_t bitnum, | |||
gd_bit_t numbits) gd_nothrow gd_nonnull ((1,2,3,4)); | gd_bit_t numbits) gd_nothrow gd_nonnull ((1,2,3,4)); | |||
extern int gd_madd_spec(DIRFILE *dirfile, const char *line, | extern int gd_madd_spec(DIRFILE *dirfile, const char *line, | |||
const char *parent) gd_nothrow gd_nonnull ((1,2,3)); | const char *parent) gd_nothrow gd_nonnull ((1,2,3)); | |||
extern int gd_madd_string(DIRFILE *dirfile, const char *parent, | extern int gd_madd_string(DIRFILE *dirfile, const char *parent, | |||
const char *field_code, const char *value) gd_nothrow | const char *field_code, const char *value) gd_nothrow | |||
gd_nonnull ((1,2,3,4)); | gd_nonnull ((1,2,3,4)); | |||
extern int gd_dirfile_standards(DIRFILE *D, int vers) gd_nothrow | extern int gd_dirfile_standards(DIRFILE *dirfile, int vers) gd_nothrow | |||
gd_nonnull ((1)); | gd_nonnull ((1)); | |||
extern const void *gd_mconstants(DIRFILE *dirfile, const char *parent, | extern const void *gd_mconstants(DIRFILE *dirfile, const char *parent, | |||
gd_type_t return_type) gd_nothrow gd_nonnull((1,2)); | gd_type_t return_type) gd_nothrow gd_nonnull((1,2)); | |||
const gd_carray_t *gd_mcarrays(DIRFILE* D, const char* parent, | extern const gd_carray_t *gd_mcarrays(DIRFILE *dirfile, const char *parent, | |||
gd_type_t return_type) gd_nothrow; | gd_type_t return_type) gd_nothrow; | |||
extern const char **gd_mfield_list(DIRFILE *dirfile, | extern const char **gd_mfield_list(DIRFILE *dirfile, | |||
const char *parent) gd_nothrow gd_nonnull((1,2)); | const char *parent) gd_nothrow gd_nonnull((1,2)); | |||
extern const char **gd_mfield_list_by_type(DIRFILE *dirfile, | extern const char **gd_mfield_list_by_type(DIRFILE *dirfile, | |||
const char *parent, gd_entype_t type) gd_nothrow gd_nonnull((1,2)); | const char *parent, gd_entype_t type) gd_nothrow gd_nonnull((1,2)); | |||
extern const char **gd_mstrings(DIRFILE *dirfile, const char *parent) gd_no throw | extern const char **gd_mstrings(DIRFILE *dirfile, const char *parent) gd_no throw | |||
gd_nonnull((1,2)); | gd_nonnull((1,2)); | |||
extern const char **gd_mvector_list(DIRFILE *dirfile, | extern const char **gd_mvector_list(DIRFILE *dirfile, | |||
const char *parent) gd_nothrow gd_nonnull((1,2)); | const char *parent) gd_nothrow gd_nonnull((1,2)); | |||
extern const char *gd_dirfilename(DIRFILE *dirfile) gd_nothrow gd_nonnull ( (1)); | extern const char *gd_dirfilename(DIRFILE *dirfile) gd_nothrow gd_nonnull ( (1)); | |||
extern gd_type_t gd_native_type(DIRFILE *dirfile, | extern gd_type_t gd_native_type(DIRFILE *dirfile, | |||
const char *field_code_in) gd_nothrow gd_nonnull ((1,2)); | const char *field_code) gd_nothrow gd_nonnull ((1,2)); | |||
extern unsigned int gd_nfields(DIRFILE *dirfile) gd_nothrow gd_nonnull ((1) ); | extern unsigned int gd_nfields(DIRFILE *dirfile) gd_nothrow gd_nonnull ((1) ); | |||
extern unsigned int gd_nfields_by_type(DIRFILE *dirfile, | extern unsigned int gd_nfields_by_type(DIRFILE *dirfile, | |||
gd_entype_t type) gd_nothrow gd_nonnull ((1)); | gd_entype_t type) gd_nothrow gd_nonnull ((1)); | |||
extern int gd_nfragments(DIRFILE *dirfile) gd_nothrow gd_nonnull((1)); | extern int gd_nfragments(DIRFILE *dirfile) gd_nothrow gd_nonnull((1)); | |||
extern unsigned int gd_nmfields(DIRFILE *dirfile, const char *parent) gd_no throw | extern unsigned int gd_nmfields(DIRFILE *dirfile, const char *parent) gd_no throw | |||
gd_nonnull((1,2)); | gd_nonnull((1,2)); | |||
skipping to change at line 731 | skipping to change at line 734 | |||
extern const char *gd_raw_filename(DIRFILE *dirfile, | extern const char *gd_raw_filename(DIRFILE *dirfile, | |||
const char *field_code) gd_nothrow gd_nonnull ((1, 2)); | const char *field_code) gd_nothrow gd_nonnull ((1, 2)); | |||
extern const char *gd_reference(DIRFILE *dirfile, | extern const char *gd_reference(DIRFILE *dirfile, | |||
const char *field_code) gd_nothrow gd_nonnull ((1)); | const char *field_code) gd_nothrow gd_nonnull ((1)); | |||
extern gd_spf_t gd_spf(DIRFILE *dirfile, const char *field_code) gd_nothrow | extern gd_spf_t gd_spf(DIRFILE *dirfile, const char *field_code) gd_nothrow | |||
gd_nonnull ((1, 2)); | gd_nonnull ((1, 2)); | |||
extern size_t gd_get_string(DIRFILE *dirfile, const char *field_code, | extern size_t gd_get_string(DIRFILE *dirfile, const char *field_code, | |||
size_t len, char *data) gd_nothrow gd_nonnull ((1, 2, 4)); | size_t len, char *data) gd_nothrow gd_nonnull ((1, 2)); | |||
extern size_t gd_put_string(DIRFILE *dirfile, const char *field_code, | extern size_t gd_put_string(DIRFILE *dirfile, const char *field_code, | |||
const char *data) gd_nothrow gd_nonnull ((1, 2, 3)); | const char *data) gd_nothrow gd_nonnull ((1, 2, 3)); | |||
extern const char **gd_strings(DIRFILE *dirfile) gd_nothrow gd_nonnull ((1) ); | extern const char **gd_strings(DIRFILE *dirfile) gd_nothrow gd_nonnull ((1) ); | |||
extern int gd_validate(DIRFILE *dirfile, const char *field_code_in) gd_noth row | extern int gd_validate(DIRFILE *dirfile, const char *field_code) gd_nothrow | |||
gd_nonnull((1,2)); | gd_nonnull((1,2)); | |||
extern const char **gd_vector_list(DIRFILE *dirfile) gd_nothrow gd_nonnull( (1)); | extern const char **gd_vector_list(DIRFILE *dirfile) gd_nothrow gd_nonnull( (1)); | |||
/* The following functions contain calls to I/O functions, making them | /* The following functions contain calls to I/O functions, making them | |||
* cancellation points. As a result we cannot mark them with gd_nothrow. | * cancellation points. As a result we cannot mark them with gd_nothrow. | |||
*/ | */ | |||
extern int gd_add(DIRFILE *dirfile, const gd_entry_t *entry) gd_nonnull((1, 2)); | extern int gd_add(DIRFILE *dirfile, const gd_entry_t *entry) gd_nonnull((1, 2)); | |||
extern int gd_add_raw(DIRFILE *dirfile, const char *field_code, | extern int gd_add_raw(DIRFILE *dirfile, const char *field_code, | |||
skipping to change at line 773 | skipping to change at line 776 | |||
extern int gd_alter_linterp(DIRFILE *dirfile, const char *field_code, | extern int gd_alter_linterp(DIRFILE *dirfile, const char *field_code, | |||
const char *in_field, const char *table, int recode) gd_nonnull ((1,2)) ; | const char *in_field, const char *table, int recode) gd_nonnull ((1,2)) ; | |||
extern int gd_alter_raw(DIRFILE *dirfile, const char *field_code, | extern int gd_alter_raw(DIRFILE *dirfile, const char *field_code, | |||
gd_type_t data_type, gd_spf_t spf, int recode) gd_nonnull ((1,2)); | gd_type_t data_type, gd_spf_t spf, int recode) gd_nonnull ((1,2)); | |||
extern int gd_alter_spec(DIRFILE *dirfile, const char *line, | extern int gd_alter_spec(DIRFILE *dirfile, const char *line, | |||
int recode) gd_nonnull ((1,2)); | int recode) gd_nonnull ((1,2)); | |||
extern DIRFILE *gd_cbopen(const char *dirfilename, unsigned long int flags, | extern DIRFILE *gd_cbopen(const char *dirfilename, unsigned long int flags, | |||
gd_parser_callback_t sehandler, void* extra) gd_nonnull ((1)); | gd_parser_callback_t sehandler, void *extra) gd_nonnull ((1)); | |||
extern int gd_close(DIRFILE *dirfile); | extern int gd_close(DIRFILE *dirfile); | |||
extern int gd_delete(DIRFILE *dirfile, const char *field_code, | extern int gd_delete(DIRFILE *dirfile, const char *field_code, | |||
int flags) gd_nonnull ((1,2)); | int flags) gd_nonnull ((1,2)); | |||
extern int gd_discard(DIRFILE *dirfile); | extern int gd_discard(DIRFILE *dirfile); | |||
extern int gd_flush(DIRFILE *dirfile, const char *field_code) gd_nonnull (( 1)); | extern int gd_flush(DIRFILE *dirfile, const char *field_code) gd_nonnull (( 1)); | |||
extern int gd_include(DIRFILE *dirfile, const char *file, int fragment_inde x, | extern int gd_include(DIRFILE *dirfile, const char *file, int fragment_inde x, | |||
unsigned long int flags) gd_nonnull ((1,2)); | unsigned long int flags) gd_nonnull ((1,2)); | |||
double gd_framenum(DIRFILE* D, const char* field_code_in, | extern double gd_framenum(DIRFILE *dirfile, const char *field_code, | |||
double value) gd_nonnull ((1,2)); | double value) gd_nonnull ((1,2)); | |||
extern int gd_malter_spec(DIRFILE *dirfile, const char *line, | extern int gd_malter_spec(DIRFILE *dirfile, const char *line, | |||
const char *parent, int recode) gd_nonnull ((1,2,3)); | const char *parent, int recode) gd_nonnull ((1,2,3)); | |||
extern int gd_metaflush(DIRFILE *dirfile) gd_nonnull ((1)); | extern int gd_metaflush(DIRFILE *dirfile) gd_nonnull ((1)); | |||
extern int gd_move(DIRFILE *dirfile, const char *field_code, int new_fragme nt, | extern int gd_move(DIRFILE *dirfile, const char *field_code, int new_fragme nt, | |||
int move_data) gd_nonnull ((1,2)); | int move_data) gd_nonnull ((1,2)); | |||
skipping to change at line 823 | skipping to change at line 826 | |||
extern size_t gd_getdata(DIRFILE *dirfile, const char *field_code, | extern size_t gd_getdata(DIRFILE *dirfile, const char *field_code, | |||
off_t first_frame, off_t first_sample, size_t num_frames, | off_t first_frame, off_t first_sample, size_t num_frames, | |||
size_t num_samples, gd_type_t return_type, void *data) gd_nonnull ((1, 2)); | size_t num_samples, gd_type_t return_type, void *data) gd_nonnull ((1, 2)); | |||
extern size_t gd_putdata(DIRFILE *dirfile, const char *field_code, | extern size_t gd_putdata(DIRFILE *dirfile, const char *field_code, | |||
off_t first_frame, off_t first_sample, size_t num_frames, | off_t first_frame, off_t first_sample, size_t num_frames, | |||
size_t num_samples, gd_type_t data_type, const void *data) | size_t num_samples, gd_type_t data_type, const void *data) | |||
gd_nonnull ((1, 2)); | gd_nonnull ((1, 2)); | |||
extern double gd_framenum_subset(DIRFILE* D, const char* field_code, | extern double gd_framenum_subset(DIRFILE *dirfile, const char *field_code, | |||
double value, off_t field_start, off_t field_end) gd_nonnull ((1,2)); | double value, off_t field_start, off_t field_end) gd_nonnull ((1,2)); | |||
extern off_t gd_frameoffset(DIRFILE *dirfile, int fragment) gd_nothrow | extern off_t gd_frameoffset(DIRFILE *dirfile, int fragment) gd_nothrow | |||
gd_nonnull ((1)); | gd_nonnull ((1)); | |||
extern off_t gd_nframes(DIRFILE *dirfile) gd_nonnull ((1)); | extern off_t gd_nframes(DIRFILE *dirfile) gd_nonnull ((1)); | |||
extern off_t gd_bof(DIRFILE *dirfile, const char* field_code) gd_nothrow | extern off_t gd_bof(DIRFILE *dirfile, const char *field_code) gd_nothrow | |||
gd_nonnull ((1,2)); | gd_nonnull ((1,2)); | |||
extern off_t gd_eof(DIRFILE *dirfile, const char* field_code) | extern off_t gd_eof(DIRFILE *dirfile, const char *field_code) | |||
gd_nonnull ((1,2)); | gd_nonnull ((1,2)); | |||
#else | #else | |||
# ifdef __REDIRECT_NTH | # ifdef __REDIRECT_NTH | |||
extern off_t __REDIRECT_NTH (gd_bof, (DIRFILE *dirfile, const char* field_c ode), | extern off_t __REDIRECT_NTH (gd_bof, (DIRFILE *dirfile, const char *field_c ode), | |||
gd_bof64) gd_nonnull ((1,2)); | gd_bof64) gd_nonnull ((1,2)); | |||
extern off_t __REDIRECT_NTH (gd_frameoffset, (DIRFILE *dirfile, int fragmen t), | extern off_t __REDIRECT_NTH (gd_frameoffset, (DIRFILE *dirfile, int fragmen t), | |||
gd_frameoffset64) gd_nonnull ((1)); | gd_frameoffset64) gd_nonnull ((1)); | |||
# else | # else | |||
# define gd_bof gd_bof64 | # define gd_bof gd_bof64 | |||
# define gd_frameoffset gd_frameoffset64 | # define gd_frameoffset gd_frameoffset64 | |||
# endif | # endif | |||
# ifdef __REDIRECT | # ifdef __REDIRECT | |||
skipping to change at line 864 | skipping to change at line 867 | |||
gd_type_t return_type, void *data), gd_getdata64) gd_nonnull ((1, 2)) ; | gd_type_t return_type, void *data), gd_getdata64) gd_nonnull ((1, 2)) ; | |||
extern size_t __REDIRECT (gd_putdata, (DIRFILE *dirfile, const char *field_ code, | extern size_t __REDIRECT (gd_putdata, (DIRFILE *dirfile, const char *field_ code, | |||
off_t first_frame, off_t first_sample, size_t num_frames, | off_t first_frame, off_t first_sample, size_t num_frames, | |||
size_t num_samples, gd_type_t data_type, const void *data), | size_t num_samples, gd_type_t data_type, const void *data), | |||
gd_putdata64) gd_nonnull ((1, 2)); | gd_putdata64) gd_nonnull ((1, 2)); | |||
extern off_t __REDIRECT (gd_nframes, (DIRFILE *dirfile), | extern off_t __REDIRECT (gd_nframes, (DIRFILE *dirfile), | |||
gd_nframes64) gd_nonnull ((1)); | gd_nframes64) gd_nonnull ((1)); | |||
extern off_t __REDIRECT (gd_eof, (DIRFILE *dirfile, const char* field_code) , | extern off_t __REDIRECT (gd_eof, (DIRFILE *dirfile, const char *field_code) , | |||
gd_eof64) gd_nonnull ((1,2)); | gd_eof64) gd_nonnull ((1,2)); | |||
extern double __REDIRECT (gd_framenum_subset, (DIRFILE* D, | extern double __REDIRECT (gd_framenum_subset, (DIRFILE *dirfile, | |||
const char* field_code, double value, off_t field_start, off_t field_ | const char *field_code, double value, off_t field_start, off_t field_ | |||
end), | end), | |||
gd_framenum_subset64) gd_nonnull ((1,2)); | gd_framenum_subset64) gd_nonnull ((1,2)); | |||
# else | # else | |||
# define gd_alter_frameoffset gd_alter_frameoffset64 | # define gd_alter_frameoffset gd_alter_frameoffset64 | |||
# define gd_getdata gd_getdata64 | # define gd_getdata gd_getdata64 | |||
# define gd_putdata gd_putdata64 | # define gd_putdata gd_putdata64 | |||
# define gd_nframes gd_nframes64 | # define gd_nframes gd_nframes64 | |||
# define gd_eof gd_eof64 | # define gd_eof gd_eof64 | |||
# define gd_framenum_subset gd_framenum_subset64 | # define gd_framenum_subset gd_framenum_subset64 | |||
# endif | # endif | |||
#endif | #endif | |||
/* if required, declare the LFS transitional extension */ | /* if required, declare the LFS transitional extension */ | |||
#if defined _LARGEFILE64_SOURCE || (defined _FILE_OFFSET_BITS && \ | #if defined _LARGEFILE64_SOURCE || (defined _FILE_OFFSET_BITS && \ | |||
_FILE_OFFSET_BITS == 64) || (defined __CYGWIN__) || (defined __APPLE__) | _FILE_OFFSET_BITS == 64) || (defined __CYGWIN__) || (defined __APPLE__) | |||
#if (defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64) || \ | #if (defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64) || \ | |||
(defined __APPLE__) || (defined __CYGWI N__) | (defined __APPLE__) || (defined __CYGWI N__) | |||
#define off64_t off_t | #define gd_off64_t off_t | |||
#else | ||||
#define gd_off64_t off64_t | ||||
#endif | #endif | |||
extern int gd_alter_frameoffset64(DIRFILE *dirfile, off64_t offset, | extern int gd_alter_frameoffset64(DIRFILE *dirfile, gd_off64_t offset, | |||
int fragment, int recode) gd_nonnull ((1)); | int fragment, int recode) gd_nonnull ((1)); | |||
extern size_t gd_getdata64(DIRFILE *dirfile, const char *field_code, | extern size_t gd_getdata64(DIRFILE *dirfile, const char *field_code, | |||
off64_t first_frame, off64_t first_samp, size_t num_frames, size_t num_ | gd_off64_t first_frame, gd_off64_t first_samp, size_t num_frames, | |||
samp, | size_t num_samp, gd_type_t return_type, void *data) gd_nonnull ((1, 2)) | |||
gd_type_t return_type, void *data) gd_nonnull ((1, 2)); | ; | |||
extern size_t gd_putdata64(DIRFILE *dirfile, const char *field_code, | extern size_t gd_putdata64(DIRFILE *dirfile, const char *field_code, | |||
off64_t first_frame, off64_t first_sample, size_t num_frames, | gd_off64_t first_frame, gd_off64_t first_sample, size_t num_frames, | |||
size_t num_samples, gd_type_t data_type, const void *data) | size_t num_samples, gd_type_t data_type, const void *data) | |||
gd_nonnull ((1, 2)); | gd_nonnull ((1, 2)); | |||
extern off64_t gd_frameoffset64(DIRFILE *dirfile, int fragment) gd_nonnull( | extern gd_off64_t gd_frameoffset64(DIRFILE *dirfile, | |||
(1)); | int fragment) gd_nonnull((1)); | |||
extern double gd_framenum_subset64(DIRFILE* D, const char* field_code_in, | extern double gd_framenum_subset64(DIRFILE *dirfile, const char *field_code | |||
double value, off64_t field_start, off64_t field_end) gd_nonnull ((1,2) | , | |||
); | double value, gd_off64_t field_start, | |||
gd_off64_t field_end) gd_nonnull ((1,2)); | ||||
extern off64_t gd_nframes64(DIRFILE *dirfile) gd_nonnull ((1)); | extern gd_off64_t gd_nframes64(DIRFILE *dirfile) gd_nonnull ((1)); | |||
extern off64_t gd_bof64(DIRFILE *dirfile, const char* field_code) gd_nothro w | extern gd_off64_t gd_bof64(DIRFILE *dirfile, const char *field_code) gd_not hrow | |||
gd_nonnull ((1,2)); | gd_nonnull ((1,2)); | |||
extern off64_t gd_eof64(DIRFILE *dirfile, const char* field_code) | extern gd_off64_t gd_eof64(DIRFILE *dirfile, const char *field_code) | |||
gd_nonnull ((1,2)); | gd_nonnull ((1,2)); | |||
#if (defined _FILE_OFFSET_BITS && _FILE_OFFSET_BITS == 64) || \ | ||||
(defined __APPLE__) || (defined __CYGWI | ||||
N__) | ||||
/* #undef off64_t */ | ||||
#endif | #endif | |||
#endif | ||||
/* If this symbol is defined here, the legacy API is present in the library | ||||
*/ | ||||
#define GD_LEGACY_API /**/ | ||||
#ifdef __cplusplus | #ifdef __cplusplus | |||
} | } | |||
#endif | #endif | |||
/* If this symbol is defined here, the legacy API is present in the library | ||||
*/ | ||||
#define GD_LEGACY_API | ||||
/* The caller can disable the legacy API by defining GD_NO_LEGACY_API | /* The caller can disable the legacy API by defining GD_NO_LEGACY_API | |||
* before including getdata.h | * before including getdata.h | |||
*/ | */ | |||
#ifndef GD_NO_LEGACY_API | #ifndef GD_NO_LEGACY_API | |||
/* include the legacy api, if present */ | /* include the legacy api, if present */ | |||
# ifdef GD_LEGACY_API | # ifdef GD_LEGACY_API | |||
# include <getdata_legacy.h> | # include <getdata_legacy.h> | |||
# endif | # endif | |||
#endif | #endif | |||
End of changes. 43 change blocks. | ||||
68 lines changed or deleted | 69 lines changed or added | |||
getdata.mod | getdata.mod | |||
---|---|---|---|---|
GFORTRAN module version '6' created from getdata.f90 on Fri Jul 6 18:27:24 2012 | GFORTRAN module version '6' created from getdata.f90 on Fri Jul 6 18:26:27 2012 | |||
MD5:c8811a77ef200d1caaebe01ae6e95c93 -- If you edit this, you'll get what y ou deserve. | MD5:c8811a77ef200d1caaebe01ae6e95c93 -- If you edit this, you'll get what y ou deserve. | |||
(() () () () () () () () () () () () () () () () () () () () () () () () | (() () () () () () () () () () () () () () () () () () () () () () () () | |||
() () ()) | () () ()) | |||
() | () | |||
() | () | |||
() | () | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
getdata_legacy.h | getdata_legacy.h | |||
---|---|---|---|---|
/* (C) 2002-2005 C. Barth Netterfield | /* Copyright (C) 2002-2005 C. Barth Netterfield | |||
* (C) 2003-2005 Theodore Kisner | * Copyright (C) 2003-2005 Theodore Kisner | |||
* (C) 2005-2010 D. V. Wiebe | * Copyright (C) 2005-2010 D. V. Wiebe | |||
* | * | |||
************************************************************************** * | ************************************************************************** * | |||
* | * | |||
* This file is part of the GetData project. | * This file is part of the GetData project. | |||
* | * | |||
* GetData is free software; you can redistribute it and/or modify it under | * GetData is free software; you can redistribute it and/or modify it under | |||
* the terms of the GNU Lesser General Public License as published by the | * the terms of the GNU Lesser General Public License as published by the | |||
* Free Software Foundation; either version 2.1 of the License, or (at your | * Free Software Foundation; either version 2.1 of the License, or (at your | |||
* option) any later version. | * option) any later version. | |||
* | * | |||
End of changes. 1 change blocks. | ||||
3 lines changed or deleted | 3 lines changed or added | |||
indexentry.h | indexentry.h | |||
---|---|---|---|---|
// (C) 2008, 2010 D. V. Wiebe | // Copyright (C) 2008, 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 1 lines changed or added | |||
lincomentry.h | lincomentry.h | |||
---|---|---|---|---|
// (C) 2008-2010 D. V. Wiebe | // Copyright (C) 2008-2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class LincomEntry : public Entry { | class LincomEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
LincomEntry() : Entry::Entry() { E.field_type = GD_LINCOM_ENTRY; }; | LincomEntry() : Entry() { E.field_type = GD_LINCOM_ENTRY; }; | |||
LincomEntry(const char* field_code, int n_fields, const char** in_fie lds, | LincomEntry(const char* field_code, int n_fields, const char** in_fie lds, | |||
double* m, double* b, int fragment_index = 0); | double* m, double* b, int fragment_index = 0); | |||
LincomEntry(const char* field_code, int n_fields, const char** in_fie lds, | LincomEntry(const char* field_code, int n_fields, const char** in_fie lds, | |||
std::complex<double>* cm, std::complex<double>* cb, | std::complex<double>* cm, std::complex<double>* cb, | |||
int fragment_index = 0); | int fragment_index = 0); | |||
virtual const char *Input(int index = 0) const { | virtual const char *Input(int index = 0) const { | |||
return (CheckIndex(E.field_type, E.u.lincom.n_fields, index)) ? | return (CheckIndex(E.field_type, E.u.lincom.n_fields, index)) ? | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
linterpentry.h | linterpentry.h | |||
---|---|---|---|---|
// (C) 2008, 2010 D. V. Wiebe | // Copyright (C) 2008, 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class LinterpEntry : public Entry { | class LinterpEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
LinterpEntry() : Entry::Entry() { E.field_type = GD_LINTERP_ENTRY; }; | LinterpEntry() : Entry() { E.field_type = GD_LINTERP_ENTRY; }; | |||
LinterpEntry(const char* field_code, const char* in_field, | LinterpEntry(const char* field_code, const char* in_field, | |||
const char* table, int fragment_index = 0); | const char* table, int fragment_index = 0); | |||
virtual const char *Input() const { return E.in_fields[0]; }; | virtual const char *Input() const { return E.in_fields[0]; }; | |||
virtual const char *Table() const { return E.u.linterp.table; }; | virtual const char *Table() const { return E.u.linterp.table; }; | |||
int SetInput(const char* field); | int SetInput(const char* field); | |||
int SetTable(const char* table, int move_table = 0); | int SetTable(const char* table, int move_table = 0); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
multiplyentry.h | multiplyentry.h | |||
---|---|---|---|---|
// (C) 2008, 2010 D. V. Wiebe | // Copyright (C) 2008, 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class MultiplyEntry : public Entry { | class MultiplyEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
MultiplyEntry() : Entry::Entry() { E.field_type = GD_MULTIPLY_ENTRY; }; | MultiplyEntry() : Entry() { E.field_type = GD_MULTIPLY_ENTRY; }; | |||
MultiplyEntry(const char* field_code, const char* in_field1, | MultiplyEntry(const char* field_code, const char* in_field1, | |||
const char* in_field2, int fragment_index = 0); | const char* in_field2, int fragment_index = 0); | |||
virtual const char *Input(int index = 0) const { | virtual const char *Input(int index = 0) const { | |||
return E.in_fields[(index == 0) ? 0 : 1]; | return E.in_fields[(index == 0) ? 0 : 1]; | |||
}; | }; | |||
int SetInput(const char* field, int index); | int SetInput(const char* field, int index); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
phaseentry.h | phaseentry.h | |||
---|---|---|---|---|
// (C) 2008-2010 D. V. Wiebe | // Copyright (C) 2008-2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class PhaseEntry : public Entry { | class PhaseEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
PhaseEntry() : Entry::Entry() { E.field_type = GD_PHASE_ENTRY; }; | PhaseEntry() : Entry() { E.field_type = GD_PHASE_ENTRY; }; | |||
PhaseEntry(const char* field_code, const char* in_field, gd_shift_t s hift, | PhaseEntry(const char* field_code, const char* in_field, gd_shift_t s hift, | |||
int fragment_index = 0); | int fragment_index = 0); | |||
virtual const char *Input() const { return E.in_fields[0]; }; | virtual const char *Input() const { return E.in_fields[0]; }; | |||
virtual gd_shift_t Shift() const { return E.u.phase.shift; }; | virtual gd_shift_t Shift() const { return E.u.phase.shift; }; | |||
int SetInput(const char* field); | int SetInput(const char* field); | |||
int SetShift(gd_shift_t shift); | int SetShift(gd_shift_t shift); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
polynomentry.h | polynomentry.h | |||
---|---|---|---|---|
// (C) 2009, 2010 D. V. Wiebe | // Copyright (C) 2009, 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class PolynomEntry : public Entry { | class PolynomEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
PolynomEntry() : Entry::Entry() { E.field_type = GD_POLYNOM_ENTRY; }; | PolynomEntry() : Entry() { E.field_type = GD_POLYNOM_ENTRY; }; | |||
PolynomEntry(const char* field_code, int poly_ord, const char* in_fie ld, | PolynomEntry(const char* field_code, int poly_ord, const char* in_fie ld, | |||
double* a, int fragment_index = 0); | double* a, int fragment_index = 0); | |||
PolynomEntry(const char* field_code, int poly_ord, const char* in_fie ld, | PolynomEntry(const char* field_code, int poly_ord, const char* in_fie ld, | |||
std::complex<double>* ca, int fragment_index = 0); | std::complex<double>* ca, int fragment_index = 0); | |||
virtual const char *Input() const { return E.in_fields[0]; }; | virtual const char *Input() const { return E.in_fields[0]; }; | |||
virtual int ComplexScalars() const { return E.comp_scal; } | virtual int ComplexScalars() const { return E.comp_scal; } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
rawentry.h | rawentry.h | |||
---|---|---|---|---|
// (C) 2008-2010 D. V. Wiebe | // Copyright (C) 2008-2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class RawEntry : public Entry { | class RawEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
RawEntry() : Entry::Entry() { E.field_type = GD_RAW_ENTRY; }; | RawEntry() : Entry() { E.field_type = GD_RAW_ENTRY; }; | |||
RawEntry(const char* field_code, DataType data_type, gd_spf_t spf, | RawEntry(const char* field_code, DataType data_type, gd_spf_t spf, | |||
int fragment_index = 0); | int fragment_index = 0); | |||
virtual gd_spf_t SamplesPerFrame() const { return E.u.raw.spf; }; | virtual gd_spf_t SamplesPerFrame() const { return E.u.raw.spf; }; | |||
virtual DataType RawType() const { return (DataType)E.u.raw.data_type ; }; | virtual DataType RawType() const { return (DataType)E.u.raw.data_type ; }; | |||
const char* FileName(); | const char* FileName(); | |||
int SetSamplesPerFrame(gd_spf_t spf, int recode = 0); | int SetSamplesPerFrame(gd_spf_t spf, int recode = 0); | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
recipentry.h | recipentry.h | |||
---|---|---|---|---|
// (C) 2010 D. V. Wiebe | // Copyright (C) 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class RecipEntry : public Entry { | class RecipEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
RecipEntry() : Entry::Entry() { E.field_type = GD_RECIP_ENTRY; }; | RecipEntry() : Entry() { E.field_type = GD_RECIP_ENTRY; }; | |||
RecipEntry(const char* field_code, const char* in_field, | RecipEntry(const char* field_code, const char* in_field, | |||
double dividend, int fragment_index = 0); | double dividend, int fragment_index = 0); | |||
RecipEntry(const char* field_code, const char* in_field, | RecipEntry(const char* field_code, const char* in_field, | |||
std::complex<double> cdividend, int fragment_index = 0); | std::complex<double> cdividend, int fragment_index = 0); | |||
virtual const char *Input() const { return E.in_fields[0]; }; | virtual const char *Input() const { return E.in_fields[0]; }; | |||
virtual const char *Scalar() const { return E.scalar[0]; } | virtual const char *Scalar() const { return E.scalar[0]; } | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
sbitentry.h | sbitentry.h | |||
---|---|---|---|---|
// (C) 2008-2010 D. V. Wiebe | // Copyright (C) 2008-2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class SBitEntry : public Entry { | class SBitEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
SBitEntry() : Entry::Entry() { E.field_type = GD_SBIT_ENTRY; }; | SBitEntry() : Entry() { E.field_type = GD_SBIT_ENTRY; }; | |||
SBitEntry(const char* field_code, const char* in_field, gd_bit_t bitn um, | SBitEntry(const char* field_code, const char* in_field, gd_bit_t bitn um, | |||
gd_bit_t numbits = 1, int fragment_index = 0); | gd_bit_t numbits = 1, int fragment_index = 0); | |||
virtual const char *Input() const { return E.in_fields[0]; }; | virtual const char *Input() const { return E.in_fields[0]; }; | |||
virtual gd_bit_t FirstBit() const { return E.u.bit.bitnum; }; | virtual gd_bit_t FirstBit() const { return E.u.bit.bitnum; }; | |||
virtual gd_bit_t NumBits() const { return E.u.bit.numbits; }; | virtual gd_bit_t NumBits() const { return E.u.bit.numbits; }; | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||
stringentry.h | stringentry.h | |||
---|---|---|---|---|
// (C) 2008, 2010 D. V. Wiebe | // Copyright (C) 2008, 2010 D. V. Wiebe | |||
// | // | |||
/////////////////////////////////////////////////////////////////////////// | /////////////////////////////////////////////////////////////////////////// | |||
// | // | |||
// This file is part of the GetData project. | // This file is part of the GetData project. | |||
// | // | |||
// GetData is free software; you can redistribute it and/or modify it under | // GetData is free software; you can redistribute it and/or modify it under | |||
// the terms of the GNU Lesser General Public License as published by the | // the terms of the GNU Lesser General Public License as published by the | |||
// Free Software Foundation; either version 2.1 of the License, or (at your | // Free Software Foundation; either version 2.1 of the License, or (at your | |||
// option) any later version. | // option) any later version. | |||
// | // | |||
skipping to change at line 35 | skipping to change at line 35 | |||
#include <getdata/entry.h> | #include <getdata/entry.h> | |||
namespace GetData { | namespace GetData { | |||
class Dirfile; | class Dirfile; | |||
class StringEntry : public Entry { | class StringEntry : public Entry { | |||
friend class Dirfile; | friend class Dirfile; | |||
public: | public: | |||
StringEntry() : Entry::Entry() { E.field_type = GD_STRING_ENTRY; }; | StringEntry() : Entry() { E.field_type = GD_STRING_ENTRY; }; | |||
StringEntry(const char* field_code, int fragment_index = 0); | StringEntry(const char* field_code, int fragment_index = 0); | |||
private: | private: | |||
StringEntry(const GetData::Dirfile *dirfile, const char* field_code) : | StringEntry(const GetData::Dirfile *dirfile, const char* field_code) : | |||
Entry(dirfile, field_code) { }; | Entry(dirfile, field_code) { }; | |||
}; | }; | |||
} | } | |||
#endif | #endif | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||