Fix message enum for Windows

applications/vision/src/main.cpp

@@ -196,7 +196,7 @@ static void run(ftl::Configurable *root) {
 	auto h = creator->onFrameSet([sender,outstream,&stats_count,&latency,&frames,&stats_time,pipeline,&busy,&encodable](const ftl::data::FrameSetPtr &fs) {
 		if (busy) {
 			LOG(WARNING) << "Depth pipeline drop: " << fs->timestamp();
-			fs->firstFrame().message(ftl::data::Message::WARNING_PIPELINE_DROP, "Depth pipeline drop");
+			fs->firstFrame().message(ftl::data::Message::Warning_PIPELINE_DROP, "Depth pipeline drop");
 			return true;
 		}
 		busy = true;

components/operators/src/colours.cpp

@@ -16,7 +16,7 @@ ColourChannels::~ColourChannels() {
 
 bool ColourChannels::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaStream_t stream) {
 	if (!in.hasChannel(Channel::Colour)) {
-		in.message(ftl::data::Message::WARNING_MISSING_CHANNEL, "No colour channel found");
+		in.message(ftl::data::Message::Warning_MISSING_CHANNEL, "No colour channel found");
 		return false;
 	}
 
@@ -30,7 +30,7 @@ bool ColourChannels::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaStre
 		cv::cuda::swap(col, temp_);
 		cv::cuda::cvtColor(temp_,col, cv::COLOR_BGR2BGRA, 0, cvstream);*/
 
-		in.message(ftl::data::Message::ERROR_BAD_FORMAT, "Bad colour format");
+		in.message(ftl::data::Message::Error_BAD_FORMAT, "Bad colour format");
 		throw FTL_Error("Left colour must be 4 channels");
 	}
 
@@ -45,7 +45,7 @@ bool ColourChannels::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaStre
 			cv::cuda::swap(col, temp_);
 			cv::cuda::cvtColor(temp_,col, cv::COLOR_BGR2BGRA, 0, cvstream);*/
 
-			in.message(ftl::data::Message::ERROR_BAD_FORMAT, "Bad colour format");
+			in.message(ftl::data::Message::Error_BAD_FORMAT, "Bad colour format");
 			throw FTL_Error("Right colour must be 4 channels");
 		}
 	}

components/operators/src/mask.cpp

@@ -26,7 +26,7 @@ bool DiscontinuityMask::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaS
 	float areaMax = config()->value("area_max", 26.0f);  // Cross support radius squared + 1
 
 	if (!in.hasChannel(Channel::Depth) || !in.hasChannel(Channel::Support1)) {
-		out.message(ftl::data::Message::WARNING_MISSING_CHANNEL, "Missing Depth or Support Channel in Mask Operator");
+		out.message(ftl::data::Message::Warning_MISSING_CHANNEL, "Missing Depth or Support Channel in Mask Operator");
 		return false;
 	}
 

components/operators/src/normals.cpp

@@ -18,7 +18,7 @@ Normals::~Normals() {
 
 bool Normals::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaStream_t stream) {
 	if (!in.hasChannel(Channel::Depth)) {
-		out.message(ftl::data::Message::WARNING_MISSING_CHANNEL, "Missing Depth Channel in Normals operator");
+		out.message(ftl::data::Message::Warning_MISSING_CHANNEL, "Missing Depth Channel in Normals operator");
 		throw FTL_Error("Missing depth channel in Normals operator");
 	}
 
@@ -48,7 +48,7 @@ NormalDot::~NormalDot() {
 
 bool NormalDot::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaStream_t stream) {
 	if (!in.hasChannel(Channel::Depth)) {
-		out.message(ftl::data::Message::WARNING_MISSING_CHANNEL, "Missing Depth Channel in Normals operator");
+		out.message(ftl::data::Message::Warning_MISSING_CHANNEL, "Missing Depth Channel in Normals operator");
 		throw FTL_Error("Missing depth channel in Normals operator");
 	}
 
@@ -82,7 +82,7 @@ bool SmoothNormals::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaStrea
     int radius = max(0, min(config()->value("radius",1), 5));
 
 	if (!in.hasChannel(Channel::Depth)) {
-		out.message(ftl::data::Message::WARNING_MISSING_CHANNEL, "Missing Depth Channel in Normals operator");
+		out.message(ftl::data::Message::Warning_MISSING_CHANNEL, "Missing Depth Channel in Normals operator");
 		throw FTL_Error("Missing depth channel in SmoothNormals operator");
 	}
 

components/operators/src/operator.cpp

@@ -73,7 +73,7 @@ bool Graph::apply(FrameSet &in, FrameSet &out, cudaStream_t stream) {
 			}
 
 			for (size_t j=0; j<in.frames.size(); ++j) {
-				if (!in.hasFrame(j)) in.frames[j].message(ftl::data::Message::WARNING_INCOMPLETE_FRAME, "Frame not complete in Pipeline");
+				if (!in.hasFrame(j)) in.frames[j].message(ftl::data::Message::Warning_INCOMPLETE_FRAME, "Frame not complete in Pipeline");
 				
 				int iix = (i.instances[0]->isMemoryHeavy()) ? 0 : j&0x1;
 				auto *instance = i.instances[iix];
@@ -83,7 +83,7 @@ bool Graph::apply(FrameSet &in, FrameSet &out, cudaStream_t stream) {
 						instance->apply(in.frames[j].cast<ftl::rgbd::Frame>(), out.frames[j].cast<ftl::rgbd::Frame>(), stream_actual);
 					} catch (const std::exception &e) {
 						LOG(ERROR) << "Operator exception for '" << instance->config()->getID() << "': " << e.what();
-						in.frames[j].message(ftl::data::Message::ERROR_OPERATOR_EXCEPTION, "Operator exception");
+						in.frames[j].message(ftl::data::Message::Error_OPERATOR_EXCEPTION, "Operator exception");
 						success = false;
 						break;
 					}
@@ -98,7 +98,7 @@ bool Graph::apply(FrameSet &in, FrameSet &out, cudaStream_t stream) {
 					instance->apply(in, out, stream_actual);
 				} catch (const std::exception &e) {
 					LOG(ERROR) << "Operator exception for '" << instance->config()->getID() << "': " << e.what();
-					if (in.frames.size() > 0) in.frames[0].message(ftl::data::Message::ERROR_OPERATOR_EXCEPTION, "Operator exception");
+					if (in.frames.size() > 0) in.frames[0].message(ftl::data::Message::Error_OPERATOR_EXCEPTION, "Operator exception");
 					success = false;
 					break;
 				}
@@ -149,7 +149,7 @@ bool Graph::apply(Frame &in, Frame &out, cudaStream_t stream) {
 			} catch (const std::exception &e) {
 				LOG(ERROR) << "Operator exception for '" << instance->config()->getID() << "': " << e.what();
 				success = false;
-				out.message(ftl::data::Message::ERROR_OPERATOR_EXCEPTION, "Operator exception");
+				out.message(ftl::data::Message::Error_OPERATOR_EXCEPTION, "Operator exception");
 				break;
 			}
 		}

components/operators/src/segmentation.cpp

@@ -17,13 +17,13 @@ bool CrossSupport::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaStream
 	bool use_mask = config()->value("discon_support", false);
 
 	if (!in.hasChannel(Channel::Colour)) {
-		out.message(ftl::data::Message::WARNING_MISSING_CHANNEL, "Missing Colour channel in Support operator");
+		out.message(ftl::data::Message::Warning_MISSING_CHANNEL, "Missing Colour channel in Support operator");
 		return false;
 	}
 
 	if (use_mask && !in.hasChannel(Channel::Support2)) {
 		if (!in.hasChannel(Channel::Mask)) {
-			out.message(ftl::data::Message::WARNING_MISSING_CHANNEL, "Missing Mask channel in Support operator");
+			out.message(ftl::data::Message::Warning_MISSING_CHANNEL, "Missing Mask channel in Support operator");
 			return false;
 		}
 		ftl::cuda::support_region(

components/operators/src/weighting.cpp

@@ -34,11 +34,11 @@ bool PixelWeights::apply(ftl::rgbd::Frame &in, ftl::rgbd::Frame &out, cudaStream
 	bool output_normals = config()->value("output_normals", params.normals);
 
 	if (!in.hasChannel(Channel::Depth) && !in.hasChannel(Channel::GroundTruth)) {
-		out.message(ftl::data::Message::WARNING_MISSING_CHANNEL, "Missing Depth channel in Weights operators");
+		out.message(ftl::data::Message::Warning_MISSING_CHANNEL, "Missing Depth channel in Weights operators");
 		return false;
 	}
 	if (!in.hasChannel(Channel::Support1)) {
-		out.message(ftl::data::Message::WARNING_MISSING_CHANNEL, "Missing Support channel in Weights operators");
+		out.message(ftl::data::Message::Warning_MISSING_CHANNEL, "Missing Support channel in Weights operators");
 		return false;
 	}
 

components/streams/src/builder.cpp

@@ -139,7 +139,7 @@ void IntervalSourceBuilder::start() {
 		for (auto *s : srcs_) {
 			if (!s->retrieve(fs->firstFrame())) {
 				LOG(WARNING) << "Frame is being skipped: " << ts;
-				fs->firstFrame().message(ftl::data::Message::WARNING_FRAME_DROP, "Frame is being skipped");
+				fs->firstFrame().message(ftl::data::Message::Warning_FRAME_DROP, "Frame is being skipped");
 			}
 		}
 
@@ -180,7 +180,7 @@ void ManualSourceBuilder::tick() {
 
 	if (!src_->retrieve(fs->firstFrame())) {
 		LOG(WARNING) << "Frame was skipping";
-		fs->firstFrame().message(ftl::data::Message::WARNING_FRAME_DROP, "Frame is being skipped");
+		fs->firstFrame().message(ftl::data::Message::Warning_FRAME_DROP, "Frame is being skipped");
 	}
 
 	cb_.trigger(fs);

components/structures/include/ftl/data/messages.hpp

@@ -6,16 +6,17 @@
 namespace ftl {
 namespace data {
 
+// Note: On Windows ERROR_* sometimes matches a macro and fails, hence use of Error not ERROR
 enum class Message : int {
-	ERROR_UNKNOWN = 0,
-	ERROR_OPERATOR_EXCEPTION,
-	ERROR_FRAME_GRAB,
-	ERROR_BAD_FORMAT,
-	WARNING_UNKNOWN = 1024,
-	WARNING_FRAME_DROP,
-	WARNING_PIPELINE_DROP,
-	WARNING_MISSING_CHANNEL,
-	WARNING_INCOMPLETE_FRAME,
+	Error_UNKNOWN = 0,
+	Error_OPERATOR_EXCEPTION,
+	Error_FRAME_GRAB,
+	Error_BAD_FORMAT,
+	Warning_UNKNOWN = 1024,
+	Warning_FRAME_DROP,
+	Warning_PIPELINE_DROP,
+	Warning_MISSING_CHANNEL,
+	Warning_INCOMPLETE_FRAME,
 	INFORMATION_UNKNOWN = 2046,
 	OTHER_UNKNOWN = 3072
 };