diff options
author | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 12:21:18 -0600 |
---|---|---|
committer | Dave Houlton <euclid@lindenlab.com> | 2020-07-23 12:21:18 -0600 |
commit | 64a9ad0f5f52dac633a76e39335a7def2573b82e (patch) | |
tree | e47af1ff1bd1db52fd93c11d857b11387bacf01a /indra/llkdu/llimagej2ckdu.cpp | |
parent | 05200cf827d9a6263adc4905bf41a4905bce2659 (diff) | |
parent | 72423372d6cd7f763a5567ad75752fa4e7131d60 (diff) |
Merge branch 'master' v6.4.6 into DRTVWR-497
Diffstat (limited to 'indra/llkdu/llimagej2ckdu.cpp')
-rw-r--r-- | indra/llkdu/llimagej2ckdu.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/indra/llkdu/llimagej2ckdu.cpp b/indra/llkdu/llimagej2ckdu.cpp index 4048b9a43d..dac5349f57 100644 --- a/indra/llkdu/llimagej2ckdu.cpp +++ b/indra/llkdu/llimagej2ckdu.cpp @@ -44,16 +44,19 @@ using namespace kdu_core; #include <sstream> #include <iomanip> -// stream kdu_dims to std::ostream // Turns out this must NOT be in the anonymous namespace! -// It must also precede #include "stringize.h". +namespace kdu_core +{ +// stream kdu_dims to std::ostream inline std::ostream& operator<<(std::ostream& out, const kdu_dims& dims) { return out << "(" << dims.pos.x << "," << dims.pos.y << ")," "[" << dims.size.x << "x" << dims.size.y << "]"; } +} // namespace kdu_core +// operator<<(std::ostream&, const kdu_dims&) must precede #include "stringize.h" #include "stringize.h" namespace { |