This is an automated email from the git hooks/post-receive script. a_valentino-guest pushed a commit to branch master in repository epr-api.
commit 13e8a8b279c7d47327be840b994811f1dba97899 Author: Antonio Valentino <antonio.valent...@tiscali.it> Date: Sun May 3 06:37:55 2015 +0000 Imported Upstream version 2.3~dev20150503 --- src/epr_band.c | 27 +++++---------------------- src/epr_product.c | 6 ++++++ 2 files changed, 11 insertions(+), 22 deletions(-) diff --git a/src/epr_band.c b/src/epr_band.c index 133b325..e617c6f 100644 --- a/src/epr_band.c +++ b/src/epr_band.c @@ -182,8 +182,7 @@ EPR_SPtrArray* epr_create_band_ids(EPR_SProductId* product_id) { epr_assign_string(&band_id->description, b_tables[bt_index].descriptors[i].description); /* lines_flipped*/ - if (strncmp(product_id->id_string, EPR_ENVISAT_PRODUCT_MERIS, 3) == 0 - || strncmp(product_id->id_string, EPR_ENVISAT_PRODUCT_AATSR, 3) == 0) { + if (strncmp(product_id->id_string, EPR_ENVISAT_PRODUCT_MERIS, 3) == 0) { band_id->lines_mirrored = TRUE; } else { if (strncmp(product_id->id_string, EPR_ENVISAT_PRODUCT_ASAR, 3) == 0 @@ -894,15 +893,15 @@ int epr_read_band_annotation_data(EPR_SBandId* band_id, field = epr_get_field(sph_record, "LINE_LENGTH"); scan_line_length = epr_get_field_elem_as_uint(field, 0); } else if (strncmp(EPR_ENVISAT_PRODUCT_AATSR, product_id->id_string, 3) == 0) { - scan_offset_y = 0.0F; /*!! EPR-7: was 0.5F !!*/ + scan_offset_y = -0.5F; scan_line_length = EPR_ATS_LINE_LENGTH; lines_per_tie_pt = EPR_AATSR_LINES_PER_TIE_PT; num_elems = field_info->num_elems; if (num_elems == EPR_ATS_NUM_PER_POINT_ACROSS_LOCAT) { - scan_offset_x = -19.0F; + scan_offset_x = -19.5F; samples_per_tie_pt = 25; } else if (num_elems == EPR_ATS_NUM_PER_POINT_ACROSS_SOLAR) { - scan_offset_x = 6.0F; + scan_offset_x = 5.5F; samples_per_tie_pt = 50; } else { epr_free_record(record); @@ -1032,24 +1031,8 @@ int epr_read_band_annotation_data(EPR_SBandId* band_id, raster_pos += delta_raster_pos; } - if (strncmp(EPR_ENVISAT_PRODUCT_MERIS, product_id->id_string, 3) == 0) { + if (band_id->lines_mirrored) { mirror_float_array((float*)raster->buffer, raster->raster_width, raster->raster_height); - } else { - if (strncmp(EPR_ENVISAT_PRODUCT_AATSR, product_id->id_string, 3) == 0) { - mirror_float_array((float*)raster->buffer, raster->raster_width, raster->raster_height); - } else { - if (strncmp(EPR_ENVISAT_PRODUCT_ASAR, product_id->id_string, 3) == 0 - && strncmp(product_id->id_string, "ASA_IMG", 7) != 0 - && strncmp(product_id->id_string, "ASA_APG", 7) != 0) { - mirror_float_array((float*)raster->buffer, raster->raster_width, raster->raster_height); - } else { - if (strncmp(EPR_ENVISAT_PRODUCT_SAR, product_id->id_string, 3) == 0 - && strncmp(product_id->id_string, "SAR_IMG", 7) != 0 - && strncmp(product_id->id_string, "SAR_APG", 7) != 0) { - mirror_float_array((float*)raster->buffer, raster->raster_width, raster->raster_height); - } - } - } } epr_free_record(record_beg); diff --git a/src/epr_product.c b/src/epr_product.c index 38ee205..2cc7449 100644 --- a/src/epr_product.c +++ b/src/epr_product.c @@ -120,6 +120,12 @@ EPR_SProductId* epr_open_product(const char* product_file_path) { return NULL; } + /* Disguise ATSR1/ATSR2 products as AATSR */ + if ((strncmp("AT1", product_id->id_string, 3) == 0) || + (strncmp("AT2", product_id->id_string, 3) == 0) ) { + product_id->id_string[2] = 'S'; + } + /* Product identifier filter*/ if ((strncmp(EPR_ENVISAT_PRODUCT_MERIS, product_id->id_string, 3) != 0) && (strncmp(EPR_ENVISAT_PRODUCT_ASAR, product_id->id_string, 3) != 0) && -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/epr-api.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel