1
1
// ////////////////////////////////////////////////////////////////////////
2
2
//
3
- // Copyright (c) 2012, Image Engine Design Inc. All rights reserved.
3
+ // Copyright (c) 2012-2014 , Image Engine Design Inc. All rights reserved.
4
4
//
5
5
// Redistribution and use in source and binary forms, with or without
6
6
// modification, are permitted provided that the following conditions are
@@ -49,7 +49,7 @@ const DeepImageWriter::DeepImageWriterDescription<SHWDeepImageWriter> SHWDeepIma
49
49
50
50
SHWDeepImageWriter::SHWDeepImageWriter ()
51
51
: DeepImageWriter( " Writes 3delight SHW deep shadow file format." ),
52
- m_outputFile( 0 ), m_dtexCache( 0 ), m_dtexImage( 0 ), m_dtexPixel( 0 )
52
+ m_outputFile( 0 ), m_dtexCache( 0 ), m_dtexImage( 0 ), m_dtexPixel( 0 ), m_alphaOffset( 0 )
53
53
{
54
54
std::vector<std::string> channels ( 1 , " A" );
55
55
m_channelsParameter->setValue ( new StringVectorData ( channels ) );
@@ -60,7 +60,7 @@ SHWDeepImageWriter::SHWDeepImageWriter()
60
60
61
61
SHWDeepImageWriter::SHWDeepImageWriter ( const std::string &fileName )
62
62
: DeepImageWriter( " Writes 3delight SHW deep shadow file format." ),
63
- m_outputFile( 0 ), m_dtexCache( 0 ), m_dtexImage( 0 ), m_dtexPixel( 0 )
63
+ m_outputFile( 0 ), m_dtexCache( 0 ), m_dtexImage( 0 ), m_dtexPixel( 0 ), m_alphaOffset( 0 )
64
64
{
65
65
m_fileNameParameter->setTypedValue ( fileName );
66
66
@@ -164,7 +164,7 @@ void SHWDeepImageWriter::open()
164
164
throw InvalidArgumentException ( std::string ( " Tile size must be equal to or less than resolution." ) );
165
165
}
166
166
167
- if ( ( ( tileSize.x & ( tileSize.x - 1 ) ) != 0 ) || ( ( tileSize.x & ( tileSize.x - 1 ) ) != 0 ) )
167
+ if ( ( ( tileSize.x & ( tileSize.x - 1 ) ) != 0 ) || ( ( tileSize.y & ( tileSize.y - 1 ) ) != 0 ) )
168
168
{
169
169
throw InvalidArgumentException ( std::string ( " Tile width and height must be a power of two." ) );
170
170
}
0 commit comments