Merge branch 'cinecert:master' into master

.gitlab-ci.yml

@@ -43,7 +43,7 @@ Ubuntu_20.04:
   script:
     - echo "Building"
     - autoreconf -if
-    - "./configure --enable-as-02 --enable-dev-headers --with-xerces=/opt/cinecert --prefix=/opt/cinecert CPPFLAGS=-I/opt/cinecert/include LDFLAGS=-L/opt/cinecert/lib"
+    - "./configure --enable-as-02 --enable-dev-headers --with-xerces --prefix=/opt/cinecert CPPFLAGS=-I/opt/cinecert/include LDFLAGS=-L/opt/cinecert/lib"
     - make
     - sudo make install
     - sudo ldconfig

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.13.0], [[email protected]])
+AC_INIT([asdcplib], [2.13.1], [[email protected]])
 
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_SRCDIR([src/KM_error.h])

m4/ax_lib_expat.m4

@@ -1,4 +1,6 @@
-##### http://autoconf-archive.cryp.to/ax_lib_expat.html
+# ===========================================================================
+#       https://www.gnu.org/software/autoconf-archive/ax_lib_expat.html
+# ===========================================================================
 #
 # SYNOPSIS
 #
@@ -26,29 +28,29 @@
 #   This macro calls:
 #
 #     AC_SUBST(EXPAT_CFLAGS)
+#     AC_SUBST(EXPAT_LIBS)
 #     AC_SUBST(EXPAT_LDFLAGS)
 #     AC_SUBST(EXPAT_VERSION)  -- only if version requirement is used
 #
 #   And sets:
 #
 #     HAVE_EXPAT
 #
-# LAST MODIFICATION
+# LICENSE
 #
-#   2007-12-05
+#   Copyright (c) 2008 Mateusz Loskot <[email protected]>
 #
-# COPYLEFT
-#
-#   Copyright (c) 2007 Mateusz Loskot <[email protected]>
-#
-#   Copying and distribution of this file, with or without
-#   modification, are permitted in any medium without royalty provided
-#   the copyright notice and this notice are preserved.
+#   Copying and distribution of this file, with or without modification, are
+#   permitted in any medium without royalty provided the copyright notice
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 11
 
 AC_DEFUN([AX_LIB_EXPAT],
 [
     AC_ARG_WITH([expat],
-        AC_HELP_STRING([--with-expat=@<:@ARG@:>@],
+        AS_HELP_STRING([--with-expat=@<:@ARG@:>@],
             [use Expat XML Parser from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)]
         ),
         [
@@ -70,37 +72,34 @@ AC_DEFUN([AX_LIB_EXPAT],
         fi
         ],
         [
-#        dnl Default behavior is implicit yes
-#        if test -f /usr/local/include/expat.h ; then
-#            expat_prefix=/usr/local
-#        elif test -f /usr/include/expat.h ; then
-#            expat_prefix=/usr
-#        else
-#            expat_prefix=""
-#        fi
-        dnl Default behavior is implicit no
-        expat_prefix=""
-        expat_requested="no"
+        dnl Default behavior is implicit yes
+        if test -f /usr/local/include/expat.h ; then
+            expat_prefix=/usr/local
+        elif test -f /usr/include/expat.h ; then
+            expat_prefix=/usr
+        else
+            expat_prefix=""
+        fi
         ]
     )
 
     AC_ARG_WITH([expat-inc],
-        AC_HELP_STRING([--with-expat-inc=@<:@DIR@:>@],
+        AS_HELP_STRING([--with-expat-inc=@<:@DIR@:>@],
             [path to Expat XML Parser headers]
         ),
         [expat_include_dir="$withval"],
         [expat_include_dir=""]
     )
     AC_ARG_WITH([expat-lib],
-        AC_HELP_STRING([--with-expat-lib=@<:@ARG@:>@],
+        AS_HELP_STRING([--with-expat-lib=@<:@ARG@:>@],
             [link options for Expat XML Parser libraries]
         ),
         [expat_lib_flags="$withval"],
         [expat_lib_flags=""]
     )
 
     EXPAT_CFLAGS=""
-    EXPAT_LDFLAGS=""
+    EXPAT_LIBS=""
     EXPAT_VERSION=""
 
     dnl
@@ -110,7 +109,8 @@ AC_DEFUN([AX_LIB_EXPAT],
 
     if test -n "$expat_prefix"; then
         expat_include_dir="$expat_prefix/include"
-        expat_lib_flags="-L$expat_prefix/lib64 -L$expat_prefix/lib -lexpat"
+        expat_ld_flags="-L$expat_prefix/lib"
+        expat_lib_flags="-lexpat"
         run_expat_test="yes"
     elif test "$expat_requested" = "yes"; then
         if test -n "$expat_include_dir" -a -n "$expat_lib_flags"; then
@@ -128,8 +128,11 @@ AC_DEFUN([AX_LIB_EXPAT],
         saved_CPPFLAGS="$CPPFLAGS"
         CPPFLAGS="$CPPFLAGS -I$expat_include_dir"
 
+        saved_LIBS="$LIBS"
+        LIBS="$LIBS $expat_lib_flags"
+
         saved_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS $expat_lib_flags"
+        LDFLAGS="$LDFLAGS $expat_ld_flags"
 
         dnl
         dnl Check Expat headers
@@ -176,7 +179,8 @@ p = NULL;
                     ]]
                 )],
                 [
-                EXPAT_LDFLAGS="$expat_lib_flags"
+                EXPAT_LIBS="$expat_lib_flags"
+                EXPAT_LDFLAGS="$expat_ld_flags"
                 expat_lib_found="yes"
                 AC_MSG_RESULT([found])
                 ],
@@ -190,6 +194,7 @@ p = NULL;
 
         CPPFLAGS="$saved_CPPFLAGS"
         LDFLAGS="$saved_LDFLAGS"
+        LIBS="$saved_LIBS"
     fi
 
     AC_MSG_CHECKING([for Expat XML Parser])
@@ -199,6 +204,7 @@ p = NULL;
 
             AC_SUBST([EXPAT_CFLAGS])
             AC_SUBST([EXPAT_LDFLAGS])
+            AC_SUBST([EXPAT_LIBS])
 
             HAVE_EXPAT="yes"
         else
@@ -274,8 +280,4 @@ p = NULL;
             AC_MSG_WARN([Expat XML Parser support requested but headers or library not found. Specify valid prefix of Expat using --with-expat=@<:@DIR@:>@ or provide include directory and linker flags using --with-expat-inc and --with-expat-lib])
         fi
     fi
-    if test "$HAVE_EXPAT" = "yes"; then
-        CPPFLAGS="$CPPFLAGS $EXPAT_CFLAGS -DHAVE_EXPAT=1"
-        LDFLAGS="$LDFLAGS $EXPAT_LDFLAGS"
-    fi
 ])

m4/ax_lib_xerces.m4

@@ -1,5 +1,5 @@
 # ===========================================================================
-#             http://autoconf-archive.cryp.to/ax_lib_xerces.html
+#      https://www.gnu.org/software/autoconf-archive/ax_lib_xerces.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -34,24 +34,23 @@
 #
 #     HAVE_XERCES
 #
-# LAST MODIFICATION
-#
-#   2008-04-12
-#
-# COPYLEFT
+# LICENSE
 #
 #   Copyright (c) 2008 Mateusz Loskot <[email protected]>
 #
 #   Copying and distribution of this file, with or without modification, are
 #   permitted in any medium without royalty provided the copyright notice
-#   and this notice are preserved.
+#   and this notice are preserved. This file is offered as-is, without any
+#   warranty.
+
+#serial 11
 
 AC_DEFUN([AX_LIB_XERCES],
 [
-#    AC_REQUIRE([ACX_PTHREAD])
+    AC_REQUIRE([AX_PTHREAD])
 
     AC_ARG_WITH([xerces],
-        AC_HELP_STRING([--with-xerces=@<:@ARG@:>@],
+        AS_HELP_STRING([--with-xerces=@<:@ARG@:>@],
             [use Xerces C++ Parser from given prefix (ARG=path); check standard prefixes (ARG=yes); disable (ARG=no)]
         ),
         [
@@ -73,29 +72,26 @@ AC_DEFUN([AX_LIB_XERCES],
         fi
         ],
         [
-#        dnl Default behavior is implicit yes
-#        if test -d /usr/local/include/xercesc ; then
-#            xerces_prefix=/usr/local
-#        elif test -d /usr/include/xercesc ; then
-#            xerces_prefix=/usr
-#        else
-#            xerces_prefix=""
-#        fi
-        dnl Default behavior is implicit no
-        xerces_prefix=""
-        xerces_requested="no"
+        dnl Default behavior is implicit yes
+        if test -d /usr/local/include/xercesc ; then
+            xerces_prefix=/usr/local
+        elif test -d /usr/include/xercesc ; then
+            xerces_prefix=/usr
+        else
+            xerces_prefix=""
+        fi
         ]
     )
 
     AC_ARG_WITH([xerces-inc],
-        AC_HELP_STRING([--with-xerces-inc=@<:@DIR@:>@],
+        AS_HELP_STRING([--with-xerces-inc=@<:@DIR@:>@],
             [path to Xerces C++ Parser headers]
         ),
         [xerces_include_dir="$withval"],
         [xerces_include_dir=""]
     )
     AC_ARG_WITH([xerces-lib],
-        AC_HELP_STRING([--with-xerces-lib=@<:@ARG@:>@],
+        AS_HELP_STRING([--with-xerces-lib=@<:@ARG@:>@],
             [link options for Xerces C++ Parser libraries]
         ),
         [xerces_ldflags="$withval"],
@@ -136,7 +132,7 @@ AC_DEFUN([AX_LIB_XERCES],
         CPPFLAGS="$CPPFLAGS -I$xerces_include_dir -I$xerces_include_dir2"
 
         saved_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$xerces_ldflags $PTHREAD_LDFLAGS $LDFLAGS"
+        LDFLAGS="$LDFLAGS $xerces_ldflags $PTHREAD_LDFLAGS"
 
         saved_LIBS="$LIBS"
         LIBS="$xerces_libs $PTHREAD_LIBS $LIBS"
@@ -290,8 +286,4 @@ XMLPlatformUtils::Initialize();
             AC_MSG_WARN([Xerces C++ Parser support requested but headers or library not found. Specify valid prefix of Xerces C++ using --with-xerces=@<:@DIR@:>@ or provide include directory and linker flags using --with-xerces-inc and --with-xerces-lib])
         fi
     fi
-    if test "$HAVE_XERCES" = "yes"; then
-        CPPFLAGS="$CPPFLAGS $XERCES_CPPFLAGS -DHAVE_XERCES_C=1"
-        LDFLAGS="$LDFLAGS $XERCES_LDFLAGS $XERCES_LIBS"
-    fi
 ])

src/AS_DCP_AES.cpp

@@ -219,7 +219,7 @@ ASDCP::AESDecContext::DecryptBlock(const byte_t* ct_buf, byte_t* pt_buf, ui32_t
   if ( m_Context.empty() )
     return  RESULT_INIT;
 
-  register h__AESContext* Ctx = m_Context;
+  h__AESContext* Ctx = m_Context;
 
   const byte_t* in_p = ct_buf;
   byte_t* out_p = pt_buf;

src/KM_fileio.cpp

@@ -745,7 +745,7 @@ Kumu::Result_t
 Kumu::FileWriter::Writev(const byte_t* buf, ui32_t buf_len)
 {
   assert( ! m_IOVec.empty() );
-  register h__iovec* iov = m_IOVec;
+  h__iovec* iov = m_IOVec;
   KM_TEST_NULL_L(buf);
 
   if ( iov->m_Count >= IOVecMaxEntries )
@@ -1009,7 +1009,7 @@ Kumu::Result_t
 Kumu::FileWriter::Writev(ui32_t* bytes_written)
 {
   assert( ! m_IOVec.empty() );
-  register h__iovec* iov = m_IOVec;
+  h__iovec* iov = m_IOVec;
   ui32_t tmp_int;
 
   if ( bytes_written == 0 )
@@ -1023,7 +1023,7 @@ Kumu::FileWriter::Writev(ui32_t* bytes_written)
   Result_t result = Kumu::RESULT_OK;
 
   // AFAIK, there is no writev() equivalent in the win32 API
-  for ( register int i = 0; i < iov->m_Count; i++ )
+  for ( int i = 0; i < iov->m_Count; i++ )
     {
       ui32_t tmp_count = 0;
       BOOL wr_result = ::WriteFile(m_Handle,
@@ -1193,7 +1193,7 @@ Kumu::Result_t
 Kumu::FileWriter::Writev(ui32_t* bytes_written)
 {
   assert( ! m_IOVec.empty() );
-  register h__iovec* iov = m_IOVec;
+  h__iovec* iov = m_IOVec;
   ui32_t tmp_int;
 
   if ( bytes_written == 0 )

src/KM_util.cpp

@@ -358,8 +358,8 @@ Kumu::base64encode(const byte_t* buf, ui32_t buf_len, char* strbuf, ui32_t strbu
 i32_t
 Kumu::base64decode(const char* str, byte_t* buf, ui32_t buf_len, ui32_t* char_count)
 {
-  register byte_t c = 0, d = 0;
-  register ui32_t phase = 0, i = 0;
+  byte_t c = 0, d = 0;
+  ui32_t phase = 0, i = 0;
 
   if ( str == 0 || buf == 0 || char_count == 0 )
     return -1;

src/MPEG.cpp

@@ -151,13 +151,13 @@ ASDCP::MPEG2::VESParser::Parse(const byte_t* buf, ui32_t buf_len)
   ASDCP_TEST_NULL(m_Delegate);
 
   Result_t result = RESULT_OK;
-  register const byte_t* end_p = buf + buf_len;
-  register const byte_t* run_pos = buf; // track runs of uninteresting data using a position and count
-  register ui32_t  run_len = 0;
+  const byte_t* end_p = buf + buf_len;
+  const byte_t* run_pos = buf; // track runs of uninteresting data using a position and count
+  ui32_t  run_len = 0;
 
   // search for MPEG2 headers
   // copy interesting data to a buffer and pass to delegate for processing
-  for ( register const byte_t* p = buf; p < end_p; p++ )
+  for ( const byte_t* p = buf; p < end_p; p++ )
     {
       if ( m_State->Test_IN_HEADER() )
 	{