|
Jerry James |
67bfd53 |
--- ./include/sphinxbase/pio.h.orig 2012-12-05 07:06:01.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./include/sphinxbase/pio.h 2013-03-28 16:40:55.415749785 -0600
|
|
Jerry James |
67bfd53 |
@@ -285,7 +285,7 @@ int32 stat_retry (const char *file, stru
|
|
Jerry James |
67bfd53 |
*/
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
SPHINXBASE_EXPORT
|
|
Jerry James |
67bfd53 |
-int32 stat_mtime (const char *file);
|
|
Jerry James |
67bfd53 |
+time_t stat_mtime (const char *file);
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/**
|
|
Jerry James |
67bfd53 |
* Create a directory and all of its parent directories, as needed.
|
|
Jerry James |
85877be |
--- ./include/sphinxbase/prim_type.h.orig 2012-12-05 07:06:01.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./include/sphinxbase/prim_type.h 2013-03-28 16:40:55.415749785 -0600
|
|
Jerry James |
85877be |
@@ -132,6 +132,29 @@ typedef unsigned long long uint64;
|
|
Jerry James |
85877be |
typedef double int64;
|
|
Jerry James |
85877be |
typedef double uint64;
|
|
Jerry James |
85877be |
#endif /* !HAVE_LONG_LONG && SIZEOF_LONG_LONG == 8 */
|
|
Jerry James |
85877be |
+#ifdef HAVE_FSEEKO
|
|
Jerry James |
85877be |
+# define OFF_T off_t
|
|
Jerry James |
85877be |
+# define FSEEK(stream, offset, whence) fseeko (stream, offset, whence)
|
|
Jerry James |
85877be |
+# define FTELL(stream) ftello (stream)
|
|
Jerry James |
85877be |
+# if SIZEOF_OFF_T == SIZEOF_INT
|
|
Jerry James |
85877be |
+# define PRIdOFF_T "d"
|
|
Jerry James |
85877be |
+# define PRIxOFF_T "x"
|
|
Jerry James |
85877be |
+# elif SIZEOF_OFF_T == SIZEOF_LONG
|
|
Jerry James |
85877be |
+# define PRIdOFF_T "ld"
|
|
Jerry James |
85877be |
+# define PRIxOFF_T "lx"
|
|
Jerry James |
85877be |
+# elif defined(HAVE_LONG_LONG) && SIZEOF_OFF_T == SIZEOF_LONG_LONG
|
|
Jerry James |
85877be |
+# define PRIdOFF_T "lld"
|
|
Jerry James |
85877be |
+# define PRIxOFF_T "llx"
|
|
Jerry James |
85877be |
+# else
|
|
Jerry James |
85877be |
+# error Cannot determine how to print an off_t
|
|
Jerry James |
85877be |
+# endif
|
|
Jerry James |
85877be |
+#else
|
|
Jerry James |
85877be |
+# define OFF_T long
|
|
Jerry James |
85877be |
+# define FSEEK(stream, offset, whence) fseek (stream, offset, whence)
|
|
Jerry James |
85877be |
+# define FTELL(stream) ftell (stream)
|
|
Jerry James |
85877be |
+# define PRIdOFF_T "ld"
|
|
Jerry James |
85877be |
+# define PRIxOFF_T "lx"
|
|
Jerry James |
85877be |
+#endif
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
#ifndef TRUE
|
|
Jerry James |
85877be |
#define TRUE 1
|
|
Jerry James |
85877be |
--- ./configure.in.orig 2012-12-12 10:28:32.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./configure.in 2013-03-28 16:42:00.780690385 -0600
|
|
Jerry James |
85877be |
@@ -1,7 +1,7 @@
|
|
Jerry James |
85877be |
dnl Welcome to the Sphinx automated build system.
|
|
Jerry James |
85877be |
dnl try not to hurt yourself ;)
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-AC_INIT([sphinxbase], 0.8)
|
|
Jerry James |
85877be |
+AC_INIT([sphinxbase],[0.8])
|
|
Jerry James |
85877be |
AC_CONFIG_HEADERS([include/config.h include/sphinx_config.h])
|
|
Jerry James |
85877be |
AM_INIT_AUTOMAKE([no-define])
|
|
Jerry James |
85877be |
AC_CONFIG_MACRO_DIR([m4])
|
|
Jerry James |
85877be |
@@ -41,12 +41,18 @@ fi
|
|
Jerry James |
85877be |
AC_ARG_VAR(YACC,[Bison command])
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
AC_HEADER_STDC
|
|
Jerry James |
85877be |
+AC_SYS_LARGEFILE
|
|
Jerry James |
85877be |
AC_C_BIGENDIAN
|
|
Jerry James |
85877be |
AC_TYPE_SIGNAL
|
|
Jerry James |
85877be |
+
|
|
Jerry James |
85877be |
+AC_TYPE_OFF_T
|
|
Jerry James |
85877be |
AC_CHECK_TYPES(long long)
|
|
Jerry James |
85877be |
AC_CHECK_SIZEOF(long long)
|
|
Jerry James |
85877be |
AC_CHECK_SIZEOF(long)
|
|
Jerry James |
85877be |
+AC_CHECK_SIZEOF(int)
|
|
Jerry James |
85877be |
+AC_CHECK_SIZEOF(off_t)
|
|
Jerry James |
85877be |
AC_CHECK_FUNCS([popen perror snprintf])
|
|
Jerry James |
85877be |
+AC_FUNC_FSEEKO
|
|
Jerry James |
85877be |
AC_CHECK_HEADER(errno.h)
|
|
Jerry James |
85877be |
AM_ICONV
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
@@ -203,7 +209,7 @@ AC_SUBST(ad_files)
|
|
Jerry James |
85877be |
AC_SUBST(ad_libs)
|
|
Jerry James |
85877be |
AC_SUBST(ad_backend)
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-AM_PROG_LIBTOOL
|
|
Jerry James |
85877be |
+LT_INIT
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
dnl
|
|
Jerry James |
85877be |
dnl Check for Doxygen, and build dox if present
|
|
Jerry James |
85877be |
@@ -246,7 +252,7 @@ else
|
|
Jerry James |
85877be |
PYTHON=bogus
|
|
Jerry James |
85877be |
fi
|
|
Jerry James |
85877be |
if test "x$use_python" != xtrue ; then
|
|
Jerry James |
85877be |
- AC_WARN([Disabling python since development headers were not found])
|
|
Jerry James |
85877be |
+ AC_MSG_WARN(Disabling python since development headers were not found)
|
|
Jerry James |
85877be |
fi
|
|
Jerry James |
85877be |
AM_CONDITIONAL(BUILD_PYTHON, test "x$use_python" = "xtrue")
|
|
Jerry James |
85877be |
AC_SUBST(PYTHON)
|
|
Jerry James |
67bfd53 |
--- ./src/sphinx_fe/sphinx_fe.c.orig 2012-12-05 07:06:03.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/sphinx_fe/sphinx_fe.c 2013-03-28 16:40:55.416749784 -0600
|
|
Jerry James |
67bfd53 |
@@ -166,7 +166,7 @@ open_nist_file(sphinx_wave2feat_t *wtf,
|
|
Jerry James |
67bfd53 |
return FALSE;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
/* Rewind, parse lines. */
|
|
Jerry James |
67bfd53 |
- fseek(fh, 0, SEEK_SET);
|
|
Jerry James |
85877be |
+ FSEEK(fh, 0, SEEK_SET);
|
|
Jerry James |
67bfd53 |
for (li = lineiter_start(fh); li; li = lineiter_next(li)) {
|
|
Jerry James |
67bfd53 |
char **words;
|
|
Jerry James |
67bfd53 |
int nword;
|
|
Jerry James |
67bfd53 |
@@ -194,7 +194,7 @@ open_nist_file(sphinx_wave2feat_t *wtf,
|
|
Jerry James |
67bfd53 |
ckd_free(words);
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
- fseek(fh, 1024, SEEK_SET);
|
|
Jerry James |
85877be |
+ FSEEK(fh, 1024, SEEK_SET);
|
|
Jerry James |
67bfd53 |
if (out_fh)
|
|
Jerry James |
67bfd53 |
*out_fh = fh;
|
|
Jerry James |
67bfd53 |
else
|
|
Jerry James |
67bfd53 |
@@ -283,7 +283,7 @@ detect_sphinx_mfc(sphinx_wave2feat_t *wt
|
|
Jerry James |
67bfd53 |
{
|
|
Jerry James |
67bfd53 |
FILE *fh;
|
|
Jerry James |
67bfd53 |
int32 len;
|
|
Jerry James |
67bfd53 |
- long flen;
|
|
Jerry James |
85877be |
+ OFF_T flen;
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
if ((fh = fopen(wtf->infile, "rb")) == NULL) {
|
|
Jerry James |
67bfd53 |
E_ERROR_SYSTEM("Failed to open %s", wtf->infile);
|
|
Jerry James |
67bfd53 |
@@ -294,8 +294,8 @@ detect_sphinx_mfc(sphinx_wave2feat_t *wt
|
|
Jerry James |
67bfd53 |
fclose(fh);
|
|
Jerry James |
67bfd53 |
return -1;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
- fseek(fh, 0, SEEK_END);
|
|
Jerry James |
67bfd53 |
- flen = ftell(fh);
|
|
Jerry James |
85877be |
+ FSEEK(fh, 0, SEEK_END);
|
|
Jerry James |
85877be |
+ flen = FTELL(fh);
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* figure out whether to byteswap */
|
|
Jerry James |
67bfd53 |
flen = (flen / 4) - 1;
|
|
Jerry James |
67bfd53 |
@@ -304,7 +304,7 @@ detect_sphinx_mfc(sphinx_wave2feat_t *wt
|
|
Jerry James |
67bfd53 |
SWAP_INT32(&len;;
|
|
Jerry James |
67bfd53 |
if (flen != len) {
|
|
Jerry James |
67bfd53 |
SWAP_INT32(&len;;
|
|
Jerry James |
67bfd53 |
- E_ERROR("Mismatch in header/file lengths: 0x%08x vs 0x%08x\n",
|
|
Jerry James |
85877be |
+ E_ERROR("Mismatch in header/file lengths: 0x%08x vs 0x%08" PRIxOFF_T "\n",
|
|
Jerry James |
67bfd53 |
len, flen);
|
|
Jerry James |
67bfd53 |
return -1;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
@@ -314,7 +314,7 @@ detect_sphinx_mfc(sphinx_wave2feat_t *wt
|
|
Jerry James |
67bfd53 |
? "little" : "big"));
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
- fseek(fh, 4, SEEK_SET);
|
|
Jerry James |
85877be |
+ FSEEK(fh, 4, SEEK_SET);
|
|
Jerry James |
67bfd53 |
wtf->infh = fh;
|
|
Jerry James |
67bfd53 |
if (cmd_ln_boolean_r(wtf->config, "-spec2cep")) {
|
|
Jerry James |
67bfd53 |
wtf->in_veclen = cmd_ln_int32_r(wtf->config, "-nfilt");
|
|
Jerry James |
67bfd53 |
@@ -917,7 +917,7 @@ sphinx_wave2feat_convert_file(sphinx_wav
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
if (wtf->ot->output_header) {
|
|
Jerry James |
67bfd53 |
- if (fseek(wtf->outfh, 0, SEEK_SET) < 0) {
|
|
Jerry James |
85877be |
+ if (FSEEK(wtf->outfh, 0, SEEK_SET) < 0) {
|
|
Jerry James |
67bfd53 |
E_ERROR_SYSTEM("Failed to seek to beginning of %s\n", outfile);
|
|
Jerry James |
67bfd53 |
goto error_out;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
@@ -1027,7 +1027,7 @@ run_control_file(sphinx_wave2feat_t *wtf
|
|
Jerry James |
67bfd53 |
part = cmd_ln_int32_r(wtf->config, "-part");
|
|
Jerry James |
67bfd53 |
for (li = lineiter_start(ctlfh); li; li = lineiter_next(li))
|
|
Jerry James |
67bfd53 |
++nlines;
|
|
Jerry James |
67bfd53 |
- fseek(ctlfh, 0, SEEK_SET);
|
|
Jerry James |
85877be |
+ FSEEK(ctlfh, 0, SEEK_SET);
|
|
Jerry James |
67bfd53 |
partlen = nlines / npart;
|
|
Jerry James |
67bfd53 |
nskip = partlen * (part - 1);
|
|
Jerry James |
67bfd53 |
if (part == npart)
|
|
Jerry James |
85877be |
--- ./src/sphinx_fe/Makefile.am.orig 2012-12-05 07:06:03.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/sphinx_fe/Makefile.am 2013-03-28 16:47:20.684165075 -0600
|
|
Jerry James |
85877be |
@@ -9,7 +9,7 @@ sphinx_fe_LDADD = \
|
|
Jerry James |
85877be |
$(top_builddir)/src/libsphinxbase/libsphinxbase.la \
|
|
Jerry James |
85877be |
@SNDFILE_LIBS@
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = -I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = -I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/src/libsphinxbase/fe \
|
|
Jerry James |
85877be |
@SNDFILE_CFLAGS@
|
|
Jerry James |
85877be |
--- ./src/sphinx_lmtools/Makefile.am.orig 2012-12-05 07:06:03.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/sphinx_lmtools/Makefile.am 2013-03-28 16:48:15.132091538 -0600
|
|
Jerry James |
85877be |
@@ -7,6 +7,6 @@ LDADD = \
|
|
Jerry James |
85877be |
$(top_builddir)/src/libsphinxbase/libsphinxbase.la \
|
|
Jerry James |
85877be |
$(top_builddir)/src/libsphinxbase/lm/libsphinxlm.la
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/src/libsphinxlm
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
--- ./src/libsphinxad/Makefile.am.orig 2012-12-05 07:06:04.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxad/Makefile.am 2013-03-28 16:43:08.676624722 -0600
|
|
Jerry James |
85877be |
@@ -28,7 +28,7 @@ libsphinxad_la_LIBADD = \
|
|
Jerry James |
85877be |
@SAMPLERATE_LIBS@ \
|
|
Jerry James |
85877be |
$(top_builddir)/src/libsphinxbase/libsphinxbase.la
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
@SAMPLERATE_CFLAGS@ \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
67bfd53 |
--- ./src/sphinx_adtools/sphinx_pitch.c.orig 2012-12-05 07:06:09.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/sphinx_adtools/sphinx_pitch.c 2013-03-28 16:40:55.416749784 -0600
|
|
Jerry James |
67bfd53 |
@@ -176,7 +176,7 @@ guess_file_type(char const *file, FILE *
|
|
Jerry James |
67bfd53 |
{
|
|
Jerry James |
67bfd53 |
char header[4];
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
- fseek(infh, 0, SEEK_SET);
|
|
Jerry James |
85877be |
+ FSEEK(infh, 0, SEEK_SET);
|
|
Jerry James |
67bfd53 |
if (fread(header, 1, 4, infh) != 4) {
|
|
Jerry James |
67bfd53 |
E_ERROR_SYSTEM("Failed to read 4 byte header");
|
|
Jerry James |
67bfd53 |
return -1;
|
|
Jerry James |
67bfd53 |
@@ -199,7 +199,7 @@ guess_file_type(char const *file, FILE *
|
|
Jerry James |
67bfd53 |
cmd_ln_set_boolean("-nist", FALSE);
|
|
Jerry James |
67bfd53 |
cmd_ln_set_boolean("-raw", TRUE);
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
- fseek(infh, 0, SEEK_SET);
|
|
Jerry James |
85877be |
+ FSEEK(infh, 0, SEEK_SET);
|
|
Jerry James |
67bfd53 |
return 0;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
@@ -282,7 +282,7 @@ read_riff_header(FILE *infh)
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* Any extra parameters. */
|
|
Jerry James |
67bfd53 |
if (header_len > 16)
|
|
Jerry James |
67bfd53 |
- fseek(infh, header_len - 16, SEEK_CUR);
|
|
Jerry James |
85877be |
+ FSEEK(infh, header_len - 16, SEEK_CUR);
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* Now skip to the 'data' chunk. */
|
|
Jerry James |
67bfd53 |
while (1) {
|
|
Jerry James |
67bfd53 |
@@ -297,7 +297,7 @@ read_riff_header(FILE *infh)
|
|
Jerry James |
67bfd53 |
/* Number of bytes of ... whatever */
|
|
Jerry James |
67bfd53 |
TRY_FREAD(&intval, 4, 1, infh);
|
|
Jerry James |
67bfd53 |
if (WORDS_BIGENDIAN) SWAP_INT32(&intval);
|
|
Jerry James |
67bfd53 |
- fseek(infh, intval, SEEK_CUR);
|
|
Jerry James |
85877be |
+ FSEEK(infh, intval, SEEK_CUR);
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
85877be |
--- ./src/sphinx_adtools/Makefile.am.orig 2012-12-05 07:06:09.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/sphinx_adtools/Makefile.am 2013-03-28 16:46:35.516265981 -0600
|
|
Jerry James |
85877be |
@@ -6,4 +6,4 @@ sphinx_cont_fileseg_SOURCES = cont_files
|
|
Jerry James |
85877be |
LDADD = $(top_builddir)/src/libsphinxbase/libsphinxbase.la \
|
|
Jerry James |
85877be |
$(top_builddir)/src/libsphinxad/libsphinxad.la
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
|
|
Jerry James |
85877be |
--- ./src/sphinx_cepview/Makefile.am.orig 2012-12-05 07:06:09.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/sphinx_cepview/Makefile.am 2013-03-28 16:46:59.428207699 -0600
|
|
Jerry James |
85877be |
@@ -5,4 +5,4 @@ sphinx_cepview_SOURCES = main_cepview.c
|
|
Jerry James |
85877be |
sphinx_cepview_LDADD = \
|
|
Jerry James |
85877be |
$(top_builddir)/src/libsphinxbase/libsphinxbase.la
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
|
|
Jerry James |
67bfd53 |
--- ./src/sphinx_cepview/main_cepview.c.orig 2012-12-13 02:01:21.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/sphinx_cepview/main_cepview.c 2013-03-28 16:40:55.417749783 -0600
|
|
Jerry James |
67bfd53 |
@@ -219,14 +219,14 @@ read_cep(char const *file, float ***cep,
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* Check if n_float matches file size */
|
|
Jerry James |
67bfd53 |
byterev = FALSE;
|
|
Jerry James |
67bfd53 |
- if ((int) (n_float * sizeof(float) + 4) != statbuf.st_size) {
|
|
Jerry James |
85877be |
+ if ((OFF_T) (n_float * sizeof(float) + 4) != statbuf.st_size) {
|
|
Jerry James |
67bfd53 |
n = n_float;
|
|
Jerry James |
67bfd53 |
SWAP_INT32(&n);
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
- if ((int) (n * sizeof(float) + 4) != statbuf.st_size) {
|
|
Jerry James |
67bfd53 |
- E_ERROR("Header size field: %d(%08x); filesize: %d(%08x)\n",
|
|
Jerry James |
67bfd53 |
- n_float, n_float, (int) statbuf.st_size,
|
|
Jerry James |
67bfd53 |
- (int) statbuf.st_size);
|
|
Jerry James |
85877be |
+ if ((OFF_T) (n * sizeof(float) + 4) != statbuf.st_size) {
|
|
Jerry James |
85877be |
+ E_ERROR("Header size field: %d(%08x); filesize: %" PRIdOFF_T
|
|
Jerry James |
85877be |
+ "(%08" PRIxOFF_T ")\n", n_float, n_float, statbuf.st_size,
|
|
Jerry James |
67bfd53 |
+ statbuf.st_size);
|
|
Jerry James |
67bfd53 |
fclose(fp);
|
|
Jerry James |
67bfd53 |
return IO_ERR;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
85877be |
--- ./src/sphinx_jsgf2fsg/Makefile.am.orig 2012-12-05 07:06:04.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/sphinx_jsgf2fsg/Makefile.am 2013-03-28 16:47:42.948126918 -0600
|
|
Jerry James |
85877be |
@@ -5,6 +5,6 @@ sphinx_jsgf2fsg_SOURCES = main.c
|
|
Jerry James |
85877be |
sphinx_jsgf2fsg_LDADD = \
|
|
Jerry James |
85877be |
$(top_builddir)/src/libsphinxbase/libsphinxbase.la
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
EXTRA_DIST = fsg2dot.pl
|
|
Jerry James |
67bfd53 |
--- ./src/libsphinxbase/util/bio.c.orig 2012-12-05 07:06:08.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/util/bio.c 2013-03-28 16:40:55.417749783 -0600
|
|
Jerry James |
85877be |
@@ -513,7 +513,8 @@ bio_read_wavfile(char const *directory,
|
|
Jerry James |
67bfd53 |
{
|
|
Jerry James |
67bfd53 |
FILE *uttfp;
|
|
Jerry James |
67bfd53 |
char *inputfile;
|
|
Jerry James |
67bfd53 |
- int32 n, l;
|
|
Jerry James |
85877be |
+ OFF_T n;
|
|
Jerry James |
67bfd53 |
+ int32 l;
|
|
Jerry James |
67bfd53 |
int16 *data;
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
n = strlen(extension);
|
|
Jerry James |
67bfd53 |
@@ -530,11 +531,11 @@ bio_read_wavfile(char const *directory,
|
|
Jerry James |
67bfd53 |
if ((uttfp = fopen(inputfile, "rb")) == NULL) {
|
|
Jerry James |
67bfd53 |
E_FATAL_SYSTEM("Failed to open file '%s' for reading", inputfile);
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
- fseek(uttfp, 0, SEEK_END);
|
|
Jerry James |
67bfd53 |
- n = ftell(uttfp);
|
|
Jerry James |
67bfd53 |
- fseek(uttfp, 0, SEEK_SET);
|
|
Jerry James |
85877be |
+ FSEEK(uttfp, 0, SEEK_END);
|
|
Jerry James |
85877be |
+ n = FTELL(uttfp);
|
|
Jerry James |
85877be |
+ FSEEK(uttfp, 0, SEEK_SET);
|
|
Jerry James |
67bfd53 |
if (header > 0) {
|
|
Jerry James |
67bfd53 |
- if (fseek(uttfp, header, SEEK_SET) < 0) {
|
|
Jerry James |
85877be |
+ if (FSEEK(uttfp, header, SEEK_SET) < 0) {
|
|
Jerry James |
67bfd53 |
E_ERROR_SYSTEM("Failed to move to an offset %d in a file '%s'", header, inputfile);
|
|
Jerry James |
67bfd53 |
fclose(uttfp);
|
|
Jerry James |
67bfd53 |
ckd_free(inputfile);
|
|
Jerry James |
67bfd53 |
@@ -545,7 +546,7 @@ bio_read_wavfile(char const *directory,
|
|
Jerry James |
67bfd53 |
n /= sizeof(int16);
|
|
Jerry James |
67bfd53 |
data = ckd_calloc(n, sizeof(*data));
|
|
Jerry James |
67bfd53 |
if ((l = fread(data, sizeof(int16), n, uttfp)) < n) {
|
|
Jerry James |
67bfd53 |
- E_ERROR_SYSTEM("Failed to read %d samples from %s: %d", n, inputfile, l);
|
|
Jerry James |
85877be |
+ E_ERROR_SYSTEM("Failed to read %" PRIdOFF_T " samples from %s: %d", n, inputfile, l);
|
|
Jerry James |
67bfd53 |
ckd_free(data);
|
|
Jerry James |
67bfd53 |
ckd_free(inputfile);
|
|
Jerry James |
67bfd53 |
fclose(uttfp);
|
|
Jerry James |
67bfd53 |
@@ -553,7 +554,7 @@ bio_read_wavfile(char const *directory,
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
ckd_free(inputfile);
|
|
Jerry James |
67bfd53 |
fclose(uttfp);
|
|
Jerry James |
67bfd53 |
- if (nsamps) *nsamps = n;
|
|
Jerry James |
85877be |
+ if (nsamps) *nsamps = (int32) n;
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
return data;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
--- ./src/libsphinxbase/util/logmath.c.orig 2012-12-05 07:06:08.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/util/logmath.c 2013-03-28 16:40:55.418749782 -0600
|
|
Jerry James |
67bfd53 |
@@ -168,7 +168,7 @@ logmath_read(const char *file_name)
|
|
Jerry James |
67bfd53 |
int32 byteswap, i;
|
|
Jerry James |
67bfd53 |
int chksum_present, do_mmap;
|
|
Jerry James |
67bfd53 |
uint32 chksum;
|
|
Jerry James |
67bfd53 |
- long pos;
|
|
Jerry James |
85877be |
+ OFF_T pos;
|
|
Jerry James |
67bfd53 |
FILE *fp;
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
E_INFO("Reading log table file '%s'\n", file_name);
|
|
Jerry James |
67bfd53 |
@@ -228,9 +228,9 @@ logmath_read(const char *file_name)
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* Check alignment constraints for memory mapping */
|
|
Jerry James |
67bfd53 |
do_mmap = 1;
|
|
Jerry James |
67bfd53 |
- pos = ftell(fp);
|
|
Jerry James |
85877be |
+ pos = FTELL(fp);
|
|
Jerry James |
67bfd53 |
if (pos & ((long)lmath->t.width - 1)) {
|
|
Jerry James |
67bfd53 |
- E_WARN("%s: Data start %ld is not aligned on %d-byte boundary, will not memory map\n",
|
|
Jerry James |
85877be |
+ E_WARN("%s: Data start %" PRIdOFF_T "is not aligned on %d-byte boundary, will not memory map\n",
|
|
Jerry James |
67bfd53 |
file_name, pos, lmath->t.width);
|
|
Jerry James |
67bfd53 |
do_mmap = 0;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
@@ -272,7 +272,7 @@ int32
|
|
Jerry James |
67bfd53 |
logmath_write(logmath_t *lmath, const char *file_name)
|
|
Jerry James |
67bfd53 |
{
|
|
Jerry James |
67bfd53 |
FILE *fp;
|
|
Jerry James |
67bfd53 |
- long pos;
|
|
Jerry James |
85877be |
+ OFF_T pos;
|
|
Jerry James |
67bfd53 |
uint32 chksum;
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
if (lmath->t.table == NULL) {
|
|
Jerry James |
67bfd53 |
@@ -293,7 +293,7 @@ logmath_write(logmath_t *lmath, const ch
|
|
Jerry James |
67bfd53 |
fprintf(fp, "shift %d\n", lmath->t.shift);
|
|
Jerry James |
67bfd53 |
fprintf(fp, "logbase %f\n", lmath->base);
|
|
Jerry James |
67bfd53 |
/* Pad it out to ensure alignment. */
|
|
Jerry James |
67bfd53 |
- pos = ftell(fp) + strlen("endhdr\n");
|
|
Jerry James |
85877be |
+ pos = FTELL(fp) + strlen("endhdr\n");
|
|
Jerry James |
67bfd53 |
if (pos & ((long)lmath->t.width - 1)) {
|
|
Jerry James |
67bfd53 |
size_t align = lmath->t.width - (pos & ((long)lmath->t.width - 1));
|
|
Jerry James |
67bfd53 |
assert(lmath->t.width <= 8);
|
|
Jerry James |
85877be |
--- ./src/libsphinxbase/util/Makefile.am.orig 2012-12-05 07:06:08.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/util/Makefile.am 2013-03-28 16:46:06.364358976 -0600
|
|
Jerry James |
85877be |
@@ -44,7 +44,8 @@ EXTRA_DIST = \
|
|
Jerry James |
85877be |
string_wce.c \
|
|
Jerry James |
85877be |
errno.c
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = -I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
+ -I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include
|
|
Jerry James |
85877be |
|
|
Jerry James |
67bfd53 |
--- ./src/libsphinxbase/util/pio.c.orig 2012-12-05 07:06:08.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/util/pio.c 2013-03-28 16:40:55.418749782 -0600
|
|
Jerry James |
67bfd53 |
@@ -464,7 +464,7 @@ stat_retry(const char *file, struct stat
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
-int32
|
|
Jerry James |
67bfd53 |
+time_t
|
|
Jerry James |
67bfd53 |
stat_mtime(const char *file)
|
|
Jerry James |
67bfd53 |
{
|
|
Jerry James |
67bfd53 |
struct stat statbuf;
|
|
Jerry James |
67bfd53 |
@@ -472,7 +472,7 @@ stat_mtime(const char *file)
|
|
Jerry James |
67bfd53 |
if (stat_retry(file, &statbuf) != 0)
|
|
Jerry James |
67bfd53 |
return -1;
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
- return ((int32) statbuf.st_mtime);
|
|
Jerry James |
67bfd53 |
+ return statbuf.st_mtime;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
#else
|
|
Jerry James |
67bfd53 |
#define STAT_RETRY_COUNT 10
|
|
Jerry James |
67bfd53 |
@@ -490,8 +490,8 @@ stat_retry(const char *file, struct stat
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
if ((fp=(FILE *)fopen(file, "r"))!= 0)
|
|
Jerry James |
67bfd53 |
{
|
|
Jerry James |
67bfd53 |
- fseek( fp, 0, SEEK_END);
|
|
Jerry James |
67bfd53 |
- statbuf->st_size = ftell( fp );
|
|
Jerry James |
85877be |
+ FSEEK( fp, 0, SEEK_END);
|
|
Jerry James |
85877be |
+ statbuf->st_size = FTELL( fp );
|
|
Jerry James |
67bfd53 |
fclose(fp);
|
|
Jerry James |
67bfd53 |
return 0;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
@@ -511,7 +511,7 @@ stat_retry(const char *file, struct stat
|
|
Jerry James |
67bfd53 |
return -1;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
-int32
|
|
Jerry James |
67bfd53 |
+time_t
|
|
Jerry James |
67bfd53 |
stat_mtime(const char *file)
|
|
Jerry James |
67bfd53 |
{
|
|
Jerry James |
67bfd53 |
struct stat statbuf;
|
|
Jerry James |
67bfd53 |
@@ -524,7 +524,7 @@ stat_mtime(const char *file)
|
|
Jerry James |
67bfd53 |
return -1;
|
|
Jerry James |
67bfd53 |
#endif /* HAVE_SYS_STAT_H */
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
- return ((int32) statbuf.st_mtime);
|
|
Jerry James |
67bfd53 |
+ return statbuf.st_mtime;
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
#endif /* !_WIN32_WCE */
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
85877be |
--- ./src/libsphinxbase/util/mmio.c.orig 2012-12-05 07:06:08.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/util/mmio.c 2013-03-28 16:40:55.419749781 -0600
|
|
Jerry James |
85877be |
@@ -222,7 +222,7 @@ mmio_file_read(const char *filename)
|
|
Jerry James |
85877be |
}
|
|
Jerry James |
85877be |
ptr = mmap(NULL, buf.st_size, PROT_READ, MAP_SHARED, fd, 0);
|
|
Jerry James |
85877be |
if (ptr == (void *)-1) {
|
|
Jerry James |
85877be |
- E_ERROR_SYSTEM("Failed to mmap %lld bytes", (unsigned long long)buf.st_size);
|
|
Jerry James |
85877be |
+ E_ERROR_SYSTEM("Failed to mmap %" PRIdOFF_T " bytes", buf.st_size);
|
|
Jerry James |
85877be |
close(fd);
|
|
Jerry James |
85877be |
return NULL;
|
|
Jerry James |
85877be |
}
|
|
Jerry James |
85877be |
@@ -242,7 +242,7 @@ mmio_file_unmap(mmio_file_t *mf)
|
|
Jerry James |
85877be |
if (mf == NULL)
|
|
Jerry James |
85877be |
return;
|
|
Jerry James |
85877be |
if (munmap(mf->ptr, mf->mapsize) < 0) {
|
|
Jerry James |
85877be |
- E_ERROR_SYSTEM("Failed to unmap %ld bytes at %p", mf->mapsize, mf->ptr);
|
|
Jerry James |
85877be |
+ E_ERROR_SYSTEM("Failed to unmap %zd bytes at %p", mf->mapsize, mf->ptr);
|
|
Jerry James |
85877be |
}
|
|
Jerry James |
85877be |
ckd_free(mf);
|
|
Jerry James |
85877be |
}
|
|
Jerry James |
67bfd53 |
--- ./src/libsphinxbase/lm/ngram_model_dmp.c.orig 2012-12-13 02:01:21.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/lm/ngram_model_dmp.c 2013-03-28 16:40:55.419749781 -0600
|
|
Jerry James |
67bfd53 |
@@ -95,7 +95,7 @@ ngram_model_dmp_read(cmd_ln_t *config,
|
|
Jerry James |
67bfd53 |
trigram_t *tgptr;
|
|
Jerry James |
67bfd53 |
char *tmp_word_str;
|
|
Jerry James |
67bfd53 |
char *map_base = NULL;
|
|
Jerry James |
67bfd53 |
- size_t offset = 0;
|
|
Jerry James |
85877be |
+ OFF_T offset = 0;
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
base = NULL;
|
|
Jerry James |
67bfd53 |
do_mmap = FALSE;
|
|
Jerry James |
67bfd53 |
@@ -243,7 +243,7 @@ ngram_model_dmp_read(cmd_ln_t *config,
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* Now mmap() the file and read in the rest of the (read-only) stuff. */
|
|
Jerry James |
67bfd53 |
if (do_mmap) {
|
|
Jerry James |
67bfd53 |
- offset = ftell(fp);
|
|
Jerry James |
85877be |
+ offset = FTELL(fp);
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* Check for improper word alignment. */
|
|
Jerry James |
67bfd53 |
if (offset & 0x3) {
|
|
Jerry James |
67bfd53 |
@@ -320,7 +320,7 @@ ngram_model_dmp_read(cmd_ln_t *config,
|
|
Jerry James |
67bfd53 |
if (n_bigram > 0) {
|
|
Jerry James |
67bfd53 |
/* read n_prob2 and prob2 array (in memory) */
|
|
Jerry James |
67bfd53 |
if (do_mmap)
|
|
Jerry James |
67bfd53 |
- fseek(fp, offset, SEEK_SET);
|
|
Jerry James |
85877be |
+ FSEEK(fp, offset, SEEK_SET);
|
|
Jerry James |
67bfd53 |
if (fread(&k, sizeof(k), 1, fp) != 1)
|
|
Jerry James |
67bfd53 |
goto error_out;
|
|
Jerry James |
67bfd53 |
if (do_swap) SWAP_INT32(&k);
|
|
Jerry James |
67bfd53 |
@@ -381,7 +381,7 @@ ngram_model_dmp_read(cmd_ln_t *config,
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* read tseg_base size and tseg_base */
|
|
Jerry James |
67bfd53 |
if (do_mmap)
|
|
Jerry James |
67bfd53 |
- offset = ftell(fp);
|
|
Jerry James |
85877be |
+ offset = FTELL(fp);
|
|
Jerry James |
67bfd53 |
if (n_trigram > 0) {
|
|
Jerry James |
67bfd53 |
if (do_mmap) {
|
|
Jerry James |
67bfd53 |
memcpy(&k, map_base + offset, sizeof(k));
|
|
Jerry James |
67bfd53 |
@@ -753,7 +753,7 @@ static void
|
|
Jerry James |
67bfd53 |
ngram_model_dmp_write_fmtdesc(FILE * fh)
|
|
Jerry James |
67bfd53 |
{
|
|
Jerry James |
67bfd53 |
int32 i, k;
|
|
Jerry James |
67bfd53 |
- long pos;
|
|
Jerry James |
85877be |
+ OFF_T pos;
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* Write file format description into header */
|
|
Jerry James |
67bfd53 |
for (i = 0; fmtdesc[i] != NULL; i++) {
|
|
Jerry James |
67bfd53 |
@@ -762,7 +762,7 @@ ngram_model_dmp_write_fmtdesc(FILE * fh)
|
|
Jerry James |
67bfd53 |
fwrite(fmtdesc[i], 1, k, fh);
|
|
Jerry James |
67bfd53 |
}
|
|
Jerry James |
67bfd53 |
/* Pad it out in order to achieve 32-bit alignment */
|
|
Jerry James |
67bfd53 |
- pos = ftell(fh);
|
|
Jerry James |
85877be |
+ pos = FTELL(fh);
|
|
Jerry James |
67bfd53 |
k = pos & 3;
|
|
Jerry James |
67bfd53 |
if (k) {
|
|
Jerry James |
67bfd53 |
fwrite_int32(fh, 4-k);
|
|
Jerry James |
85877be |
--- ./src/libsphinxbase/lm/Makefile.am.orig 2012-12-05 07:06:07.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/lm/Makefile.am 2013-03-28 16:45:38.260476346 -0600
|
|
Jerry James |
85877be |
@@ -26,7 +26,8 @@ noinst_HEADERS = ngram_model_internal.h
|
|
Jerry James |
85877be |
jsgf_scanner.h \
|
|
Jerry James |
85877be |
jsgf_parser.h
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = -I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
+ -I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
--- ./src/libsphinxbase/fe/Makefile.am.orig 2012-12-05 07:06:08.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/fe/Makefile.am 2013-03-28 16:44:41.420532959 -0600
|
|
Jerry James |
85877be |
@@ -17,8 +17,9 @@ noinst_HEADERS = \
|
|
Jerry James |
85877be |
fe_warp_inverse_linear.h \
|
|
Jerry James |
85877be |
fe_warp_piecewise_linear.h
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = -I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
- -I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
- -I$(top_builddir)/include
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
+ -I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
+ -I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
+ -I$(top_builddir)/include
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
LIBOBJS = @LIBOBJS@
|
|
Jerry James |
85877be |
--- ./src/libsphinxbase/feat/Makefile.am.orig 2012-12-05 07:06:05.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/feat/Makefile.am 2013-03-28 16:45:07.212507287 -0600
|
|
Jerry James |
85877be |
@@ -7,7 +7,8 @@ libsphinxfeat_la_SOURCES = \
|
|
Jerry James |
85877be |
lda.c \
|
|
Jerry James |
85877be |
feat.c
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = -I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
+ -I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include
|
|
Jerry James |
85877be |
|
|
Jerry James |
67bfd53 |
--- ./src/libsphinxbase/feat/feat.c.orig 2012-12-05 07:06:05.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./src/libsphinxbase/feat/feat.c 2013-03-28 16:40:55.420749780 -0600
|
|
Jerry James |
85877be |
@@ -1041,15 +1041,15 @@ feat_s2mfc_read_norm_pad(feat_t *fcb, ch
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
/* Check if n_float32 matches file size */
|
|
Jerry James |
67bfd53 |
byterev = 0;
|
|
Jerry James |
67bfd53 |
- if ((int32) (n_float32 * sizeof(float32) + 4) != (int32) statbuf.st_size) { /* RAH, typecast both sides to remove compile warning */
|
|
Jerry James |
85877be |
+ if ((OFF_T) (n_float32 * sizeof(float32) + 4) != statbuf.st_size) {
|
|
Jerry James |
67bfd53 |
n = n_float32;
|
|
Jerry James |
67bfd53 |
SWAP_INT32(&n);
|
|
Jerry James |
67bfd53 |
|
|
Jerry James |
67bfd53 |
- if ((int32) (n * sizeof(float32) + 4) != (int32) (statbuf.st_size)) { /* RAH, typecast both sides to remove compile warning */
|
|
Jerry James |
85877be |
+ if ((OFF_T) (n * sizeof(float32) + 4) != statbuf.st_size) {
|
|
Jerry James |
67bfd53 |
E_ERROR
|
|
Jerry James |
67bfd53 |
- ("%s: Header size field: %d(%08x); filesize: %d(%08x)\n",
|
|
Jerry James |
85877be |
- file, n_float32, n_float32, statbuf.st_size,
|
|
Jerry James |
85877be |
- statbuf.st_size);
|
|
Jerry James |
85877be |
+ ("%s: Header size field: %d(%08x); filesize: %" PRIdOFF_T
|
|
Jerry James |
85877be |
+ "(%08" PRIxOFF_T ")\n", file, n_float32, n_float32,
|
|
Jerry James |
85877be |
+ statbuf.st_size, statbuf.st_size);
|
|
Jerry James |
67bfd53 |
fclose(fp);
|
|
Jerry James |
85877be |
return -1;
|
|
Jerry James |
85877be |
}
|
|
Jerry James |
85877be |
@@ -1120,7 +1120,7 @@ feat_s2mfc_read_norm_pad(feat_t *fcb, ch
|
|
Jerry James |
85877be |
/* Position at desired start frame and read actual MFC data */
|
|
Jerry James |
85877be |
mfc = (mfcc_t **)ckd_calloc_2d(n + start_pad + end_pad, cepsize, sizeof(mfcc_t));
|
|
Jerry James |
85877be |
if (sf > 0)
|
|
Jerry James |
85877be |
- fseek(fp, sf * cepsize * sizeof(float32), SEEK_CUR);
|
|
Jerry James |
85877be |
+ FSEEK(fp, sf * cepsize * sizeof(float32), SEEK_CUR);
|
|
Jerry James |
85877be |
n_float32 = n * cepsize;
|
|
Jerry James |
85877be |
#ifdef FIXED_POINT
|
|
Jerry James |
85877be |
float_feat = ckd_calloc(n_float32, sizeof(float32));
|
|
Jerry James |
85877be |
--- ./test/unit/test_fe/Makefile.am.orig 2012-12-05 07:04:49.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_fe/Makefile.am 2013-03-28 16:54:30.067347095 -0600
|
|
Jerry James |
85877be |
@@ -1,7 +1,7 @@
|
|
Jerry James |
85877be |
check_PROGRAMS = test_fe test_pitch
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
TESTS = test_fe test_pitch
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_matrix/Makefile.am.orig 2012-12-05 07:04:50.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_matrix/Makefile.am 2013-03-28 16:55:39.243226827 -0600
|
|
Jerry James |
85877be |
@@ -5,7 +5,7 @@ test_solve_SRCS = test_solve.c
|
|
Jerry James |
85877be |
test_invert_SRCS = test_invert.c
|
|
Jerry James |
85877be |
test_determinant_SRCS = test_determinant.c
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include
|
|
Jerry James |
85877be |
--- ./test/unit/test_ngram/Makefile.am.orig 2012-12-05 07:04:51.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_ngram/Makefile.am 2013-03-28 16:55:51.936211258 -0600
|
|
Jerry James |
85877be |
@@ -12,7 +12,7 @@ check_PROGRAMS = \
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
TESTS = $(check_PROGRAMS)
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_logmath/Makefile.am.orig 2012-12-05 07:04:49.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_logmath/Makefile.am 2013-03-28 16:55:27.579241956 -0600
|
|
Jerry James |
85877be |
@@ -1,7 +1,7 @@
|
|
Jerry James |
85877be |
check_PROGRAMS = test_log_int16 test_log_int8 test_log_shifted
|
|
Jerry James |
85877be |
TESTS = test_log_int16 test_log_int8 test_log_shifted
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include
|
|
Jerry James |
85877be |
--- ./test/unit/test_thread/Makefile.am.orig 2012-12-05 07:04:51.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_thread/Makefile.am 2013-03-28 16:56:12.259187552 -0600
|
|
Jerry James |
85877be |
@@ -6,7 +6,7 @@ check_PROGRAMS = \
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
TESTS = $(check_PROGRAMS)
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_string/Makefile.am.orig 2012-12-05 07:04:51.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_string/Makefile.am 2013-03-28 16:56:02.147199203 -0600
|
|
Jerry James |
85877be |
@@ -1,6 +1,6 @@
|
|
Jerry James |
85877be |
check_PROGRAMS = strtest test_atof
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_alloc/Makefile.am.orig 2012-12-05 07:04:49.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_alloc/Makefile.am 2013-03-28 16:53:39.459433760 -0600
|
|
Jerry James |
85877be |
@@ -3,7 +3,7 @@ check_PROGRAMS = test_ckd_alloc test_ckd
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
TESTS = test_ckd_alloc test_ckd_alloc_catch test_ckd_alloc_fail.sh test_ckd_alloc_abort.sh \
|
|
Jerry James |
85877be |
test_listelem_alloc
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_util/Makefile.am.orig 2012-12-05 07:04:52.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_util/Makefile.am 2013-03-28 16:56:22.763175670 -0600
|
|
Jerry James |
85877be |
@@ -9,7 +9,7 @@ check_PROGRAMS = \
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
TESTS = $(check_PROGRAMS)
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_ad/Makefile.am.orig 2012-12-05 07:04:49.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_ad/Makefile.am 2013-03-28 16:53:25.347448696 -0600
|
|
Jerry James |
85877be |
@@ -1,7 +1,7 @@
|
|
Jerry James |
85877be |
check_PROGRAMS = test_ad_read test_ad_copy
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
TESTS = test_ad_read test_ad_copy
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_lineiter/Makefile.am.orig 2012-12-05 07:04:52.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_lineiter/Makefile.am 2013-03-28 16:55:17.075256551 -0600
|
|
Jerry James |
85877be |
@@ -1,7 +1,7 @@
|
|
Jerry James |
85877be |
check_PROGRAMS = test_lineiter
|
|
Jerry James |
85877be |
TESTS = test_lineiter
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_fsg/Makefile.am.orig 2012-12-05 07:04:52.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_fsg/Makefile.am 2013-03-28 16:54:53.411295002 -0600
|
|
Jerry James |
85877be |
@@ -5,7 +5,7 @@ check_PROGRAMS = \
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
TESTS = $(check_PROGRAMS)
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_feat/Makefile.am.orig 2012-12-05 07:04:52.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_feat/Makefile.am 2013-03-28 16:54:41.331319484 -0600
|
|
Jerry James |
85877be |
@@ -1,7 +1,7 @@
|
|
Jerry James |
85877be |
check_PROGRAMS = test_feat test_feat_live test_feat_fe test_subvq
|
|
Jerry James |
85877be |
noinst_HEADERS = test_macros.h
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_hash/Makefile.am.orig 2012-12-05 07:04:49.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_hash/Makefile.am 2013-03-28 16:55:03.931276701 -0600
|
|
Jerry James |
85877be |
@@ -2,7 +2,7 @@ check_PROGRAMS = displayhash deletehash
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
noinst_HEADERS = test_macros.h
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include
|
|
Jerry James |
85877be |
--- ./test/unit/test_case/Makefile.am.orig 2012-12-05 07:04:52.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_case/Makefile.am 2013-03-28 16:54:06.979405726 -0600
|
|
Jerry James |
85877be |
@@ -1,7 +1,7 @@
|
|
Jerry James |
85877be |
check_PROGRAMS = chgCase
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include
|
|
Jerry James |
85877be |
--- ./test/unit/test_bitvec/Makefile.am.orig 2012-12-05 07:04:52.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_bitvec/Makefile.am 2013-03-28 16:53:54.795418055 -0600
|
|
Jerry James |
85877be |
@@ -1,7 +1,7 @@
|
|
Jerry James |
85877be |
check_PROGRAMS = test_bitvec
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
TESTS = test_bitvec
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include \
|
|
Jerry James |
85877be |
--- ./test/unit/test_cmdln/Makefile.am.orig 2012-12-05 07:04:49.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/unit/test_cmdln/Makefile.am 2013-03-28 16:54:17.795384850 -0600
|
|
Jerry James |
85877be |
@@ -1,6 +1,6 @@
|
|
Jerry James |
85877be |
check_PROGRAMS = cmdln_parse cmdln_parse_multiple cmdln_parse_r
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
-INCLUDES = \
|
|
Jerry James |
85877be |
+AM_CPPFLAGS = \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include/sphinxbase \
|
|
Jerry James |
85877be |
-I$(top_srcdir)/include \
|
|
Jerry James |
85877be |
-I$(top_builddir)/include
|
|
Jerry James |
85877be |
--- ./test/regression/Makefile.am.orig 2012-12-05 07:05:39.000000000 -0700
|
|
Jerry James |
85877be |
+++ ./test/regression/Makefile.am 2013-03-28 16:51:58.403771849 -0600
|
|
Jerry James |
85877be |
@@ -33,9 +33,9 @@ CLEANFILES = test*.err test*.out \
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
# Disable sphinx_fe tests for now if fixed-point due to imprecision
|
|
Jerry James |
85877be |
if FIXED_POINT
|
|
Jerry James |
85877be |
-TESTS = $(srcdir)/test-cepview.sh $(srcdir)/test-sphinx_pitch.sh
|
|
Jerry James |
85877be |
+TESTS = test-cepview.sh test-sphinx_pitch.sh
|
|
Jerry James |
85877be |
else
|
|
Jerry James |
85877be |
-TESTS = $(srcdir)/test-*.sh
|
|
Jerry James |
85877be |
+TESTS = test-*.sh
|
|
Jerry James |
85877be |
endif
|
|
Jerry James |
85877be |
|
|
Jerry James |
85877be |
EXTRA_DIST += $(TESTS)
|