entry.h | entry.h | |||
---|---|---|---|---|
skipping to change at line 104 | skipping to change at line 104 | |||
int Rename(const char* new_name, int move_data = 0); | int Rename(const char* new_name, int move_data = 0); | |||
/* Specific data */ | /* Specific data */ | |||
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)) ? | |||
E.in_fields[index] : NULL; | E.in_fields[index] : NULL; | |||
}; | }; | |||
virtual int ComplexScalars() const { | virtual int ComplexScalars() const { | |||
return (E.field_type == GD_LINCOM_ENTRY || | return (E.field_type == GD_LINCOM_ENTRY || | |||
E.field_type == GD_POLYNOM_ENTRY) ? E.comp_scal : 0; | E.field_type == GD_POLYNOM_ENTRY || | |||
E.field_type == GD_RECIP_ENTRY) ? E.comp_scal : 0; | ||||
} | } | |||
virtual const char *Scalar(int index = 0) const; | virtual const char *Scalar(int index = 0) const; | |||
virtual int ScalarIndex(int index = 0) const; | virtual int ScalarIndex(int index = 0) const; | |||
/* RAW methods */ | /* RAW methods */ | |||
virtual unsigned int SamplesPerFrame() const { | virtual unsigned int SamplesPerFrame() const { | |||
return (E.field_type == GD_RAW_ENTRY) ? E.u.raw.spf : 0; | return (E.field_type == GD_RAW_ENTRY) ? E.u.raw.spf : 0; | |||
}; | }; | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added | |||
getdata.h | getdata.h | |||
---|---|---|---|---|
/* src/getdata.h. Generated from getdata.ah by configure. */ | /* src/getdata.h. Generated from getdata.ah by configure. */ | |||
/* Copyright (C) 2002-2005 C. Barth Netterfield | /* Copyright (C) 2002-2005 C. Barth Netterfield | |||
* Copyright (C) 2003-2005 Theodore Kisner | * Copyright (C) 2003-2005 Theodore Kisner | |||
* Copyright (C) 2005-2013 D. V. Wiebe | * Copyright (C) 2005-2014 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 920 | skipping to change at line 920 | |||
extern char *gd_strtok(DIRFILE *D, const char *string) gd_nothrow | extern char *gd_strtok(DIRFILE *D, const char *string) gd_nothrow | |||
gd_nonnull ((1)); | gd_nonnull ((1)); | |||
extern int gd_unhide(DIRFILE *dirfile, const char *field_code) gd_nothrow | extern int gd_unhide(DIRFILE *dirfile, const char *field_code) gd_nothrow | |||
gd_nonnull ((1,2)); | gd_nonnull ((1,2)); | |||
extern int gd_validate(DIRFILE *dirfile, const char *field_code) gd_nothrow | extern int gd_validate(DIRFILE *dirfile, const char *field_code) gd_nothrow | |||
gd_nonnull((1,2)); | gd_nonnull((1,2)); | |||
extern int gd_verbose_prefix(DIRFILE *D, const char *prefix) gd_nothrow | extern int gd_verbose_prefix(DIRFILE *D, const char *prefix) gd_nothrow | |||
gd_nonnull ((1,2)); | gd_nonnull ((1)); | |||
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, | |||
gd_type_t data_type, unsigned int spf, | gd_type_t data_type, unsigned int spf, | |||
End of changes. 2 change blocks. | ||||
2 lines changed or deleted | 2 lines changed or added | |||