Try to fix build with OpenJPEG 1.x.

[libdcp.git] / tools / dcpdiff.cc

diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index 473efa45f68ff84efe920b89d5f359aa1a7b4a2f..1818f2b60637d8e5e5270d568063fb0c0b388e9f 100644 (file)
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    libdcp is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
+    along with libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 #include "dcp.h"
@@ -48,6 +62,7 @@ help (string n)
             << "  -v, --verbose                be verbose\n"
             << "      --cpl-annotation-texts   allow differing CPL annotation texts\n"
             << "      --reel-annotation-texts  allow differing reel annotation texts\n"
+            << "  -a, --annotation-texts       allow different CPL and reel annotation texts\n"
             << "  -m, --mean-pixel             maximum allowed mean pixel error (default 5)\n"
             << "  -s, --std-dev-pixel          maximum allowed standard deviation of pixel error (default 5)\n"
             << "      --key                    hexadecimal key to use to decrypt MXFs\n"
@@ -64,6 +79,7 @@ note (NoteType t, string n)
 {
        if (t == DCP_ERROR || verbose) {
                cout << " " << n << "\n";
+               cout.flush ();
        }
 }
 
@@ -119,6 +135,7 @@ main (int argc, char* argv[])
                        { "mean-pixel", required_argument, 0, 'm'},
                        { "std-dev-pixel", required_argument, 0, 's'},
                        { "keep-going", no_argument, 0, 'k'},
+                       { "annotation-texts", no_argument, 0, 'a'},
                        /* From here we're using random capital letters for the short option */
                        { "ignore-missing-assets", no_argument, 0, 'A'},
                        { "cpl-annotation-texts", no_argument, 0, 'C'},
@@ -127,7 +144,7 @@ main (int argc, char* argv[])
                        { 0, 0, 0, 0 }
                };
 
-               int c = getopt_long (argc, argv, "Vhvm:s:kACD:E", long_options, &option_index);
+               int c = getopt_long (argc, argv, "Vhvm:s:kaACD:E", long_options, &option_index);
 
                if (c == -1) {
                        break;
@@ -152,6 +169,9 @@ main (int argc, char* argv[])
                case 'k':
                        options.keep_going = true;
                        break;
+               case 'a':
+                       options.cpl_annotation_texts_can_differ = options.reel_annotation_texts_can_differ = true;
+                       break;
                case 'A':
                        ignore_missing_assets = true;
                        break;