mirrors-yuzu-emu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC synced 2024-11-26 11:07:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Squelch some compiler warnings.

Browse source
This commit is contained in:
Pavel Krajcevski 2013-09-27 17:38:36 -04:00
parent dcf389d346
commit 157295efa3
2 changed files with 14 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/src/CompressedImage.cpp
View file

@ -90,6 +90,7 @@ CompressedImage &CompressedImage::operator=(const CompressedImage &other) {
m_RGBAData = new uint32[GetWidth() * GetHeight()];
memcpy(m_RGBAData, other.m_RGBAData, sizeof(uint32) * GetWidth() * GetHeight());
}
return *this;
}
CompressedImage::~CompressedImage() {

36
PVRTCEncoder/src/Compressor.cpp
View file

@ -95,36 +95,26 @@ namespace PVRTCC {
int32 x, int32 y,
uint32 width, uint32 height,
const EWrapMode wrapMode) {
while(x >= width) {
if(wrapMode == eWrapMode_Wrap) {
x -= width;
} else {
x = width - 1;
}
int32 w = static_cast<int32>(width);
int32 h = static_cast<int32>(height);
assert(w >= 0);
assert(h >= 0);
while(x >= w) {
x = (wrapMode == eWrapMode_Wrap)? x - w : w - 1;
}
while(x < 0) {
if(wrapMode == eWrapMode_Wrap) {
x += width;
} else {
x = 0;
}
x = (wrapMode == eWrapMode_Wrap)? x + w : 0;
}
while(y >= height) {
if(wrapMode == eWrapMode_Wrap) {
y -= height;
} else {
y = height - 1;
}
while(y >= h) {
y = (wrapMode == eWrapMode_Wrap)? y - h : h - 1;
}
while(y < 0) {
if(wrapMode == eWrapMode_Wrap) {
y += height;
} else {
y = 0;
}
y = (wrapMode == eWrapMode_Wrap)? y + h : 0;
}
return img(x, y);
@ -177,7 +167,7 @@ namespace PVRTCC {
// Go over the 7x7 texel blocks and extract bounding box diagonals for each
// block. We should be able to choose which diagonal we want...
const uint32 kKernelSz = 7;
const int32 kKernelSz = 7;
Image imgA = downscaled;
Image imgB = downscaled;