Set the default wrap behavior to wrap for image upscale, too

This commit is contained in:
Pavel Krajcevski 2013-09-18 18:00:59 -04:00
parent 9acd9db7b3
commit 4135e38f22
2 changed files with 4 additions and 4 deletions

View file

@ -69,7 +69,7 @@ class Image {
~Image(); ~Image();
void BilinearUpscale(uint32 xtimes, uint32 ytimes, void BilinearUpscale(uint32 xtimes, uint32 ytimes,
EWrapMode wrapMode = eWrapMode_Clamp); EWrapMode wrapMode = eWrapMode_Wrap);
void ChangeBitDepth(const uint8 (&depths)[4]); void ChangeBitDepth(const uint8 (&depths)[4]);
void ExpandTo8888(); void ExpandTo8888();

View file

@ -131,7 +131,7 @@ TEST(Image, BilinearUpscale) {
} }
PVRTCC::Image img(4, 4, pxs); PVRTCC::Image img(4, 4, pxs);
img.BilinearUpscale(1, 1); img.BilinearUpscale(1, 1, PVRTCC::eWrapMode_Clamp);
EXPECT_EQ(img.GetWidth(), static_cast<uint32>(8)); EXPECT_EQ(img.GetWidth(), static_cast<uint32>(8));
EXPECT_EQ(img.GetHeight(), static_cast<uint32>(8)); EXPECT_EQ(img.GetHeight(), static_cast<uint32>(8));
@ -171,7 +171,7 @@ TEST(Image, BilinearUpscaleMaintainsPixels) {
} }
PVRTCC::Image img(w, h, pxs); PVRTCC::Image img(w, h, pxs);
img.BilinearUpscale(2, 2); img.BilinearUpscale(2, 2, PVRTCC::eWrapMode_Clamp);
EXPECT_EQ(img.GetWidth(), w << 2); EXPECT_EQ(img.GetWidth(), w << 2);
EXPECT_EQ(img.GetHeight(), h << 2); EXPECT_EQ(img.GetHeight(), h << 2);
@ -199,7 +199,7 @@ TEST(Image, NonuniformBilinearUpscale) {
} }
PVRTCC::Image img(kHeight, kWidth, pxs); PVRTCC::Image img(kHeight, kWidth, pxs);
img.BilinearUpscale(2, 1); img.BilinearUpscale(2, 1, PVRTCC::eWrapMode_Clamp);
EXPECT_EQ(img.GetWidth(), static_cast<uint32>(kWidth << 2)); EXPECT_EQ(img.GetWidth(), static_cast<uint32>(kWidth << 2));
EXPECT_EQ(img.GetHeight(), static_cast<uint32>(kHeight << 1)); EXPECT_EQ(img.GetHeight(), static_cast<uint32>(kHeight << 1));