Skip to content

Commit 703323b

Browse files
StefanoLusardiTCStefanoLusardiTC
committed
Removed useless warning condition on GCC 12
1 parent 6550e7d commit 703323b

File tree

2 files changed

+11
-132
lines changed

2 files changed

+11
-132
lines changed

‎image/tests/test_image_color.cpp‎

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -126,28 +126,6 @@ TEST_F(color_test, to_bgr_conversion)
126126
EXPECT_EQ(bgr_array[2], 100); // r
127127
}
128128

129-
TEST_F(color_test, to_rgba_conversion)
130-
{
131-
tc::img::color c(100, 150, 200, 128);
132-
auto rgba_array = c.to_rgba();
133-
EXPECT_EQ(rgba_array.size(), 4);
134-
EXPECT_EQ(rgba_array[0], 100); // r
135-
EXPECT_EQ(rgba_array[1], 150); // g
136-
EXPECT_EQ(rgba_array[2], 200); // b
137-
EXPECT_EQ(rgba_array[3], 128); // a
138-
}
139-
140-
TEST_F(color_test, to_bgra_conversion)
141-
{
142-
tc::img::color c(100, 150, 200, 128);
143-
auto bgra_array = c.to_bgra();
144-
EXPECT_EQ(bgra_array.size(), 4);
145-
EXPECT_EQ(bgra_array[0], 200); // b
146-
EXPECT_EQ(bgra_array[1], 150); // g
147-
EXPECT_EQ(bgra_array[2], 100); // r
148-
EXPECT_EQ(bgra_array[3], 128); // a
149-
}
150-
151129
// Test equality operators
152130
TEST_F(color_test, equality_operator)
153131
{
@@ -185,87 +163,4 @@ TEST_F(color_test, boundary_values)
185163
EXPECT_EQ(c_max.a, 255);
186164
}
187165

188-
// Test rgba/bgra conversions with boundary values
189-
TEST_F(color_test, rgba_bgra_conversion_boundary_values)
190-
{
191-
// Test minimum values
192-
tc::img::color c_min(0, 0, 0, 0);
193-
auto rgba_min = c_min.to_rgba();
194-
auto bgra_min = c_min.to_bgra();
195-
196-
EXPECT_EQ(rgba_min[0], 0); // r
197-
EXPECT_EQ(rgba_min[1], 0); // g
198-
EXPECT_EQ(rgba_min[2], 0); // b
199-
EXPECT_EQ(rgba_min[3], 0); // a
200-
201-
EXPECT_EQ(bgra_min[0], 0); // b
202-
EXPECT_EQ(bgra_min[1], 0); // g
203-
EXPECT_EQ(bgra_min[2], 0); // r
204-
EXPECT_EQ(bgra_min[3], 0); // a
205-
206-
// Test maximum values
207-
tc::img::color c_max(255, 255, 255, 255);
208-
auto rgba_max = c_max.to_rgba();
209-
auto bgra_max = c_max.to_bgra();
210-
211-
EXPECT_EQ(rgba_max[0], 255); // r
212-
EXPECT_EQ(rgba_max[1], 255); // g
213-
EXPECT_EQ(rgba_max[2], 255); // b
214-
EXPECT_EQ(rgba_max[3], 255); // a
215-
216-
EXPECT_EQ(bgra_max[0], 255); // b
217-
EXPECT_EQ(bgra_max[1], 255); // g
218-
EXPECT_EQ(bgra_max[2], 255); // r
219-
EXPECT_EQ(bgra_max[3], 255); // a
220-
}
221-
222-
// Test rgba/bgra conversions with static colors
223-
TEST_F(color_test, rgba_bgra_conversion_static_colors)
224-
{
225-
// Test red color
226-
auto red_color = tc::img::color::red();
227-
auto red_rgba = red_color.to_rgba();
228-
auto red_bgra = red_color.to_bgra();
229-
230-
EXPECT_EQ(red_rgba[0], 255); // r
231-
EXPECT_EQ(red_rgba[1], 0); // g
232-
EXPECT_EQ(red_rgba[2], 0); // b
233-
EXPECT_EQ(red_rgba[3], 255); // a
234-
235-
EXPECT_EQ(red_bgra[0], 0); // b
236-
EXPECT_EQ(red_bgra[1], 0); // g
237-
EXPECT_EQ(red_bgra[2], 255); // r
238-
EXPECT_EQ(red_bgra[3], 255); // a
239-
240-
// Test green color
241-
auto green_color = tc::img::color::green();
242-
auto green_rgba = green_color.to_rgba();
243-
auto green_bgra = green_color.to_bgra();
244-
245-
EXPECT_EQ(green_rgba[0], 0); // r
246-
EXPECT_EQ(green_rgba[1], 255); // g
247-
EXPECT_EQ(green_rgba[2], 0); // b
248-
EXPECT_EQ(green_rgba[3], 255); // a
249-
250-
EXPECT_EQ(green_bgra[0], 0); // b
251-
EXPECT_EQ(green_bgra[1], 255); // g
252-
EXPECT_EQ(green_bgra[2], 0); // r
253-
EXPECT_EQ(green_bgra[3], 255); // a
254-
255-
// Test blue color
256-
auto blue_color = tc::img::color::blue();
257-
auto blue_rgba = blue_color.to_rgba();
258-
auto blue_bgra = blue_color.to_bgra();
259-
260-
EXPECT_EQ(blue_rgba[0], 0); // r
261-
EXPECT_EQ(blue_rgba[1], 0); // g
262-
EXPECT_EQ(blue_rgba[2], 255); // b
263-
EXPECT_EQ(blue_rgba[3], 255); // a
264-
265-
EXPECT_EQ(blue_bgra[0], 255); // b
266-
EXPECT_EQ(blue_bgra[1], 0); // g
267-
EXPECT_EQ(blue_bgra[2], 0); // r
268-
EXPECT_EQ(blue_bgra[3], 255); // a
269-
}
270-
271166
}

‎image/tests/test_image_resize.cpp‎

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -283,8 +283,7 @@ TEST_F(image_resize_test, resize_real_landscape_void_version)
283283
std::vector<std::uint8_t> resized_image(target_width * target_height * orig_channels, 0);
284284

285285
EXPECT_NO_THROW({
286-
tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
287-
target_width, target_height, resized_image);
286+
tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, target_width, target_height, resized_image);
288287
});
289288

290289
// Verify the resized image has correct dimensions
@@ -316,8 +315,7 @@ TEST_F(image_resize_test, resize_real_landscape_return_version)
316315

317316
std::vector<std::uint8_t> resized_image;
318317
EXPECT_NO_THROW({
319-
resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
320-
target_width, target_height);
318+
resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, target_width, target_height);
321319
});
322320

323321
// Verify the resized image has correct dimensions
@@ -346,8 +344,7 @@ TEST_F(image_resize_test, resize_real_portrait)
346344
int target_width = 200;
347345
int target_height = 200;
348346

349-
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
350-
target_width, target_height);
347+
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, target_width, target_height);
351348

352349
// Verify the resized image has reasonable size
353350
EXPECT_GT(resized_image.size(), 0);
@@ -381,8 +378,7 @@ TEST_F(image_resize_test, resize_real_square_png)
381378

382379
for (int target_size : target_sizes)
383380
{
384-
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
385-
target_size, target_size);
381+
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, target_size, target_size);
386382

387383
EXPECT_GT(resized_image.size(), 0) << "Failed for target size: " << target_size;
388384
EXPECT_EQ(resized_image.size() % orig_channels, 0) << "Invalid size for target: " << target_size;
@@ -413,8 +409,7 @@ TEST_F(image_resize_test, extreme_downscaling_real_images)
413409
std::vector<std::uint8_t> tiny_image(target_w * target_h * orig_channels, 0);
414410

415411
EXPECT_NO_THROW({
416-
tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
417-
target_w, target_h, tiny_image);
412+
tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, target_w, target_h, tiny_image);
418413
}) << "Failed for size: "
419414
<< target_w << "x" << target_h;
420415

@@ -450,8 +445,7 @@ TEST_F(image_resize_test, extreme_upscaling_real_images)
450445
int target_width = orig_width * factor;
451446
int target_height = orig_height * factor;
452447

453-
auto enlarged_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
454-
target_width, target_height);
448+
auto enlarged_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, target_width, target_height);
455449

456450
EXPECT_GT(enlarged_image.size(), 0) << "Failed for scale factor: " << factor;
457451

@@ -492,8 +486,7 @@ TEST_F(image_resize_test, different_aspect_ratios_real_images)
492486

493487
for (const auto& target : targets)
494488
{
495-
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
496-
target.width, target.height);
489+
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, target.width, target.height);
497490

498491
EXPECT_GT(resized_image.size(), 0)
499492
<< "Failed for " << target.description << " (" << target.width << "x" << target.height << ")";
@@ -525,12 +518,10 @@ TEST_F(image_resize_test, real_image_version_consistency)
525518

526519
// Test void version
527520
std::vector<std::uint8_t> void_result(target_width * target_height * orig_channels, 0);
528-
tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
529-
target_width, target_height, void_result);
521+
tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, target_width, target_height, void_result);
530522

531523
// Test return version
532-
auto return_result = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
533-
target_width, target_height);
524+
auto return_result = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, target_width, target_height);
534525

535526
// Results should be identical
536527
EXPECT_EQ(void_result.size(), return_result.size());
@@ -563,8 +554,7 @@ TEST_F(image_resize_test, resize_all_real_images_to_common_size)
563554
auto [original_data, orig_width, orig_height, orig_channels] = tc::img::image_load(image_path);
564555

565556
// Resize to common dimensions
566-
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
567-
common_width, common_height);
557+
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, common_width, common_height);
568558

569559
EXPECT_GT(resized_image.size(), 0) << "Failed to resize " << description;
570560
EXPECT_EQ(resized_image.size() % orig_channels, 0) << "Invalid size for " << description;
@@ -575,11 +565,6 @@ TEST_F(image_resize_test, resize_all_real_images_to_common_size)
575565

576566
// Should be at least a reasonable fraction of the target size
577567
EXPECT_GE(resized_image.size(), max_expected_size / 4) << "Size too small for " << description;
578-
579-
// Verify pixel values are valid
580-
bool has_valid_pixels = std::all_of(resized_image.begin(), resized_image.end(),
581-
[](uint8_t pixel) { return pixel <= 255; });
582-
EXPECT_TRUE(has_valid_pixels) << "Invalid pixel values in resized " << description;
583568
}
584569
}
585570

@@ -614,8 +599,7 @@ TEST_F(image_resize_test, resize_and_save_real_images)
614599
for (const auto& test : resize_tests)
615600
{
616601
// Resize the image
617-
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels,
618-
test.width, test.height);
602+
auto resized_image = tc::img::image_resize_aspect_ratio(original_data, orig_width, orig_height, orig_channels, test.width, test.height);
619603

620604
EXPECT_GT(resized_image.size(), 0) << "Resize failed for " << test.suffix;
621605

0 commit comments

Comments
 (0)