From b30f101fc0865322bfc4451c54397075a8e02c16 Mon Sep 17 00:00:00 2001 From: Jeroen Bakker Date: Fri, 26 Nov 2021 11:26:57 +0100 Subject: Use enum class for ePartialUpdateIterResult. --- .../blenkernel/intern/image_partial_update_test.cc | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'source/blender/blenkernel/intern/image_partial_update_test.cc') diff --git a/source/blender/blenkernel/intern/image_partial_update_test.cc b/source/blender/blenkernel/intern/image_partial_update_test.cc index 1c3a0abd94a..764f0b3ce6c 100644 --- a/source/blender/blenkernel/intern/image_partial_update_test.cc +++ b/source/blender/blenkernel/intern/image_partial_update_test.cc @@ -134,10 +134,10 @@ TEST_F(ImagePartialUpdateTest, mark_single_tile) PartialUpdateRegion changed_region; ePartialUpdateIterResult iter_result; iter_result = BKE_image_partial_update_get_next_change(partial_update_user, &changed_region); - EXPECT_EQ(iter_result, PARTIAL_UPDATE_ITER_CHANGE_AVAILABLE); + EXPECT_EQ(iter_result, ePartialUpdateIterResult::ChangeAvailable); EXPECT_EQ(BLI_rcti_inside_rcti(&changed_region.region, ®ion), true); iter_result = BKE_image_partial_update_get_next_change(partial_update_user, &changed_region); - EXPECT_EQ(iter_result, PARTIAL_UPDATE_ITER_FINISHED); + EXPECT_EQ(iter_result, ePartialUpdateIterResult::Finished); result = BKE_image_partial_update_collect_changes(image, partial_update_user); EXPECT_EQ(result, ePartialUpdateCollectResult::NoChangesDetected); @@ -169,13 +169,13 @@ TEST_F(ImagePartialUpdateTest, mark_unconnected_tiles) PartialUpdateRegion changed_region; ePartialUpdateIterResult iter_result; iter_result = BKE_image_partial_update_get_next_change(partial_update_user, &changed_region); - EXPECT_EQ(iter_result, PARTIAL_UPDATE_ITER_CHANGE_AVAILABLE); + EXPECT_EQ(iter_result, ePartialUpdateIterResult::ChangeAvailable); EXPECT_EQ(BLI_rcti_inside_rcti(&changed_region.region, ®ion_b), true); iter_result = BKE_image_partial_update_get_next_change(partial_update_user, &changed_region); - EXPECT_EQ(iter_result, PARTIAL_UPDATE_ITER_CHANGE_AVAILABLE); + EXPECT_EQ(iter_result, ePartialUpdateIterResult::ChangeAvailable); EXPECT_EQ(BLI_rcti_inside_rcti(&changed_region.region, ®ion_a), true); iter_result = BKE_image_partial_update_get_next_change(partial_update_user, &changed_region); - EXPECT_EQ(iter_result, PARTIAL_UPDATE_ITER_FINISHED); + EXPECT_EQ(iter_result, ePartialUpdateIterResult::Finished); result = BKE_image_partial_update_collect_changes(image, partial_update_user); EXPECT_EQ(result, ePartialUpdateCollectResult::NoChangesDetected); @@ -299,10 +299,10 @@ TEST_F(ImagePartialUpdateTest, sequential_mark_region) PartialUpdateRegion changed_region; ePartialUpdateIterResult iter_result; iter_result = BKE_image_partial_update_get_next_change(partial_update_user, &changed_region); - EXPECT_EQ(iter_result, PARTIAL_UPDATE_ITER_CHANGE_AVAILABLE); + EXPECT_EQ(iter_result, ePartialUpdateIterResult::ChangeAvailable); EXPECT_EQ(BLI_rcti_inside_rcti(&changed_region.region, ®ion), true); iter_result = BKE_image_partial_update_get_next_change(partial_update_user, &changed_region); - EXPECT_EQ(iter_result, PARTIAL_UPDATE_ITER_FINISHED); + EXPECT_EQ(iter_result, ePartialUpdateIterResult::Finished); result = BKE_image_partial_update_collect_changes(image, partial_update_user); EXPECT_EQ(result, ePartialUpdateCollectResult::NoChangesDetected); @@ -322,10 +322,10 @@ TEST_F(ImagePartialUpdateTest, sequential_mark_region) PartialUpdateRegion changed_region; ePartialUpdateIterResult iter_result; iter_result = BKE_image_partial_update_get_next_change(partial_update_user, &changed_region); - EXPECT_EQ(iter_result, PARTIAL_UPDATE_ITER_CHANGE_AVAILABLE); + EXPECT_EQ(iter_result, ePartialUpdateIterResult::ChangeAvailable); EXPECT_EQ(BLI_rcti_inside_rcti(&changed_region.region, ®ion), true); iter_result = BKE_image_partial_update_get_next_change(partial_update_user, &changed_region); - EXPECT_EQ(iter_result, PARTIAL_UPDATE_ITER_FINISHED); + EXPECT_EQ(iter_result, ePartialUpdateIterResult::Finished); result = BKE_image_partial_update_collect_changes(image, partial_update_user); EXPECT_EQ(result, ePartialUpdateCollectResult::NoChangesDetected); @@ -355,7 +355,7 @@ TEST_F(ImagePartialUpdateTest, mark_multiple_chunks) PartialUpdateRegion changed_region; int num_chunks_found = 0; while (BKE_image_partial_update_get_next_change(partial_update_user, &changed_region) == - PARTIAL_UPDATE_ITER_CHANGE_AVAILABLE) { + ePartialUpdateIterResult::ChangeAvailable) { BLI_rcti_isect(&changed_region.region, ®ion, nullptr); num_chunks_found++; } @@ -383,7 +383,7 @@ TEST_F(ImagePartialUpdateTest, iterator) /* Check tiles. */ int num_tiles_found = 0; - while (changes.get_next_change() == PARTIAL_UPDATE_ITER_CHANGE_AVAILABLE) { + while (changes.get_next_change() == ePartialUpdateIterResult::ChangeAvailable) { BLI_rcti_isect(&changes.changed_region.region, ®ion, nullptr); num_tiles_found++; } -- cgit v1.2.3