Skip to content

Commit 18cd6ab

Browse files
vbaderksvbaderks
authored
Replace legacy test images (#176)
1 parent 4f02873 commit 18cd6ab

19 files changed

+91
-757
lines changed

‎test/CharLSTest.vcxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -156,14 +156,18 @@
156156
<FileType>Document</FileType>
157157
<DestinationFolders>$(OutDir)test\conformance</DestinationFolders>
158158
</CopyFileToFolders>
159-
<CopyFileToFolders Include="lena8b.jls">
159+
<CopyFileToFolders Include="tulips-gray-8bit-512-512-hp-encoder.jls">
160160
<FileType>Document</FileType>
161161
<DestinationFolders>$(OutDir)test</DestinationFolders>
162162
</CopyFileToFolders>
163163
<CopyFileToFolders Include="alphatest.raw">
164164
<FileType>Document</FileType>
165165
<DestinationFolders>$(OutDir)test</DestinationFolders>
166166
</CopyFileToFolders>
167+
<CopyFileToFolders Include="desktop.ppm">
168+
<FileType>Document</FileType>
169+
<DestinationFolders>$(OutDir)test</DestinationFolders>
170+
</CopyFileToFolders>
167171
<CopyFileToFolders Include="conformance\t16e0.jls">
168172
<FileType>Document</FileType>
169173
<DestinationFolders>$(OutDir)test\conformance</DestinationFolders>
@@ -212,10 +216,6 @@
212216
<FileType>Document</FileType>
213217
<DestinationFolders>$(OutDir)test</DestinationFolders>
214218
</CopyFileToFolders>
215-
<CopyFileToFolders Include="lena8b.raw">
216-
<FileType>Document</FileType>
217-
<DestinationFolders>$(OutDir)test</DestinationFolders>
218-
</CopyFileToFolders>
219219
<CopyFileToFolders Include="conformance\test8bs2.pgm">
220220
<FileType>Document</FileType>
221221
<DestinationFolders>$(OutDir)test\conformance</DestinationFolders>

‎test/CharLSTest.vcxproj.filters

+4-4
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,7 @@
8181
<CopyFileToFolders Include="jlsimage\banny_normal.jls">
8282
<Filter>Data Files</Filter>
8383
</CopyFileToFolders>
84-
<CopyFileToFolders Include="lena8b.jls">
85-
<Filter>Data Files</Filter>
86-
</CopyFileToFolders>
87-
<CopyFileToFolders Include="lena8b.raw">
84+
<CopyFileToFolders Include="tulips-gray-8bit-512-512-hp-encoder.jls">
8885
<Filter>Data Files</Filter>
8986
</CopyFileToFolders>
9087
<CopyFileToFolders Include="MR2_UNC">
@@ -129,6 +126,9 @@
129126
<CopyFileToFolders Include="conformance\test16.pgm">
130127
<Filter>Data Files</Filter>
131128
</CopyFileToFolders>
129+
<CopyFileToFolders Include="desktop.ppm">
130+
<Filter>Data Files</Filter>
131+
</CopyFileToFolders>
132132
</ItemGroup>
133133
<ItemGroup>
134134
<Manifest Include="app.manifest" />

‎test/DSC_5455.raw

-491 KB
Binary file not shown.

‎test/SIEMENS-MR-RGB-16Bits.dcm

-337 KB
Binary file not shown.

‎test/bitstreamdamage.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void test_damaged_bit_stream1()
4040

4141
void test_damaged_bit_stream2()
4242
{
43-
vector<uint8_t> encoded_buffer = read_file("test/lena8b.jls");
43+
vector<uint8_t> encoded_buffer = read_file("test/tulips-gray-8bit-512-512-hp-encoder.jls");
4444

4545
encoded_buffer.resize(900);
4646
encoded_buffer.resize(40000, 3);
@@ -63,7 +63,7 @@ void test_damaged_bit_stream2()
6363

6464
void test_damaged_bit_stream3()
6565
{
66-
vector<uint8_t> encoded_buffer = read_file("test/lena8b.jls");
66+
vector<uint8_t> encoded_buffer = read_file("test/tulips-gray-8bit-512-512-hp-encoder.jls");
6767

6868
encoded_buffer[300] = 0xFF;
6969
encoded_buffer[301] = 0xFF;

‎test/compliance.cpp

-3
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,4 @@ void test_conformance()
232232

233233
// Test 12
234234
decompress_file("test/conformance/t16e3.jls", "test/conformance/test16.pgm", 16);
235-
236-
// additional, Lena compressed with other codec (UBC?), vfy with CharLS
237-
decompress_file("test/lena8b.jls", "test/lena8b.raw", 0);
238235
}

‎test/legacy.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ void test_jpegls_read_header()
5454
test_jpegls_read_header("test/conformance/t8nde3.jls", 128, 128, 8, 128, 1, 0);
5555
test_jpegls_read_header("test/conformance/t16e0.jls", 256, 256, 12, 512, 1, 0);
5656
test_jpegls_read_header("test/conformance/t16e3.jls", 256, 256, 12, 512, 1, 0);
57-
test_jpegls_read_header("test/lena8b.jls", 512, 512, 8, 512, 1, 0);
57+
test_jpegls_read_header("test/tulips-gray-8bit-512-512-hp-encoder.jls", 512, 512, 8, 512, 1, 0);
5858
}
5959

6060
} // namespace

‎test/lena8b.jls

-136 KB
Binary file not shown.

‎test/lena8b.raw

-340
This file was deleted.

‎test/main.cpp

+2-7
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ void test_bgr()
340340

341341
void test_too_small_output_buffer()
342342
{
343-
const vector<uint8_t> encoded{read_file("test/lena8b.jls")};
343+
const vector<uint8_t> encoded{read_file("test/tulips-gray-8bit-512-512-hp-encoder.jls")};
344344
vector<uint8_t> destination(static_cast<size_t>(512) * 511);
345345

346346
jpegls_decoder decoder;
@@ -433,7 +433,7 @@ void test_decode_bit_stream_with_unknown_jpeg_marker()
433433

434434
void test_decode_rect()
435435
{
436-
const vector<uint8_t> encoded_source{read_file("test/lena8b.jls")};
436+
const vector<uint8_t> encoded_source{read_file("test/tulips-gray-8bit-512-512-hp-encoder.jls")};
437437

438438
const jpegls_decoder decoder{encoded_source, true};
439439
vector<uint8_t> decoded_buffer(decoder.destination_size());
@@ -732,10 +732,7 @@ catch (const system_error& error)
732732

733733
void test_encode_from_stream()
734734
{
735-
////test_encode_from_stream("test/user_supplied/output.jls");
736-
737735
test_encode_from_stream("test/0015.raw", 0, 1024, 1024, 8, 1, interleave_mode::none, 0x3D3ee);
738-
////test_encode_from_stream("test/MR2_UNC", 1728, 1024, 1024, 16, 1,0, 0x926e1);
739736
test_encode_from_stream("test/conformance/test8.ppm", 15, 256, 256, 8, 3, interleave_mode::sample, 99734);
740737
test_encode_from_stream("test/conformance/test8.ppm", 15, 256, 256, 8, 3, interleave_mode::line, 100615);
741738
}
@@ -745,8 +742,6 @@ bool unit_test()
745742
{
746743
try
747744
{
748-
//// TestBadImage();
749-
750745
cout << "Test Conformance\n";
751746
test_encode_from_stream();
752747
test_conformance();

‎test/performance.cpp

+4-33
Original file line numberDiff line numberDiff line change
@@ -25,48 +25,19 @@ using std::chrono::steady_clock;
2525

2626
namespace {
2727

28-
void test_file16_bit_as12(const char* filename, const int offset, const rect_size size2, const int component_count,
29-
const bool little_endian_file)
30-
{
31-
vector<uint8_t> uncompressed_data{read_file(filename, offset)};
32-
fix_endian(&uncompressed_data, little_endian_file);
33-
34-
// Dynamic allocated memory is properly aligned: safe to use void*
35-
void* const data{uncompressed_data.data()};
36-
auto* const p{static_cast<uint16_t*>(data)};
37-
for (size_t i{}; i != uncompressed_data.size() / 2; ++i)
38-
{
39-
p[i] = p[i] >> 4;
40-
}
41-
42-
test_round_trip(filename, uncompressed_data, size2, 12, component_count);
43-
}
44-
45-
4628
void test_performance(const int loop_count)
4729
{
4830
// RGBA image (This is a common PNG sample)
49-
test_file("test/alphatest.raw", 0, rect_size(380, 287), 8, 4, false, loop_count);
50-
51-
const rect_size size1024{1024, 1024};
52-
const rect_size size512{512, 512};
31+
test_file("test/alphatest.raw", 0, {380, 287}, 8, 4, false, loop_count);
5332

5433
// 16 bit mono
55-
test_file("test/MR2_UNC", 1728, size1024, 16, 1, true, loop_count);
34+
test_file("test/MR2_UNC", 1728, {1024, 1024}, 16, 1, true, loop_count);
5635

5736
// 8 bit mono
58-
test_file("test/0015.raw", 0, size1024, 8, 1, false, loop_count);
59-
test_file("test/lena8b.raw", 0, size512, 8, 1, false, loop_count);
37+
test_file("test/0015.raw", 0, {1024, 1024}, 8, 1, false, loop_count);
6038

6139
// 8 bit color
62-
test_file("test/desktop.ppm", 40, rect_size(1280, 1024), 8, 3, false, loop_count);
63-
64-
// 12 bit RGB
65-
test_file("test/SIEMENS-MR-RGB-16Bits.dcm", -1, rect_size(192, 256), 12, 3, true, loop_count);
66-
test_file16_bit_as12("test/DSC_5455.raw", 142949, rect_size(300, 200), 3, true);
67-
68-
// 16 bit RGB
69-
test_file("test/DSC_5455.raw", 142949, rect_size(300, 200), 16, 3, true, loop_count);
40+
test_file("test/desktop.ppm", 40, {1280, 1024}, 8, 3, false, loop_count);
7041
}
7142

7243
} // namespace

‎test/tulips-gray-8bit-512-512-hp-encoder.jls

107 KB
Binary file not shown.

‎unittest/CharLSUnitTest.vcxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@
149149
<FileType>Document</FileType>
150150
<DestinationFolders>$(OutDir)DataFiles</DestinationFolders>
151151
</CopyFileToFolders>
152-
<CopyFileToFolders Include="../test/lena8b.jls">
152+
<CopyFileToFolders Include="../test/tulips-gray-8bit-512-512-hp-encoder.jls">
153153
<FileType>Document</FileType>
154154
<DestinationFolders>$(OutDir)DataFiles</DestinationFolders>
155155
</CopyFileToFolders>
@@ -169,7 +169,7 @@
169169
<FileType>Document</FileType>
170170
<DestinationFolders>$(OutDir)DataFiles</DestinationFolders>
171171
</CopyFileToFolders>
172-
<CopyFileToFolders Include="lena8b.pgm">
172+
<CopyFileToFolders Include="tulips-gray-8bit-512-512.pgm">
173173
<FileType>Document</FileType>
174174
<DestinationFolders>$(OutDir)DataFiles</DestinationFolders>
175175
</CopyFileToFolders>

‎unittest/CharLSUnitTest.vcxproj.filters

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,10 +109,10 @@
109109
</ClCompile>
110110
</ItemGroup>
111111
<ItemGroup>
112-
<CopyFileToFolders Include="lena8b.pgm">
112+
<CopyFileToFolders Include="tulips-gray-8bit-512-512.pgm">
113113
<Filter>Test Images</Filter>
114114
</CopyFileToFolders>
115-
<CopyFileToFolders Include="../test/lena8b.jls">
115+
<CopyFileToFolders Include="../test/tulips-gray-8bit-512-512-hp-encoder.jls">
116116
<Filter>Test Images</Filter>
117117
</CopyFileToFolders>
118118
<CopyFileToFolders Include="../test/conformance/t8c0e0.jls">

‎unittest/compliance_test.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,10 @@ TEST_CLASS(compliance_test)
8383
decompress_file("DataFiles/t16e3.jls", "DataFiles/TEST16.pgm", false);
8484
}
8585

86-
TEST_METHOD(lena_monochrome_8_bit_lossless_ubc) // NOLINT
86+
TEST_METHOD(tulips_monochrome_8_bit_lossless_hp) // NOLINT
8787
{
88-
// Additional, Lena compressed with other codec (UBC?)
89-
decompress_file("DataFiles/lena8b.jls", "DataFiles/lena8b.pgm");
88+
// Additional, Tulips encoded with HP 1.0BETA encoder.
89+
decompress_file("DataFiles/tulips-gray-8bit-512-512-hp-encoder.jls", "DataFiles/tulips-gray-8bit-512-512.pgm");
9090
}
9191

9292
TEST_METHOD(decompress_color_8_bit_interleave_none_lossless_restart_7) // NOLINT

‎unittest/documentation_test.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -134,31 +134,31 @@ TEST_CLASS(documentation_test)
134134
public:
135135
TEST_METHOD(call_decode_simple_8_bit_monochrome) // NOLINT
136136
{
137-
const vector<uint8_t> source{read_file("DataFiles/lena8b.jls")};
137+
const vector<uint8_t> source{read_file("DataFiles/tulips-gray-8bit-512-512-hp-encoder.jls")};
138138
const vector<uint8_t> charls_decoded{decode_simple_8_bit_monochrome(source)};
139139

140-
test_decoded_data(charls_decoded, "DataFiles/lena8b.pgm");
140+
test_decoded_data(charls_decoded, "DataFiles/tulips-gray-8bit-512-512.pgm");
141141
}
142142

143143
TEST_METHOD(call_decode_advanced) // NOLINT
144144
{
145-
const vector<uint8_t> source{read_file("DataFiles/lena8b.jls")};
145+
const vector<uint8_t> source{read_file("DataFiles/tulips-gray-8bit-512-512-hp-encoder.jls")};
146146
const vector<uint8_t> charls_decoded{decode_advanced(source)};
147147

148-
test_decoded_data(charls_decoded, "DataFiles/lena8b.pgm");
148+
test_decoded_data(charls_decoded, "DataFiles/tulips-gray-8bit-512-512.pgm");
149149
}
150150

151151
TEST_METHOD(call_decode_simple_8_bit_monochrome_legacy) // NOLINT
152152
{
153-
const vector<uint8_t> source{read_file("DataFiles/lena8b.jls")};
153+
const vector<uint8_t> source{read_file("DataFiles/tulips-gray-8bit-512-512-hp-encoder.jls")};
154154
const vector<uint8_t> charls_decoded{decode_simple_8_bit_monochrome_legacy(source)};
155155

156-
test_decoded_data(charls_decoded, "DataFiles/lena8b.pgm");
156+
test_decoded_data(charls_decoded, "DataFiles/tulips-gray-8bit-512-512.pgm");
157157
}
158158

159159
TEST_METHOD(call_encode_simple_8_bit_monochrome) // NOLINT
160160
{
161-
portable_anymap_file reference_file("DataFiles/lena8b.pgm");
161+
portable_anymap_file reference_file("DataFiles/tulips-gray-8bit-512-512.pgm");
162162
const vector<uint8_t> charls_encoded{encode_simple_8_bit_monochrome(reference_file.image_data(),
163163
static_cast<uint32_t>(reference_file.width()),
164164
static_cast<uint32_t>(reference_file.height()))};
@@ -168,7 +168,7 @@ TEST_CLASS(documentation_test)
168168

169169
TEST_METHOD(call_encode_advanced_8_bit_monochrome) // NOLINT
170170
{
171-
portable_anymap_file reference_file("DataFiles/lena8b.pgm");
171+
portable_anymap_file reference_file("DataFiles/tulips-gray-8bit-512-512.pgm");
172172
const vector<uint8_t> charls_encoded{
173173
encode_advanced_8_bit_monochrome(reference_file.image_data(), static_cast<uint32_t>(reference_file.width()),
174174
static_cast<uint32_t>(reference_file.height()))};
@@ -178,7 +178,7 @@ TEST_CLASS(documentation_test)
178178

179179
TEST_METHOD(call_encode_simple_8_bit_monochrome_legacy) // NOLINT
180180
{
181-
portable_anymap_file reference_file("DataFiles/lena8b.pgm");
181+
portable_anymap_file reference_file("DataFiles/tulips-gray-8bit-512-512.pgm");
182182
const vector<uint8_t> charls_encoded{
183183
encode_simple_8_bit_monochrome_legacy(reference_file.image_data(), static_cast<uint32_t>(reference_file.width()),
184184
static_cast<uint32_t>(reference_file.height()))};

‎unittest/interface_test.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ TEST_CLASS(interface_test)
126126
TEST_METHOD(JpegLsDecode_nullptr) // NOLINT
127127
{
128128
constexpr JlsParameters params{};
129-
vector<uint8_t> encoded_source = read_file("DataFiles/lena8b.jls");
129+
vector<uint8_t> encoded_source = read_file("DataFiles/tulips-gray-8bit-512-512-hp-encoder.jls");
130130
auto error = JpegLsDecode(nullptr, 100, encoded_source.data(), encoded_source.size(), &params, nullptr);
131131
Assert::AreEqual(jpegls_errc::invalid_argument, error);
132132

@@ -154,7 +154,7 @@ TEST_CLASS(interface_test)
154154
TEST_METHOD(JpegLsDecodeRect_lena) // NOLINT
155155
{
156156
JlsParameters params{};
157-
const vector<uint8_t> encoded_source = read_file("DataFiles/lena8b.jls");
157+
const vector<uint8_t> encoded_source = read_file("DataFiles/tulips-gray-8bit-512-512-hp-encoder.jls");
158158
auto error = JpegLsReadHeader(encoded_source.data(), encoded_source.size(), &params, nullptr);
159159
Assert::AreEqual(jpegls_errc::success, error);
160160

@@ -180,7 +180,7 @@ TEST_CLASS(interface_test)
180180
{
181181
constexpr JlsParameters params{};
182182
constexpr JlsRect roi{};
183-
vector<uint8_t> encoded_source = read_file("DataFiles/lena8b.jls");
183+
vector<uint8_t> encoded_source = read_file("DataFiles/tulips-gray-8bit-512-512-hp-encoder.jls");
184184
auto error = JpegLsDecodeRect(nullptr, 100, encoded_source.data(), encoded_source.size(), roi, &params, nullptr);
185185
Assert::AreEqual(jpegls_errc::invalid_argument, error);
186186

‎unittest/lena8b.pgm

-343
This file was deleted.

‎unittest/tulips-gray-8bit-512-512.pgm

+54
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)