zhangyiss/wavelib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix warning C4200: nonstandard extension used : zero-sized array in struct/union

Browse Source
This commit is contained in:
Holger Nahrstaedt 2016-02-18 15:24:00 +01:00
parent 66dc615ac8
commit 487de13131
3 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
header/wavelib.h
View File

@ -24,7 +24,7 @@ struct wave_set{
double *hpd; double *hpd;
double *lpr; double *lpr;
double *hpr; double *hpr;
double params[0]; double *params;
}; };
typedef struct fft_t { typedef struct fft_t {
@ -88,7 +88,7 @@ struct wt_set{
int zpad; int zpad;
int length[102]; int length[102];
double *output; double *output;
double params[0]; double *params;
}; };
typedef struct wtree_set* wtree_object; typedef struct wtree_set* wtree_object;
@ -115,7 +115,7 @@ struct wtree_set{
double *output; double *output;
int *nodelength; int *nodelength;
int *coeflength; int *coeflength;
double params[0]; double *params;
}; };
typedef struct wpt_set* wpt_object; typedef struct wpt_set* wpt_object;
@ -144,7 +144,7 @@ struct wpt_set{
int *nodeindex; int *nodeindex;
int *numnodeslevel; int *numnodeslevel;
int *coeflength; int *coeflength;
double params[0]; double *params;
}; };

25
src/wavelib.c
View File

@ -15,7 +15,8 @@ wave_object wave_init(char* wname) {
//strcopy(obj->wname, wname); //strcopy(obj->wname, wname);
} }
obj = (wave_object)malloc(sizeof(struct wave_set) + sizeof(double)* 4 * retval); obj = (wave_object)malloc(sizeof(struct wave_set));
obj->params = (double*)malloc(sizeof(double) * 4 * retval);
obj->filtlength = retval; obj->filtlength = retval;
obj->lpd_len = obj->hpd_len = obj->lpr_len = obj->hpr_len = obj->filtlength; obj->lpd_len = obj->hpd_len = obj->lpr_len = obj->hpr_len = obj->filtlength;
@ -49,12 +50,14 @@ wt_object wt_init(wave_object wave,char* method, int siglength,int J) {
} }
if (method == NULL) { if (method == NULL) {
obj = (wt_object)malloc(sizeof(struct wt_set) + sizeof(double)* (siglength + 2 * J * (size+1))); obj = (wt_object)malloc(sizeof(struct wt_set));
obj->params = (double*)malloc(sizeof(double)* (siglength + 2 * J * (size + 1)));
obj->outlength = siglength + 2 * J * (size + 1); // Default obj->outlength = siglength + 2 * J * (size + 1); // Default
strcpy(obj->ext, "sym"); // Default strcpy(obj->ext, "sym"); // Default
} }
else if (!strcmp(method, "dwt") || !strcmp(method, "DWT")) { else if (!strcmp(method, "dwt") || !strcmp(method, "DWT")) {
obj = (wt_object)malloc(sizeof(struct wt_set) + sizeof(double)* (siglength + 2 * J * (size + 1))); obj = (wt_object)malloc(sizeof(struct wt_set));
obj->params = (double*)malloc(sizeof(double)* (siglength + 2 * J * (size + 1)));
obj->outlength = siglength + 2 * J * (size + 1); // Default obj->outlength = siglength + 2 * J * (size + 1); // Default
strcpy(obj->ext, "sym"); // Default strcpy(obj->ext, "sym"); // Default
} }
@ -64,7 +67,8 @@ wt_object wt_init(wave_object wave,char* method, int siglength,int J) {
exit(-1); exit(-1);
} }
obj = (wt_object)malloc(sizeof(struct wt_set) + sizeof(double)* (siglength * (J + 1))); obj = (wt_object)malloc(sizeof(struct wt_set));
obj->params = (double*)malloc(sizeof(double)* (siglength * (J + 1)));
obj->outlength = siglength * (J + 1); // Default obj->outlength = siglength * (J + 1); // Default
strcpy(obj->ext, "per"); // Default strcpy(obj->ext, "per"); // Default
} }
@ -79,7 +83,8 @@ wt_object wt_init(wave_object wave,char* method, int siglength,int J) {
} }
} }
obj = (wt_object)malloc(sizeof(struct wt_set) + sizeof(double)* (siglength * (J + 1))); obj = (wt_object)malloc(sizeof(struct wt_set));
obj->params = (double*)malloc(sizeof(double)* (siglength * (J + 1)));
obj->outlength = siglength * (J + 1); // Default obj->outlength = siglength * (J + 1); // Default
strcpy(obj->ext, "per"); // Default strcpy(obj->ext, "per"); // Default
} }
@ -145,7 +150,8 @@ wtree_object wtree_init(wave_object wave, int siglength,int J) {
elength += temp2; elength += temp2;
} }
obj = (wtree_object)malloc(sizeof(struct wtree_set) + sizeof(double)* (siglength * (J + 1) + elength + nodes + J + 1)); obj = (wtree_object)malloc(sizeof(struct wtree_set));
obj->params = (double*)malloc(sizeof(double)* (siglength * (J + 1) + elength + nodes + J + 1));
obj->outlength = siglength * (J + 1) + elength; obj->outlength = siglength * (J + 1) + elength;
strcpy(obj->ext, "sym"); strcpy(obj->ext, "sym");
@ -218,7 +224,8 @@ wpt_object wpt_init(wave_object wave, int siglength, int J) {
} }
//printf("elength %d", elength); //printf("elength %d", elength);
obj = (wpt_object)malloc(sizeof(struct wpt_set) + sizeof(double)* (elength + 4 * nodes + 2 * J + 6)); obj = (wpt_object)malloc(sizeof(struct wpt_set));
obj->params = (double*)malloc(sizeof(double)* (elength + 4 * nodes + 2 * J + 6));
obj->outlength = siglength + 2 * (J + 1) * (size + 1); obj->outlength = siglength + 2 * (J + 1) * (size + 1);
strcpy(obj->ext, "sym"); strcpy(obj->ext, "sym");
strcpy(obj->entropy, "shannon"); strcpy(obj->entropy, "shannon");
@ -2530,17 +2537,21 @@ void wpt_summary(wpt_object wt) {
} }
void wave_free(wave_object object) { void wave_free(wave_object object) {
free(object->params);
free(object); free(object);
} }
void wt_free(wt_object object) { void wt_free(wt_object object) {
free(object->params);
free(object); free(object);
} }
void wtree_free(wtree_object object) { void wtree_free(wtree_object object) {
free(object->params);
free(object); free(object);
} }
void wpt_free(wpt_object object) { void wpt_free(wpt_object object) {
free(object->params);
free(object); free(object);
} }

8
src/wavelib.h
View File

@ -22,7 +22,7 @@ struct wave_set{
double *hpd; double *hpd;
double *lpr; double *lpr;
double *hpr; double *hpr;
double params[0]; double *params;
}; };
typedef struct wt_set* wt_object; typedef struct wt_set* wt_object;
@ -47,7 +47,7 @@ struct wt_set{
int zpad; int zpad;
int length[102]; int length[102];
double *output; double *output;
double params[0]; double *params;
}; };
typedef struct wtree_set* wtree_object; typedef struct wtree_set* wtree_object;
@ -74,7 +74,7 @@ struct wtree_set{
double *output; double *output;
int *nodelength; int *nodelength;
int *coeflength; int *coeflength;
double params[0]; double *params;
}; };
typedef struct wpt_set* wpt_object; typedef struct wpt_set* wpt_object;
@ -103,7 +103,7 @@ struct wpt_set{
int *nodeindex; int *nodeindex;
int *numnodeslevel; int *numnodeslevel;
int *coeflength; int *coeflength;
double params[0]; double *params;
}; };