Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix bug with g2c_aecpackf()/g2c_aecpackd() and add test #512

Merged
merged 4 commits into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/aecpack.c
Original file line number Diff line number Diff line change
Expand Up @@ -225,16 +225,16 @@ aecpack_int(void *fld, int fld_is_double, g2int width, g2int height, g2int *idrs
ctemplen = ndpts * nbytes;
sbits(ctemp, ifld, 0, nbytes * 8, 0, ndpts);

ret = enc_aec(ctemp, ctemplen, nbits, ccsds_flags, ccsds_block_size, ccsds_rsi, cpack, lcpack);
if (ret < 0)
*lcpack = enc_aec(ctemp, ctemplen, nbits, ccsds_flags, ccsds_block_size, ccsds_rsi, cpack, lcpack);
if (*lcpack < 0)
{
if (verbose)
printf("aecpack: ERROR Packing AEC = %d\n", ret);
nbits = 0;
*lcpack = 0;
ret = G2C_EAEC;
}

*lcpack = ret;
free(ctemp);
}
else
Expand Down
33 changes: 31 additions & 2 deletions tests/tst_aec.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ main()
for (i = 0; i < DATA_LEN; i++)
{
//printf("%g %g\n",fld[i], fld_in[i]);
if (fld[i] != fld_in[i])
if (abs(fld[i] - fld_in[i]) >= EPSILON)
return G2C_ERROR;
}
}
Expand Down Expand Up @@ -120,11 +120,40 @@ main()
for (i = 0; i < DATA_LEN; i++)
{
/* printf("%g %g\n", fld[i], fld_in[i]); */
if (fld[i] != fld_in[i])
if (abs(fld[i] - fld_in[i]) >= EPSILON)
return G2C_ERROR;
}
}
printf("ok!\n");
printf("Testing g2c_aecpackd()/g2c_aecunpackd() calls with data...");
{
size_t height = 2, width = 2;
size_t ndpts = DATA_LEN, len = PACKED_LEN;
double fld[DATA_LEN] = {1.0, 2.0, 3.0, 4.0};
double fld_in[DATA_LEN];
unsigned char cpack[PACKED_LEN];
size_t lcpack;
g2int idrstmpl[8] = {0, 1, 1, 0, 0, 0, 16, 128};
int i, ret;

idrstmpl[5] = CCSDS_FLAGS;

/* Pack the data. */
g2c_aecpackd(fld, width, height, (int *)idrstmpl, cpack, &lcpack);

/* Unpack the data. */
ret = g2c_aecunpackd(cpack, len, (int *)idrstmpl, ndpts, fld_in);
if (ret < 0)
return G2C_ERROR;

for (i = 0; i < DATA_LEN; i++)
{
/* printf("%g %g\n", fld[i], fld_in[i]); */
if (abs(fld[i] - fld_in[i]) >= EPSILON)
return G2C_ERROR;
}
}
printf("ok!\n");
printf("SUCCESS!\n");
return 0;
}
Loading