Replace simple uses of raw_convert<string> with fmt.fmt

12 files changed, 50 insertions, 38 deletions

diff --git a/src/asset.cc b/src/asset.cc
index 6e200b0d..ae8e95cc 100644
--- a/src/asset.cc
+++ b/src/asset.cc
@@ -45,6 +45,7 @@
 #include "raw_convert.h"
 #include "util.h"
 #include "warnings.h"
+#include <fmt/format.h>
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 LIBDCP_ENABLE_WARNINGS
@@ -132,7 +133,7 @@ Asset::write_file_to_assetmap (xmlpp::Node* node, path root, path file, string i
 	chunk->add_child("Path")->add_child_text(path.get().generic_string());
 	chunk->add_child("VolumeIndex")->add_child_text("1");
 	chunk->add_child("Offset")->add_child_text("0");
-	chunk->add_child("Length")->add_child_text(raw_convert<string>(file_size(file)));
+	chunk->add_child("Length")->add_child_text(fmt::to_string(file_size(file)));
 }
 
 
diff --git a/src/combine.cc b/src/combine.cc
index e974c407..48fa9b67 100644
--- a/src/combine.cc
+++ b/src/combine.cc
@@ -46,6 +46,7 @@
 #include "font_asset.h"
 #include "interop_subtitle_asset.h"
 #include "raw_convert.h"
+#include <fmt/format.h>
 #include <boost/filesystem.hpp>
 #include <set>
 #include <string>
@@ -69,7 +70,7 @@ make_unique (boost::filesystem::path path)
 	}
 
 	for (int i = 0; i < 10000; ++i) {
-		boost::filesystem::path p = path.parent_path() / (path.stem().string() + dcp::raw_convert<string>(i) + path.extension().string());
+		boost::filesystem::path p = path.parent_path() / (path.stem().string() + fmt::to_string(i) + path.extension().string());
 		if (!boost::filesystem::exists(p)) {
 			return p;
 		}
diff --git a/src/cpl.cc b/src/cpl.cc
index 1f20d13e..6c6cf50e 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -53,6 +53,7 @@
 #include "util.h"
 #include "warnings.h"
 #include "xml.h"
+#include <fmt/format.h>
 LIBDCP_DISABLE_WARNINGS
 #include <asdcp/Metadata.h>
 LIBDCP_ENABLE_WARNINGS
@@ -356,7 +357,7 @@ CPL::maybe_write_composition_metadata_asset (xmlpp::Element* node) const
 
 	auto mp = _reels.front()->main_picture();
 	meta->add_child("EditRate")->add_child_text(mp->edit_rate().as_string());
-	meta->add_child("IntrinsicDuration")->add_child_text(raw_convert<string>(mp->intrinsic_duration()));
+	meta->add_child("IntrinsicDuration")->add_child_text(fmt::to_string(mp->intrinsic_duration()));
 
 	auto fctt = meta->add_child("FullContentTitleText", "meta");
 	if (_full_content_title_text && !_full_content_title_text->empty()) {
@@ -372,7 +373,7 @@ CPL::maybe_write_composition_metadata_asset (xmlpp::Element* node) const
 
 	if (_version_number) {
 		xmlpp::Element* vn = meta->add_child("VersionNumber", "meta");
-		vn->add_child_text(raw_convert<string>(*_version_number));
+		vn->add_child_text(fmt::to_string(*_version_number));
 		if (_status) {
 			vn->set_attribute("status", status_to_string(*_status));
 		}
@@ -402,15 +403,15 @@ CPL::maybe_write_composition_metadata_asset (xmlpp::Element* node) const
 	}
 
 	meta->add_child("MainSoundConfiguration", "meta")->add_child_text(*_main_sound_configuration);
-	meta->add_child("MainSoundSampleRate", "meta")->add_child_text(raw_convert<string>(*_main_sound_sample_rate) + " 1");
+	meta->add_child("MainSoundSampleRate", "meta")->add_child_text(fmt::to_string(*_main_sound_sample_rate) + " 1");
 
 	auto stored = meta->add_child("MainPictureStoredArea", "meta");
-	stored->add_child("Width", "meta")->add_child_text(raw_convert<string>(_main_picture_stored_area->width));
-	stored->add_child("Height", "meta")->add_child_text(raw_convert<string>(_main_picture_stored_area->height));
+	stored->add_child("Width", "meta")->add_child_text(fmt::to_string(_main_picture_stored_area->width));
+	stored->add_child("Height", "meta")->add_child_text(fmt::to_string(_main_picture_stored_area->height));
 
 	auto active = meta->add_child("MainPictureActiveArea", "meta");
-	active->add_child("Width", "meta")->add_child_text(raw_convert<string>(_main_picture_active_area->width));
-	active->add_child("Height", "meta")->add_child_text(raw_convert<string>(_main_picture_active_area->height));
+	active->add_child("Width", "meta")->add_child_text(fmt::to_string(_main_picture_active_area->width));
+	active->add_child("Height", "meta")->add_child_text(fmt::to_string(_main_picture_active_area->height));
 
 	optional<string> first_subtitle_language;
 	for (auto i: _reels) {
@@ -509,7 +510,7 @@ CPL::maybe_write_composition_metadata_asset (xmlpp::Element* node) const
 						ch->add_child("MCATagName", "r1")->add_child_text(buffer);
 					}
 					if (!channel->MCAChannelID.empty()) {
-						ch->add_child("MCAChannelID", "r1")->add_child_text(raw_convert<string>(channel->MCAChannelID.get()));
+						ch->add_child("MCAChannelID", "r1")->add_child_text(fmt::to_string(channel->MCAChannelID.get()));
 					}
 					if (!channel->RFC5646SpokenLanguage.empty()) {
 						channel->RFC5646SpokenLanguage.get().EncodeString(buffer, sizeof(buffer));
diff --git a/src/dcp.cc b/src/dcp.cc
index 3316b60e..4b276c45 100644
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -62,6 +62,7 @@
 #include "util.h"
 #include "verify.h"
 #include "warnings.h"
+#include <fmt/format.h>
 LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
 LIBDCP_ENABLE_WARNINGS
@@ -475,7 +476,7 @@ DCP::write_assetmap (
 	chunk->add_child("Path")->add_child_text (pkl_path.filename().string());
 	chunk->add_child("VolumeIndex")->add_child_text ("1");
 	chunk->add_child("Offset")->add_child_text ("0");
-	chunk->add_child("Length")->add_child_text (raw_convert<string> (boost::filesystem::file_size (pkl_path)));
+	chunk->add_child("Length")->add_child_text(fmt::to_string(boost::filesystem::file_size(pkl_path)));
 
 	for (auto i: assets()) {
 		i->write_to_assetmap (asset_list, _directory);
diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index bb0cad70..48c3c6d2 100644
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -48,6 +48,7 @@
 #include "util.h"
 #include "warnings.h"
 #include "xml.h"
+#include <fmt/format.h>
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 LIBDCP_ENABLE_WARNINGS
@@ -114,7 +115,7 @@ InteropSubtitleAsset::xml_as_string () const
 
 	root->add_child("SubtitleID")->add_child_text (_id);
 	root->add_child("MovieTitle")->add_child_text (_movie_title);
-	root->add_child("ReelNumber")->add_child_text (raw_convert<string> (_reel_number));
+	root->add_child("ReelNumber")->add_child_text(fmt::to_string(_reel_number));
 	root->add_child("Language")->add_child_text (_language);
 
 	for (auto i: _load_font_nodes) {
diff --git a/src/pkl.cc b/src/pkl.cc
index 22589b4d..b16e0961 100644
--- a/src/pkl.cc
+++ b/src/pkl.cc
@@ -43,6 +43,7 @@
 #include "raw_convert.h"
 #include "util.h"
 #include "warnings.h"
+#include <fmt/format.h>
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 LIBDCP_ENABLE_WARNINGS
@@ -120,7 +121,7 @@ PKL::write (boost::filesystem::path file, shared_ptr<const CertificateChain> sig
 			asset->add_child("AnnotationText")->add_child_text (*i->annotation_text());
 		}
 		asset->add_child("Hash")->add_child_text (i->hash());
-		asset->add_child("Size")->add_child_text (raw_convert<string>(i->size()));
+		asset->add_child("Size")->add_child_text (fmt::to_string(i->size()));
 		asset->add_child("Type")->add_child_text (i->type());
 	}
 
diff --git a/src/reel_asset.cc b/src/reel_asset.cc
index f9742628..dcb7710f 100644
--- a/src/reel_asset.cc
+++ b/src/reel_asset.cc
@@ -43,6 +43,7 @@
 #include "raw_convert.h"
 #include "reel_asset.h"
 #include "warnings.h"
+#include <fmt/format.h>
 #include <libcxml/cxml.h>
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
@@ -98,12 +99,12 @@ ReelAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 		a->add_child("AnnotationText")->add_child_text(*_annotation_text);
 	}
 	a->add_child("EditRate")->add_child_text (_edit_rate.as_string());
-	a->add_child("IntrinsicDuration")->add_child_text (raw_convert<string> (_intrinsic_duration));
+	a->add_child("IntrinsicDuration")->add_child_text(fmt::to_string(_intrinsic_duration));
 	if (_entry_point) {
-		a->add_child("EntryPoint")->add_child_text(raw_convert<string>(*_entry_point));
+		a->add_child("EntryPoint")->add_child_text(fmt::to_string(*_entry_point));
 	}
 	if (_duration) {
-		a->add_child("Duration")->add_child_text(raw_convert<string>(*_duration));
+		a->add_child("Duration")->add_child_text(fmt::to_string(*_duration));
 	}
 	return a;
 }
diff --git a/src/reel_markers_asset.cc b/src/reel_markers_asset.cc
index 0dd3cf29..51ce35fb 100644
--- a/src/reel_markers_asset.cc
+++ b/src/reel_markers_asset.cc
@@ -41,6 +41,7 @@
 #include "raw_convert.h"
 #include "reel_markers_asset.h"
 #include "warnings.h"
+#include <fmt/format.h>
 LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 LIBDCP_ENABLE_WARNINGS
@@ -113,7 +114,7 @@ ReelMarkersAsset::write_to_cpl (xmlpp::Node* node, Standard standard) const
 	for (auto const& i: _markers) {
 		auto m = ml->add_child("Marker");
 		m->add_child("Label")->add_child_text(marker_to_string(i.first));
-		m->add_child("Offset")->add_child_text(raw_convert<string>(i.second.as_editable_units_ceil(tcr)));
+		m->add_child("Offset")->add_child_text(fmt::to_string(i.second.as_editable_units_ceil(tcr)));
 	}
 
 	return asset;
diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 0693323c..4383a79a 100644
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -48,6 +48,7 @@
 #include "util.h"
 #include "warnings.h"
 #include "xml.h"
+#include <fmt/format.h>
 LIBDCP_DISABLE_WARNINGS
 #include <asdcp/AS_DCP.h>
 #include <asdcp/KM_util.h>
@@ -353,13 +354,13 @@ SMPTESubtitleAsset::xml_as_string () const
 	}
 	root->add_child("IssueDate")->add_child_text(_issue_date.as_string(true));
 	if (_reel_number) {
-		root->add_child("ReelNumber")->add_child_text(raw_convert<string>(_reel_number.get()));
+		root->add_child("ReelNumber")->add_child_text(fmt::to_string(_reel_number.get()));
 	}
 	if (_language) {
 		root->add_child("Language")->add_child_text(_language.get());
 	}
 	root->add_child("EditRate")->add_child_text(_edit_rate.as_string());
-	root->add_child("TimeCodeRate")->add_child_text(raw_convert<string>(_time_code_rate));
+	root->add_child("TimeCodeRate")->add_child_text(fmt::to_string(_time_code_rate));
 	if (_start_time) {
 		root->add_child("StartTime")->add_child_text(_start_time.get().as_string(Standard::SMPTE));
 	}
diff --git a/src/subtitle_asset_internal.cc b/src/subtitle_asset_internal.cc
index 7a10f472..4524ff07 100644
--- a/src/subtitle_asset_internal.cc
+++ b/src/subtitle_asset_internal.cc
@@ -40,6 +40,7 @@
 #include "subtitle_asset_internal.h"
 #include "subtitle_string.h"
 #include "compose.hpp"
+#include <fmt/format.h>
 #include <cmath>
 
 
@@ -60,8 +61,8 @@ order::Font::Font (shared_ptr<SubtitleString> s, Standard standard)
 	}
 	_values["Italic"] = s->italic() ? "yes" : "no";
 	_values["Color"] = s->colour().to_argb_string();
-	_values["Size"] = raw_convert<string> (s->size());
 	_values["AspectAdjust"] = raw_convert<string>(s->aspect_adjust(), 1, true);
+	_values["Size"] = fmt::to_string(s->size());
 	_values["Effect"] = effect_to_string (s->effect());
 	_values["EffectColor"] = s->effect_colour().to_argb_string();
 	_values["Script"] = "normal";
@@ -227,15 +228,15 @@ xmlpp::Element*
 order::Subtitle::as_xml (xmlpp::Element* parent, Context& context) const
 {
 	auto e = parent->add_child ("Subtitle");
-	e->set_attribute ("SpotNumber", raw_convert<string> (context.spot_number++));
+	e->set_attribute ("SpotNumber", fmt::to_string(context.spot_number++));
 	e->set_attribute ("TimeIn", _in.rebase(context.time_code_rate).as_string(context.standard));
 	e->set_attribute ("TimeOut", _out.rebase(context.time_code_rate).as_string(context.standard));
 	if (context.standard == Standard::SMPTE) {
 		e->set_attribute ("FadeUpTime", _fade_up.rebase(context.time_code_rate).as_string(context.standard));
 		e->set_attribute ("FadeDownTime", _fade_down.rebase(context.time_code_rate).as_string(context.standard));
 	} else {
-		e->set_attribute ("FadeUpTime", raw_convert<string> (_fade_up.as_editable_units_ceil(context.time_code_rate)));
-		e->set_attribute ("FadeDownTime", raw_convert<string> (_fade_down.as_editable_units_ceil(context.time_code_rate)));
+		e->set_attribute ("FadeUpTime", fmt::to_string(_fade_up.as_editable_units_ceil(context.time_code_rate)));
+		e->set_attribute ("FadeDownTime", fmt::to_string(_fade_down.as_editable_units_ceil(context.time_code_rate)));
 	}
 	return e;
 }
diff --git a/src/verify.cc b/src/verify.cc
index a0c329d0..7df6ed47 100644
--- a/src/verify.cc
+++ b/src/verify.cc
@@ -58,6 +58,7 @@
 #include "stereo_picture_frame.h"
 #include "verify.h"
 #include "verify_j2k.h"
+#include <fmt/format.h>
 #include <xercesc/dom/DOMAttr.hpp>
 #include <xercesc/dom/DOMDocument.hpp>
 #include <xercesc/dom/DOMError.hpp>
@@ -591,7 +592,7 @@ verify_main_sound_asset (
 		verify_language_tag (*lang, notes);
 	}
 	if (asset->sampling_rate() != 48000) {
-		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_SOUND_FRAME_RATE, raw_convert<string>(asset->sampling_rate()), *asset->file()});
+		notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_SOUND_FRAME_RATE, fmt::to_string(asset->sampling_rate()), *asset->file()});
 	}
 }
 
@@ -651,7 +652,7 @@ verify_smpte_timed_text_asset (
 	auto const size = boost::filesystem::file_size(asset->file().get());
 	if (size > 115 * 1024 * 1024) {
 		notes.push_back (
-			{ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, raw_convert<string>(size), *asset->file() }
+			{ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_TIMED_TEXT_SIZE_IN_BYTES, fmt::to_string(size), *asset->file() }
 			);
 	}
 
@@ -664,7 +665,7 @@ verify_smpte_timed_text_asset (
 		total_size += i.second.size();
 	}
 	if (total_size > 10 * 1024 * 1024) {
-		notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, raw_convert<string>(total_size), asset->file().get() });
+		notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_TIMED_TEXT_FONT_SIZE_IN_BYTES, fmt::to_string(total_size), asset->file().get() });
 	}
 
 	if (!asset->start_time()) {
@@ -764,7 +765,7 @@ verify_closed_caption_asset (
 	if (raw_xml) {
 		validate_xml (*raw_xml, xsd_dtd_directory, notes);
 		if (raw_xml->size() > 256 * 1024) {
-			notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES, raw_convert<string>(raw_xml->size()), *asset->file()});
+			notes.push_back ({VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_CLOSED_CAPTION_XML_SIZE_IN_BYTES, fmt::to_string(raw_xml->size()), *asset->file()});
 		}
 	} else {
 		notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSED_CHECK_OF_ENCRYPTED});
@@ -1483,7 +1484,7 @@ dcp::verify (
 				if (ffoc == markers_seen.end()) {
 					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::MISSING_FFOC});
 				} else if (ffoc->second.e != 1) {
-					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_FFOC, raw_convert<string>(ffoc->second.e)});
+					notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_FFOC, fmt::to_string(ffoc->second.e)});
 				}
 
 				auto lfoc = markers_seen.find(Marker::LFOC);
@@ -1492,7 +1493,7 @@ dcp::verify (
 				} else {
 					auto lfoc_time = lfoc->second.as_editable_units_ceil(lfoc->second.tcr);
 					if (lfoc_time != (cpl->reels().back()->duration() - 1)) {
-						notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_LFOC, raw_convert<string>(lfoc_time)});
+						notes.push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::INCORRECT_LFOC, fmt::to_string(lfoc_time)});
 					}
 				}
 
diff --git a/src/verify_j2k.cc b/src/verify_j2k.cc
index 48d85a33..455fdfa6 100644
--- a/src/verify_j2k.cc
+++ b/src/verify_j2k.cc
@@ -42,6 +42,7 @@
 #include "raw_convert.h"
 #include "verify.h"
 #include "verify_j2k.h"
+#include <fmt/format.h>
 #include <memory>
 #include <vector>
 
@@ -158,7 +159,7 @@ dcp::verify_j2k (shared_ptr<const Data> j2k, vector<VerificationNote>& notes)
 		require_marker ("SIZ");
 		auto L_siz = get_16();
 		if (L_siz != 47) {
-			throw InvalidCodestream("unexpected SIZ size " + raw_convert<string>(L_siz));
+			throw InvalidCodestream(fmt::format("unexpected SIZ size {}", L_siz));
 		}
 
 		get_16(); // CA: codestream capabilities
@@ -206,10 +207,10 @@ dcp::verify_j2k (shared_ptr<const Data> j2k, vector<VerificationNote>& notes)
 				get_8(); // tile part index
 				auto tile_parts = get_8();
 				if (!fourk && tile_parts != 3) {
-					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_TILE_PARTS_FOR_2K, raw_convert<string>(tile_parts) });
+					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_TILE_PARTS_FOR_2K, fmt::to_string(tile_parts) });
 				}
 				if (fourk && tile_parts != 6) {
-					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_TILE_PARTS_FOR_4K, raw_convert<string>(tile_parts) });
+					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_TILE_PARTS_FOR_4K, fmt::to_string(tile_parts) });
 				}
 				main_header_finished = true;
 			} else if (*marker_name == "SOD") {
@@ -228,11 +229,11 @@ dcp::verify_j2k (shared_ptr<const Data> j2k, vector<VerificationNote>& notes)
 				require_8(fourk ? 6 : 5, "invalid number of transform levels %1");
 				auto log_code_block_width = get_8();
 				if (log_code_block_width != 3) {
-					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_CODE_BLOCK_WIDTH, raw_convert<string>(4 * (2 << log_code_block_width)) });
+					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_CODE_BLOCK_WIDTH, fmt::to_string(4 * (2 << log_code_block_width)) });
 				}
 				auto log_code_block_height = get_8();
 				if (log_code_block_height != 3) {
-					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_CODE_BLOCK_HEIGHT, raw_convert<string>(4 * (2 << log_code_block_height)) });
+					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_CODE_BLOCK_HEIGHT, fmt::to_string(4 * (2 << log_code_block_height)) });
 				}
 				require_8(0, "invalid mode variations");
 				require_8(0, "invalid wavelet transform type %1"); // 9/7 irreversible
@@ -251,10 +252,10 @@ dcp::verify_j2k (shared_ptr<const Data> j2k, vector<VerificationNote>& notes)
 				auto quantization_style = get_8();
 				int guard_bits = (quantization_style >> 5) & 7;
 				if (fourk && guard_bits != 2) {
-					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_4K, raw_convert<string>(guard_bits) });
+					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_4K, fmt::to_string(guard_bits) });
 				}
 				if (!fourk && guard_bits != 1) {
-					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, raw_convert<string>(guard_bits) });
+					notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_GUARD_BITS_FOR_2K, fmt::to_string(guard_bits) });
 				}
 				ptr += L_qcd - 3;
 			} else if (*marker_name == "COC") {
@@ -326,10 +327,10 @@ dcp::verify_j2k (shared_ptr<const Data> j2k, vector<VerificationNote>& notes)
 			throw InvalidCodestream("more than one QCD marker found");
 		}
 		if (num_POC_in_main != 0 && !fourk) {
-			notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_2K, raw_convert<string>(num_POC_in_main) });
+			notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_2K, fmt::to_string(num_POC_in_main) });
 		}
 		if (num_POC_in_main != 1 && fourk) {
-			notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_4K, raw_convert<string>(num_POC_in_main) });
+			notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INCORRECT_JPEG2000_POC_MARKER_COUNT_FOR_4K, fmt::to_string(num_POC_in_main) });
 		}
 		if (num_POC_after_main != 0) {
 			notes.push_back ({ VerificationNote::Type::BV21_ERROR, VerificationNote::Code::INVALID_JPEG2000_POC_MARKER_LOCATION });