Skip to content

Commit

Permalink
Squashed 'externals/nitro/' changes from edfa0f7ce..574bfe2b6
Browse files Browse the repository at this point in the history 
574bfe2b6 FmtX() -> str::Format() (#586)

git-subtree-dir: externals/nitro
git-subtree-split: 574bfe2b6c79955be16427ddf4f115b0333a05b9
  • Loading branch information
Dan Smith committed Oct 9, 2023
1 parent 41ea3de commit 1251080
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 25 deletions.
2 changes: 1 addition & 1 deletion modules/c++/nitf/include/nitf/Object.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ class NITRO_NITFCPP_API Object
*/
std::string getObjectID() const
{
return FmtX("%p", getNative());
return str::Format("%p", getNative());
}

bool isManaged() const noexcept { return isValid() && mHandle->isManaged(); }
Expand Down
12 changes: 6 additions & 6 deletions modules/c++/nitf/source/FileHeader.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,7 @@ nitf::ComponentInfo FileHeader::getImageInfo(int i) const
{
int num = getNumImages();
if (i < 0 || i >= num)
throw except::IndexOutOfRangeException(Ctxt(FmtX(
throw except::IndexOutOfRangeException(Ctxt(str::Format(
"Index out of range: (%d <= %d <= %d)", 0, i, num)));
return make_ComponentInfo(getNativeOrThrow()->imageInfo, i);
}
Expand All @@ -209,7 +209,7 @@ nitf::ComponentInfo FileHeader::getGraphicInfo(int i) const
{
int num = getNumGraphics();
if (i < 0 || i >= num)
throw except::IndexOutOfRangeException(Ctxt(FmtX(
throw except::IndexOutOfRangeException(Ctxt(str::Format(
"Index out of range: (%d <= %d <= %d)", 0, i, num)));
return make_ComponentInfo(getNativeOrThrow()->graphicInfo, i);
}
Expand All @@ -218,7 +218,7 @@ nitf::ComponentInfo FileHeader::getLabelInfo(int i) const
{
int num = getNumLabels();
if (i < 0 || i >= num)
throw except::IndexOutOfRangeException(Ctxt(FmtX(
throw except::IndexOutOfRangeException(Ctxt(str::Format(
"Index out of range: (%d <= %d <= %d)", 0, i, num)));
return make_ComponentInfo(getNativeOrThrow()->labelInfo, i);
}
Expand All @@ -227,7 +227,7 @@ nitf::ComponentInfo FileHeader::getTextInfo(int i) const
{
int num = getNumTexts();
if (i < 0 || i >= num)
throw except::IndexOutOfRangeException(Ctxt(FmtX(
throw except::IndexOutOfRangeException(Ctxt(str::Format(
"Index out of range: (%d <= %d <= %d)", 0, i, num)));
return make_ComponentInfo(getNativeOrThrow()->textInfo, i);
}
Expand All @@ -236,7 +236,7 @@ nitf::ComponentInfo FileHeader::getDataExtensionInfo(int i) const
{
int num = getNumDataExtensions();
if (i < 0 || i >= num)
throw except::IndexOutOfRangeException(Ctxt(FmtX(
throw except::IndexOutOfRangeException(Ctxt(str::Format(
"Index out of range: (%d <= %d <= %d)", 0, i, num)));
return make_ComponentInfo(getNativeOrThrow()->dataExtensionInfo, i);
}
Expand All @@ -245,7 +245,7 @@ nitf::ComponentInfo FileHeader::getReservedExtensionInfo(int i) const
{
int num = getNumReservedExtensions();
if (i < 0 || i >= num)
throw except::IndexOutOfRangeException(Ctxt(FmtX(
throw except::IndexOutOfRangeException(Ctxt(str::Format(
"Index out of range: (%d <= %d <= %d)", 0, i, num)));
return make_ComponentInfo(getNativeOrThrow()->reservedExtensionInfo, i);
}
Expand Down
2 changes: 1 addition & 1 deletion modules/c++/nitf/source/TRE.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ nitf::Field TRE::getField(const std::string& key) const
nitf_Field* field = ::nitf_TRE_getField(getNativeOrThrow(), key.c_str());
if (!field)
throw except::NoSuchKeyException(
Ctxt(FmtX("Field does not exist in TRE: %s", key.c_str())));
Ctxt(str::Format("Field does not exist in TRE: %s", key)));
return nitf::Field(field);
}

Expand Down
2 changes: 1 addition & 1 deletion modules/c++/nitf/tests/test_create++.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ int main(int argc, char** argv)
{
if (argc != 2)
{
throw nitf::NITFException(Ctxt(FmtX("Usage %s <file-to-create>\n",
throw nitf::NITFException(Ctxt(str::Format("Usage %s <file-to-create>\n",
argv[0])));
}

Expand Down
6 changes: 3 additions & 3 deletions modules/c++/nitf/tests/test_extract.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ static std::vector<std::string> extract_image(const nitf::ImageSubheader& subhe
size_t band = 0;
for (const auto& data : bandData) // for band, data in enumerate(bandData):
{
auto outName = FmtX("%s_%d__", baseName, index);
outName += FmtX("%d_x_%d_", window.getNumRows(), window.getNumCols());
outName += FmtX("%d_band_%d.out", static_cast<int>(nbpp), static_cast<int>(band));
auto outName = str::Format("%s_%d__", baseName, index);
outName += str::Format("%d_x_%d_", window.getNumRows(), window.getNumCols());
outName += str::Format("%d_band_%d.out", static_cast<int>(nbpp), static_cast<int>(band));
outName = sys::Path::joinPaths(outDir, outName);
auto f = fopen(outName.c_str(), "wb"); // f = open(outName, "wb");
nitf::write(f, data); // fwrite(data.data(), sizeof(data[0]), data.size() / sizeof(data[0]), f);
Expand Down
2 changes: 1 addition & 1 deletion modules/c++/nitf/tests/test_fhdr_clone++.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ int main(int argc, char** argv)
{
if (argc != 2)
{
throw nitf::NITFException(Ctxt(FmtX("Usage: %s <nitf-file>\n", argv[0])));
throw nitf::NITFException(Ctxt(str::Format("Usage: %s <nitf-file>\n", argv[0])));
}

nitf::Reader reader;
Expand Down
2 changes: 1 addition & 1 deletion modules/c++/nitf/tests/test_functional.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ int main(int argc, char **argv)
{
nitf::Reader reader;
if ( argc != 2 )
throw nitf::NITFException(Ctxt(FmtX("Usage: %s <nitf-file>\n", argv[0])));
throw nitf::NITFException(Ctxt(str::Format("Usage: %s <nitf-file>\n", argv[0])));

nitf::IOHandle io(argv[1]);
nitf::Record record = reader.read(io);
Expand Down
10 changes: 5 additions & 5 deletions modules/c++/nitf/tests/test_j2k_nitf_read_region.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
void writeFile(uint32_t x0, uint32_t y0,
uint32_t x1, uint32_t y1, std::span<const uint8_t> buf, const std::string& prefix)
{
auto filename = FmtX("%s-raw-", prefix);
filename += FmtX("%d_%d__%d_%d.out", x0, y0, x1, y1);
auto filename = str::Format("%s-raw-", prefix);
filename += str::Format("%d_%d__%d_%d.out", x0, y0, x1, y1);
nitf::IOHandle outHandle(filename, NRT_ACCESS_WRITEONLY, NRT_CREATE);
outHandle.write(buf.data(), buf.size());
printf("Wrote file: %s\n", filename.c_str());
Expand All @@ -58,8 +58,8 @@ void writeJ2K(uint32_t x0, uint32_t y0,
uint32_t x1, uint32_t y1, std::span<const uint8_t> buf,
const j2k::Container& inContainer, const std::string& prefix)
{
auto outName = FmtX("%s-raw-", prefix);
outName += FmtX("%d_%d__%d_%d.j2k", x0, y0, x1, y1);
auto outName = str::Format("%s-raw-", prefix);
outName += str::Format("%d_%d__%d_%d.j2k", x0, y0, x1, y1);

const auto num_x_tiles = inContainer.getTilesX();
const auto num_y_tiles = inContainer.getTilesY();
Expand Down Expand Up @@ -217,7 +217,7 @@ int main(int argc, char **argv)
const auto result_ = j2kReader.readRegion(0, 0, width, height, buf);
const std::span<const uint8_t> result(result_.data(), result_.size());

const auto namePrefix = FmtX("image-%d", (i + 1));
const auto namePrefix = str::Format("image-%d", (i + 1));
// TODO: Update write to only output tiles in read region
writeFile(0, 0, width, height, result, namePrefix);
writeJ2K(0, 0, width, height, result, container, namePrefix);
Expand Down
2 changes: 1 addition & 1 deletion modules/c++/nitf/tests/test_read_acftb.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ int main(int argc, char** argv)
nitf::Reader reader;
if (argc != 2)
{
throw nitf::NITFException(Ctxt(FmtX("Usage: %s <nitf-file>\n",
throw nitf::NITFException(Ctxt(str::Format("Usage: %s <nitf-file>\n",
argv[0])));
}
nitf::IOHandle io(argv[1]);
Expand Down
10 changes: 5 additions & 5 deletions modules/c++/nitf/unittests/test_j2k_loading++.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ TEST_CASE(test_j2k_nitf)
void writeFile(uint32_t x0, uint32_t y0,
uint32_t x1, uint32_t y1, std::span<const uint8_t> buf, const std::string& prefix)
{
auto filename = FmtX("%s-raw-", prefix);
filename += FmtX("%d_%d__%d_%d.out", x0, y0, x1, y1);
auto filename = str::Format("%s-raw-", prefix);
filename += str::Format("%d_%d__%d_%d.out", x0, y0, x1, y1);
nitf::IOHandle outHandle(filename, NRT_ACCESS_WRITEONLY, NRT_CREATE);
outHandle.write(buf.data(), buf.size());
//printf("Wrote file: %s\n", filename.c_str());
Expand All @@ -178,8 +178,8 @@ void writeJ2K(uint32_t x0, uint32_t y0,
uint32_t x1, uint32_t y1, std::span<const uint8_t> buf,
const j2k::Container& inContainer, const std::string& prefix)
{
auto outName = FmtX("%s-raw-", prefix);
outName += FmtX("%d_%d__%d_%d.j2k", x0, y0, x1, y1);
auto outName = str::Format("%s-raw-", prefix);
outName += str::Format("%d_%d__%d_%d.j2k", x0, y0, x1, y1);

const auto num_x_tiles = inContainer.getTilesX();
const auto num_y_tiles = inContainer.getTilesY();
Expand Down Expand Up @@ -273,7 +273,7 @@ void test_j2k_nitf_read_region_(const std::string& testName,
const auto result_ = j2kReader.readRegion(0, 0, width, height, buf);
const auto result = sys::make_const_span(result_);

const auto namePrefix = FmtX("image-%d", (i + 1));
const auto namePrefix = str::Format("image-%d", (i + 1));
// TODO: Update write to only output tiles in read region
writeFile(0, 0, width, height, result, namePrefix);
writeJ2K(0, 0, width, height, result, container, namePrefix);
Expand Down

0 comments on commit 1251080

Please sign in to comment.