yuzu/FasTC
1
0
Fork 0
mirror of https://github.com/yuzu-emu/FasTC.git synced 2025-01-10 00:05:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compiler errors with MSVC (and honestly, other compilers should catch them, too.)

Browse source
This commit is contained in:
Pavel Krajcevski 2013-09-25 15:06:45 -04:00
parent ed12d53cd4
commit a587899048
1 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
PVRTCEncoder/src/Compressor.cpp
View file

@ -92,7 +92,7 @@ namespace PVRTCC {
} }
template <typename T> template <typename T>
static T Lookup(const T *vals, static T Lookup(const ::std::vector<T> &vals,
uint32 x, uint32 y, uint32 x, uint32 y,
uint32 width, uint32 height, uint32 width, uint32 height,
const EWrapMode wrapMode) { const EWrapMode wrapMode) {
@ -167,7 +167,8 @@ namespace PVRTCC {
img.DebugOutput("Reconstruction"); img.DebugOutput("Reconstruction");
// Compute difference... // Compute difference...
int16 difference[dcj.height * dcj.width * 4]; ::std::vector<int16> difference;
difference.reserve(dcj.height * dcj.width * 4);
for(uint32 j = 0; j < dcj.height; j++) { for(uint32 j = 0; j < dcj.height; j++) {
for(uint32 i = 0; i < dcj.width; i++) { for(uint32 i = 0; i < dcj.width; i++) {
for(uint32 c = 0; c < 4; c++) { for(uint32 c = 0; c < 4; c++) {
@ -181,8 +182,13 @@ namespace PVRTCC {
// Go over the 7x7 texel blocks and extract bounding box diagonals for each // Go over the 7x7 texel blocks and extract bounding box diagonals for each
// block. We should be able to choose which diagonal we want... // block. We should be able to choose which diagonal we want...
const uint32 kKernelSz = 7; const uint32 kKernelSz = 7;
int16 maxDiff[dcj.height * dcj.width / 4]; ::std::vector<int16> maxDiff;
int16 minDiff[dcj.height * dcj.width / 4]; ::std::vector<int16> minDiff;
const uint32 kNumBlockChannels = dcj.height * dcj.width / 4;
maxDiff.reserve(kNumBlockChannels);
minDiff.reserve(kNumBlockChannels);
for(uint32 j = 2; j < dcj.height; j += 4) { for(uint32 j = 2; j < dcj.height; j += 4) {
for(uint32 i = 2; i < dcj.width; i += 4) { for(uint32 i = 2; i < dcj.width; i += 4) {
const uint32 startX = i - (kKernelSz / 2); const uint32 startX = i - (kKernelSz / 2);
@ -192,7 +198,8 @@ namespace PVRTCC {
int32 neg = 0; int32 neg = 0;
for(uint32 y = startY; y < startY + kKernelSz; y++) { for(uint32 y = startY; y < startY + kKernelSz; y++) {
for(uint32 x = startX; x < startX + kKernelSz; x++) { for(uint32 x = startX; x < startX + kKernelSz; x++) {
int16 val = Lookup(difference, x*4 + c, y, dcj.width*4, dcj.height, wrapMode); int16 val = Lookup(difference, x*4 + c, y,
dcj.width*4, dcj.height, wrapMode);
if(val > 0) { if(val > 0) {
pos += val; pos += val;
} else { } else {
@ -202,7 +209,7 @@ namespace PVRTCC {
} }
uint32 blockIdx = ((j-2)/4) * dcj.width + (i-2) + c; uint32 blockIdx = ((j-2)/4) * dcj.width + (i-2) + c;
assert(blockIdx < (dcj.width * dcj.height) / 4); assert(blockIdx < kNumBlockChannels);
if(pos > -neg) { if(pos > -neg) {
maxDiff[blockIdx] = pos; maxDiff[blockIdx] = pos;
minDiff[blockIdx] = 0; minDiff[blockIdx] = 0;
@ -222,11 +229,12 @@ namespace PVRTCC {
for(uint32 j = 0; j < dcj.height / 4; j++) { for(uint32 j = 0; j < dcj.height / 4; j++) {
for(uint32 i = 0; i < dcj.width / 4; i++) { for(uint32 i = 0; i < dcj.width / 4; i++) {
for(uint32 c = 0; c < 4; c++) { for(uint32 c = 0; c < 4; c++) {
const uint32 cIdx = j*dcj.width/4 + i*4 + c;
uint8 &a = imgA(i, j).Component(c); uint8 &a = imgA(i, j).Component(c);
a = Clamp<int16>(a + maxDiff[j*dcj.width/4 + i*4 + c], 0, 255); a = static_cast<uint8>(Clamp<int16>(a + maxDiff[cIdx], 0, 255));
uint8 &b = imgB(i, j).Component(c); uint8 &b = imgB(i, j).Component(c);
b = Clamp<int16>(b + minDiff[j*dcj.width/4 + i*4 + c], 0, 255); b = static_cast<uint8>(Clamp<int16>(b + minDiff[cIdx], 0, 255));
} }
} }
} }