mirror of
https://anongit.gentoo.org/git/repo/gentoo.git
synced 2025-06-08 06:09:43 +02:00
aa9db8863d
Closes: https://bugs.gentoo.org/837800 Closes: https://bugs.gentoo.org/854051 Signed-off-by: Sam James <sam@gentoo.org>
35 lines
1.4 KiB
Diff
35 lines
1.4 KiB
Diff
https://github.com/festvox/speech_tools/commit/4b677d6f3bc560248da369a86d5f2ec17c116da5
|
|
(Just the strict aliasing hunk.)
|
|
|
|
From 4b677d6f3bc560248da369a86d5f2ec17c116da5 Mon Sep 17 00:00:00 2001
|
|
From: Sergio Oller <sergioller@gmail.com>
|
|
Date: Sat, 29 Aug 2020 19:14:47 +0200
|
|
Subject: [PATCH] Compile with gcc-9 without warnings (-Wall)
|
|
|
|
--- a/speech_class/esps_utils.cc
|
|
+++ b/speech_class/esps_utils.cc
|
|
@@ -1050,7 +1050,7 @@ enum EST_read_status read_esps_hdr(esps_hdr *uhdr,FILE *fd)
|
|
hdr->field_name[0] = wstrdup("samples");
|
|
fseek(fd,hdr->hdr_size,SEEK_SET);
|
|
/* In this cases its just in the header as a float */
|
|
- sd_sample_rate = *((float *)(void *)&fhdr.fil4[0]);
|
|
+ memcpy(&sd_sample_rate, &fhdr.fil4[0], sizeof(float));
|
|
add_fea_d(hdr,"record_freq",0,(double)sd_sample_rate);
|
|
*uhdr = hdr;
|
|
return format_ok;
|
|
@@ -1215,11 +1215,13 @@ enum EST_write_status write_esps_hdr(esps_hdr hdr,FILE *fd)
|
|
fhdr.thirteen = 13; /* must be for luck */
|
|
fhdr.sdr_size = 0;
|
|
fhdr.magic = ESPS_MAGIC;
|
|
- strncpy(fhdr.date,ctime(&tx),26);
|
|
+ strncpy(fhdr.date,ctime(&tx),25);
|
|
+ fhdr.date[25] = 0;
|
|
sprintf(fhdr.version,"1.91"); /* that's what all the others have */
|
|
sprintf(fhdr.prog,"EDST");
|
|
sprintf(fhdr.vers,"0.1");
|
|
- strncpy(fhdr.progcompdate,ctime(&tx),26);
|
|
+ strncpy(fhdr.progcompdate,ctime(&tx),25);
|
|
+ fhdr.progcompdate[25] = 0;
|
|
fhdr.num_samples = hdr->num_records;
|
|
fhdr.filler = 0;
|
|
/* in each record */
|