projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
types.cc
diff --git
a/src/lib/types.cc
b/src/lib/types.cc
index d052b2a9a71dd3c458bc9126785a15af263e8e6c..ba062c3f8f0834194cc951fa8a506aa22bce3f1e 100644
(file)
--- a/
src/lib/types.cc
+++ b/
src/lib/types.cc
@@
-1,32
+1,33
@@
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic 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.
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,
+
DCP-o-matic
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
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 DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
+#include "types.h"
+#include "dcpomatic_assert.h"
+#include "raw_convert.h"
#include <libxml++/libxml++.h>
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include <libcxml/cxml.h>
-#include <dcp/raw_convert.h>
-#include "types.h"
using std::max;
using std::min;
using std::string;
using boost::shared_ptr;
using std::max;
using std::min;
using std::string;
using boost::shared_ptr;
-using dcp::raw_convert;
bool operator== (Crop const & a, Crop const & b)
{
bool operator== (Crop const & a, Crop const & b)
{
@@
-51,7
+52,7
@@
resolution_to_string (Resolution r)
return "4K";
}
return "4K";
}
-
assert
(false);
+
DCPOMATIC_ASSERT
(false);
return "";
}
return "";
}
@@
-67,7
+68,7
@@
string_to_resolution (string s)
return RESOLUTION_4K;
}
return RESOLUTION_4K;
}
-
assert
(false);
+
DCPOMATIC_ASSERT
(false);
return RESOLUTION_2K;
}
return RESOLUTION_2K;
}