version bump

diff --git a/README b/README
index 9897000cc836c5f20378c5a2ea6128bb8b40317f..71dfe64578aebab31788fafa4b3ffdbfa9bf4618 100755 (executable)
--- a/README
+++ b/README
@@ -139,6 +139,11 @@ command-line utilities all respond to -h.
 
 
 Change History
+2014-10-01 - Bug fixes and enhancements, 2.2.5
+  o Finished AS-02 text wrap/unwrap
+  o Fixed fractional seconds parsing for Timestamp objects
+  o Updated KLVPacket to use 64-bit length; allows huge packets in AS-02 PCM files
+  o cleaned up use of atoi() in the library
 
 2014-07-09 - Additional IMF/AS-02 support, bug fixes and enhancements, 2.1.4
   o Added IMF App 2 edit rates in AS_02 namespace: EditRate_29_97, 

diff --git a/build-aux/config.guess b/build-aux/config.guess
index 137bedf2e28b0e831b7b92b3a433d3fca5854a9b..aa04f04bda9641e1dcbf138f6ba7a72b2bc3d1bd 100755 (executable)
--- a/build-aux/config.guess
+++ b/build-aux/config.guess
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-08-14'
+timestamp='2012-06-17'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -805,9 +805,6 @@ EOF
     i*:CYGWIN*:*)
        echo ${UNAME_MACHINE}-pc-cygwin
        exit ;;
-    *:MINGW64*:*)
-       echo ${UNAME_MACHINE}-pc-mingw64
-       exit ;;
     *:MINGW*:*)
        echo ${UNAME_MACHINE}-pc-mingw32
        exit ;;
@@ -1208,9 +1205,6 @@ EOF
     BePC:Haiku:*:*)    # Haiku running on Intel PC compatible.
        echo i586-pc-haiku
        exit ;;
-    x86_64:Haiku:*:*)
-       echo x86_64-unknown-haiku
-       exit ;;
     SX-4:SUPER-UX:*:*)
        echo sx4-nec-superux${UNAME_RELEASE}
        exit ;;
@@ -1340,6 +1334,9 @@ EOF
        exit ;;
 esac
 
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
 eval $set_cc_for_build
 cat >$dummy.c <<EOF
 #ifdef _SEQUENT_

diff --git a/build-aux/config.sub b/build-aux/config.sub
index bdda9e4a32c1811dfad72224cc32bca0fe3cba74..aa2cf19b81e1b7db93ba04295e7c3998448c86ed 100755 (executable)
--- a/build-aux/config.sub
+++ b/build-aux/config.sub
@@ -4,7 +4,7 @@
 #   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2012-08-18'
+timestamp='2012-06-17'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -123,7 +123,7 @@ esac
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
   nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-  linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
   knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
@@ -791,10 +791,6 @@ case $basic_machine in
        microblaze)
                basic_machine=microblaze-xilinx
                ;;
-       mingw64)
-               basic_machine=x86_64-pc
-               os=-mingw64
-               ;;
        mingw32)
                basic_machine=i386-pc
                os=-mingw32
@@ -1363,8 +1359,8 @@ case $os in
              | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
              | -chorusos* | -chorusrdb* | -cegcc* \
              | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-             | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \
-             | -linux-newlib* | -linux-musl* | -linux-uclibc* \
+             | -mingw32* | -linux-gnu* | -linux-android* \
+             | -linux-newlib* | -linux-uclibc* \
              | -uxpv* | -beos* | -mpeix* | -udk* \
              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \

diff --git a/configure.ac b/configure.ac
index 9c200cb01bcdfb06c0f30a14a5fa5b0b17f41d2c..c47dd0c6a720618f5bd2ab7d0f065410d628674b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@ AC_PREREQ([2.59])
 # For example, if asdcplib version 1.0.0 were modified to accomodate changes
 # in file format, and if no changes were made to AS_DCP.h, the new version would be
 # 1.0.1. If changes were also required in AS_DCP.h, the new version would be 1.1.1.
-AC_INIT([asdcplib], [2.1.4a], [asdcplib@cinecert.com])
+AC_INIT([asdcplib], [2.2.5], [asdcplib@cinecert.com])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/KM_error.h])

diff --git a/src/Makefile.am b/src/Makefile.am
index 4592918db5fb04a4510312b503715f4ed3d664b3..a0dca912945f33c021f9bbbba810d560df56c187 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -71,8 +71,8 @@ include_HEADERS += \
        PCMDataProviders.h \
        SyncCommon.h \
        SyncEncoder.h \
-       UUIDInformation.h \
-       TimedText_Transform.h
+       UUIDInformation.h 
+
 
 endif
 

diff --git a/src/ST2052_TextParser.cpp b/src/ST2052_TextParser.cpp
index 312c9d996e174fc03af102e3fb682ba8fe6e6878..9a8dd2a6203525457005699c188ea75e9f759c80 100644 (file)
--- a/src/ST2052_TextParser.cpp
+++ b/src/ST2052_TextParser.cpp
@@ -38,8 +38,7 @@ using namespace ASDCP;
 
 using Kumu::DefaultLogSink;
 
-// TODO: 
-const char* c_dcst_namespace_name = "http://www.smpte-ra.org/schemas/428-7/2007/DCST";
+const char* c_tt_namespace_name = "http://www.smpte-ra.org/schemas/2052-1/2010/smpte-tt";
 
 //------------------------------------------------------------------------------------------
 
@@ -122,8 +121,8 @@ AS_02::TimedText::ST2052_TextParser::h__TextParser::OpenRead()
 
   if ( ns == 0 )
     {
-      DefaultLogSink(). Warn("Document has no namespace name, assuming %s\n", c_dcst_namespace_name);
-      m_TDesc.NamespaceName = c_dcst_namespace_name;
+      DefaultLogSink(). Warn("Document has no namespace name, assuming %s\n", c_tt_namespace_name);
+      m_TDesc.NamespaceName = c_tt_namespace_name;
     }
   else
     {