]>
Commit | Line | Data |
---|---|---|
aa41c492 JB |
1 | --- OpenImageIO-oiio-f4d79c0/src/dpx.imageio/dpxinput.cpp.orig 2013-07-14 17:33:27.426142801 +0200 |
2 | +++ OpenImageIO-oiio-f4d79c0/src/dpx.imageio/dpxinput.cpp 2013-07-14 18:10:42.519382338 +0200 | |
3 | @@ -467,7 +467,7 @@ | |
4 | m_spec.attribute ("dpx:FilmEdgeCode", buf); | |
5 | ||
6 | tmpstr.clear (); | |
7 | - switch (m_dpx.header.Signal ()) { | |
8 | + switch ((int)m_dpx.header.Signal ()) { | |
9 | case dpx::kUndefined: | |
10 | tmpstr = "Undefined"; | |
11 | break; | |
c3e5ad97 JR |
12 | --- OpenImageIO-oiio-bcdad81/src/libOpenImageIO/imagebufalgo.cpp~ 2013-11-01 18:03:46.000000000 +0100 |
13 | +++ OpenImageIO-oiio-bcdad81/src/libOpenImageIO/imagebufalgo.cpp 2015-02-18 17:15:01.274966027 +0100 | |
14 | @@ -1063,9 +1063,9 @@ | |
15 | if (error) | |
16 | continue; // ignore errors | |
17 | // now, draw to our target surface | |
18 | - for (int j = 0; j < slot->bitmap.rows; ++j) { | |
19 | + for (unsigned int j = 0; j < slot->bitmap.rows; ++j) { | |
20 | int ry = y + j - slot->bitmap_top; | |
21 | - for (int i = 0; i < slot->bitmap.width; ++i) { | |
22 | + for (unsigned int i = 0; i < slot->bitmap.width; ++i) { | |
23 | int rx = x + i + slot->bitmap_left; | |
24 | float b = slot->bitmap.buffer[slot->bitmap.pitch*j+i] / 255.0f; | |
25 | R.getpixel (rx, ry, pixelcolor); |