Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compile warnings from the latest merges #526

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions OpenEXR/IlmImfTest/testLargeDataWindowOffsets.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,8 @@ setupBuffer (const Header& hdr, // header to grab datawindow from

const char * write_ptr = writing ? &writingBuffer[0] : &readingBuffer[0];
// fill with random halfs, casting to floats for float channels
int chan=0;
for (int i=0;i<samples;i++)
size_t chan=0;
for (size_t i=0;i<samples;i++)
{
unsigned short int values = (unsigned short int) floor((double(rand())/double(RAND_MAX))*65535.0);
half v;
Expand Down Expand Up @@ -229,7 +229,7 @@ setupBuffer (const Header& hdr, // header to grab datawindow from
int64_t bytes_per_row = bytes_per_pixel*width;

const char* offset = ( writing ? writingBuffer.data() : readingBuffer.data() );
for (int i=0;i<activechans;i++)
for (size_t i=0;i<activechans;i++)
{
PixelType type = pt==NULL ? IMF::HALF : pt[i];

Expand Down Expand Up @@ -351,7 +351,7 @@ test (int testCount)
for(int i = 0 ; i < testCount ; ++i )
{
FrameBuffer writeFrameBuf;
const char** channels;
const char** channels=NULL;
switch( rand()% 4)
{
case 0 : channels = rgb; break;
Expand Down Expand Up @@ -422,4 +422,3 @@ testLargeDataWindowOffsets (const std::string & tempDir)

cout << "ok\n" << endl;
}

4 changes: 3 additions & 1 deletion OpenEXR_Viewers/playexr/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@
#include <string>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#ifndef _WIN32
# include <unistd.h>
#endif
#include <cstring>

using namespace std;
Expand Down