new log and fileio features

[asdcplib.git] / src / j2c-test.cpp

diff --git a/src/j2c-test.cpp b/src/j2c-test.cpp
index 98c7cf46cdf56055543660f4d9202510f0382c7a..09452f173f45478b43ff7fcd1963ec0bc59c960c 100755 (executable)
--- a/src/j2c-test.cpp
+++ b/src/j2c-test.cpp
@@ -1,7 +1,40 @@
+/*
+Copyright (c) 2005-2009, John Hurst
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/*! \file    jp2k-test.cpp
+    \version $Id$
+    \brief   JP2K parser test
+*/
 
 #include <AS_DCP.h>
-#include <FileIO.h>
+#include <KM_fileio.h>
+#include <KM_util.h>
 #include <JP2K.h>
+
+using namespace Kumu;
 using namespace ASDCP;
 using namespace ASDCP::JP2K;
 
@@ -26,7 +59,7 @@ main(int argc, const char** argv)
 
       if ( result != RESULT_FAIL )
         {
-          fputs(GetResultString(result), stderr);
+          fputs(result.Label(), stderr);
           fputc('\n', stderr);
         }