core
/
eccodes
mirror of https://github.com/ecmwf/eccodes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ECC-353: grib_util_spec() does not always generate jpeg

This commit is contained in:
Shahram Najm 2016-10-05 18:32:21 +01:00
parent 652f7514a5
commit abfaabbe1f
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/grib_util.c
View File

@ -1286,12 +1286,28 @@ grib_handle* grib_util_set_spec2(grib_handle* h,
} }
if (packing_spec->editionNumber && packing_spec->editionNumber!=editionNumber) { if (packing_spec->editionNumber && packing_spec->editionNumber!=editionNumber) {
int i = 0;
*err = grib_set_long(outh,"edition", packing_spec->editionNumber); *err = grib_set_long(outh,"edition", packing_spec->editionNumber);
if (*err != GRIB_SUCCESS) { if (*err != GRIB_SUCCESS) {
fprintf(stderr,"GRIB_UTIL_SET_SPEC: Failed to change edition to %ld: %s\n", fprintf(stderr,"GRIB_UTIL_SET_SPEC: Failed to change edition to %ld: %s\n",
packing_spec->editionNumber, grib_get_error_message(*err)); packing_spec->editionNumber, grib_get_error_message(*err));
goto cleanup; goto cleanup;
} }
/* ECC-353 */
/* Check values previously set to see any need re-setting as we have just changed edition. */
/* e.g. JPEG packing is only available in GRIB edition 2 */
for(i = 0; i < count; ++i) {
if ( strcmp(values[i].name, "packingType")==0 ) {
if (strcmp(values[i].string_value, "grid_jpeg")==0) {
*err = grib_set_string(outh, values[i].name, values[i].string_value, &slen);
if (*err != GRIB_SUCCESS) {
fprintf(stderr,"GRIB_UTIL_SET_SPEC: Failed to change packingType to %s: %s\n",
values[i].string_value, grib_get_error_message(*err));
goto cleanup;
}
}
}
}
} }
if (packing_spec->deleteLocalDefinition) { if (packing_spec->deleteLocalDefinition) {