1
0
Fork 0

Fixing a bunch of compiler warnings.

This commit is contained in:
Henrik Hautakoski 2018-05-12 19:31:34 +02:00
parent ede60da544
commit ebd598b2b0
4 changed files with 11 additions and 11 deletions

View file

@ -19,7 +19,7 @@ void Image::create(unsigned width, unsigned height, const Color& color)
m_pixels.resize(m_size.x * m_size.y * (getBpp() / 8));
for(int i = 0; i < m_pixels.size(); i += 4) {
for(size_t i = 0; i < m_pixels.size(); i += 4) {
m_pixels[i+0] = color.r;
m_pixels[i+1] = color.g;
@ -42,7 +42,7 @@ void Image::create(PixelFormat format, unsigned width, unsigned height, const Co
m_pixels.resize(m_size.x * m_size.y * (getBpp() / 8));
if (getBpp() == 32) {
for(int i = 0; i < m_pixels.size(); i += 4) {
for(size_t i = 0; i < m_pixels.size(); i += 4) {
m_pixels[i+0] = color.r;
m_pixels[i+1] = color.g;
@ -50,14 +50,14 @@ void Image::create(PixelFormat format, unsigned width, unsigned height, const Co
m_pixels[i+3] = color.a;
}
} else if (getBpp() == 24) {
for(int i = 0; i < m_pixels.size(); i += 3) {
for(size_t i = 0; i < m_pixels.size(); i += 3) {
m_pixels[i+0] = color.r;
m_pixels[i+1] = color.g;
m_pixels[i+2] = color.b;
}
} else {
for(int i = 0; i < m_pixels.size(); i += 1) {
for(size_t i = 0; i < m_pixels.size(); i += 1) {
m_pixels[i] = color.a;
}
}
@ -163,7 +163,7 @@ Color Image::getPixel(unsigned x, unsigned y) const
if (m_format == PixelFormat::PF_RGBA) {
c.a = base[3];
} else {
c.a = 1.0f;
c.a = 255;
}
}
// Alpha, single channel format.
@ -178,12 +178,12 @@ void Image::flipY()
unsigned int stride = getStride();
// The quick and dirty way :)
for(int y = 0; y < m_size.y / 2; y++) {
for(size_t y = 0; y < m_size.y / 2; y++) {
int row0 = y * stride;
int row1 = (m_size.y - y - 1) * stride;
for(int x = 0; x < stride; x++) {
for(size_t x = 0; x < stride; x++) {
unsigned char tmp = m_pixels[row0 + x];
m_pixels[row0 + x] = m_pixels[row1 + x];
m_pixels[row1 + x] = tmp;