1 files changed, 9 insertions, 9 deletions

diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 86741ba6..6b5e9393 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -108,12 +108,12 @@ PictureAsset::descriptor_equals (
 //		a.QuantizationDefault != b.QuantizationDefault
 		) {
 
-		note (DCP_ERROR, "video MXF picture descriptors differ");
+		note (NoteType::ERROR, "video MXF picture descriptors differ");
 		return false;
 	}
 
 	if (a.ContainerDuration != b.ContainerDuration) {
-		note (DCP_ERROR, "video container durations differ");
+		note (NoteType::ERROR, "video container durations differ");
 	}
 
 //		for (unsigned int j = 0; j < ASDCP::JP2K::MaxComponents; ++j) {
@@ -132,7 +132,7 @@ PictureAsset::frame_buffer_equals (
 	) const
 {
 	if (size_A == size_B && memcmp (data_A, data_B, size_A) == 0) {
-		note (DCP_NOTE, "J2K identical");
+		note (NoteType::NOTE, "J2K identical");
 		/* Easy result; the J2K data is identical */
 		return true;
 	}
@@ -150,7 +150,7 @@ PictureAsset::frame_buffer_equals (
 	for (int c = 0; c < 3; ++c) {
 
 		if (image_A->size() != image_B->size()) {
-			note (DCP_ERROR, String::compose ("image sizes for frame %1 differ", frame));
+			note (NoteType::ERROR, String::compose ("image sizes for frame %1 differ", frame));
 			return false;
 		}
 
@@ -176,11 +176,11 @@ PictureAsset::frame_buffer_equals (
 
 	double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size());
 
-	note (DCP_NOTE, String::compose ("mean difference %1 deviation %2", mean, std_dev));
+	note (NoteType::NOTE, String::compose("mean difference %1 deviation %2", mean, std_dev));
 
 	if (mean > opt.max_mean_pixel_error) {
 		note (
-			DCP_ERROR,
+			NoteType::ERROR,
 			String::compose ("mean %1 out of range %2 in frame %3", mean, opt.max_mean_pixel_error, frame)
 			);
 
@@ -189,7 +189,7 @@ PictureAsset::frame_buffer_equals (
 
 	if (std_dev > opt.max_std_dev_pixel_error) {
 		note (
-			DCP_ERROR,
+			NoteType::ERROR,
 			String::compose ("standard deviation %1 out of range %2 in frame %3", std_dev, opt.max_std_dev_pixel_error, frame)
 			);
 
@@ -203,9 +203,9 @@ string
 PictureAsset::static_pkl_type (Standard standard)
 {
 	switch (standard) {
-	case INTEROP:
+	case Standard::INTEROP:
 		return "application/x-smpte-mxf;asdcpKind=Picture";
-	case SMPTE:
+	case Standard::SMPTE:
 		return "application/mxf";
 	default:
 		DCP_ASSERT (false);