diff --git a/libisoburn/trunk/libisoburn/isofs_wrap.c b/libisoburn/trunk/libisoburn/isofs_wrap.c index 9d43ab67..8d531ef2 100644 --- a/libisoburn/trunk/libisoburn/isofs_wrap.c +++ b/libisoburn/trunk/libisoburn/isofs_wrap.c @@ -108,7 +108,7 @@ int isoburn_read_image(struct burn_drive *d, { int ret, int_num; IsoReadOpts *ropts= NULL; - struct iso_read_image_features *features= NULL; + IsoReadImageFeatures *features= NULL; uint32_t ms_block; enum burn_disc_status status= BURN_DISC_BLANK; @@ -206,12 +206,22 @@ int isoburn_read_image(struct burn_drive *d, *image = o->image; iso_image_ref(*image); /*protects object from premature free*/ } + + read_opts->hasRR = iso_read_image_features_has_rockridge(features); + read_opts->hasJoliet = iso_read_image_features_has_joliet(features); + read_opts->hasIso1999 = iso_read_image_features_has_iso1999(features); + read_opts->hasElTorito = iso_read_image_features_has_eltorito(features); + read_opts->size = iso_read_image_features_get_size(features); + +#ifdef NIX read_opts->hasRR = features->hasRR; read_opts->hasJoliet = features->hasJoliet; read_opts->hasIso1999 = features->hasIso1999; read_opts->hasElTorito = features->hasElTorito; read_opts->size = features->size; - free(features); +#endif + + iso_read_image_features_destroy(features); return 1; } diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index dac96e69..1b57a822 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2008.02.03.131525" +#define Xorriso_timestamP "2008.02.03.155704"