Patch by Vladimír Marek (neuron), part of bugfix #5298
Solaris CC compiler choked on wrong .h prototypes for functions using 'const' arguments.
This commit is contained in:
4
extern/bFTGL/src/FTCharmap.cpp
vendored
4
extern/bFTGL/src/FTCharmap.cpp
vendored
@@ -44,13 +44,13 @@ bool FTCharmap::CharMap( FT_Encoding encoding)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
unsigned int FTCharmap::GlyphListIndex( unsigned int characterCode )
|
unsigned int FTCharmap::GlyphListIndex( const unsigned int characterCode )
|
||||||
{
|
{
|
||||||
return charMap.find( characterCode);
|
return charMap.find( characterCode);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
unsigned int FTCharmap::FontIndex( unsigned int characterCode )
|
unsigned int FTCharmap::FontIndex( const unsigned int characterCode )
|
||||||
{
|
{
|
||||||
return FT_Get_Char_Index( ftFace, characterCode);
|
return FT_Get_Char_Index( ftFace, characterCode);
|
||||||
}
|
}
|
||||||
|
@@ -138,7 +138,7 @@ bool GHOST_System::validWindow(GHOST_IWindow* window)
|
|||||||
|
|
||||||
|
|
||||||
GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
|
GHOST_TSuccess GHOST_System::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window,
|
||||||
bool stereoVisual)
|
const bool stereoVisual)
|
||||||
{
|
{
|
||||||
GHOST_TSuccess success = GHOST_kFailure;
|
GHOST_TSuccess success = GHOST_kFailure;
|
||||||
GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager")
|
GHOST_ASSERT(m_windowManager, "GHOST_System::beginFullScreen(): invalid window manager")
|
||||||
@@ -310,7 +310,7 @@ GHOST_TSuccess GHOST_System::exit()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, bool stereoVisual)
|
GHOST_TSuccess GHOST_System::createFullScreenWindow(GHOST_Window** window, const bool stereoVisual)
|
||||||
{
|
{
|
||||||
GHOST_TSuccess success;
|
GHOST_TSuccess success;
|
||||||
GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager")
|
GHOST_ASSERT(m_displayManager, "GHOST_System::createFullScreenWindow(): invalid display manager")
|
||||||
|
@@ -178,8 +178,8 @@ bool IK_QJacobianSolver::UpdateAngles(MT_Scalar& norm)
|
|||||||
bool IK_QJacobianSolver::Solve(
|
bool IK_QJacobianSolver::Solve(
|
||||||
IK_QSegment *root,
|
IK_QSegment *root,
|
||||||
std::list<IK_QTask*> tasks,
|
std::list<IK_QTask*> tasks,
|
||||||
MT_Scalar,
|
const MT_Scalar,
|
||||||
int max_iterations
|
const int max_iterations
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
//double dt = analyze_time();
|
//double dt = analyze_time();
|
||||||
|
@@ -529,7 +529,7 @@ bool RAS_OpenGLRasterizer::Stereo()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void RAS_OpenGLRasterizer::SetEye(StereoEye eye)
|
void RAS_OpenGLRasterizer::SetEye(const StereoEye eye)
|
||||||
{
|
{
|
||||||
m_curreye = eye;
|
m_curreye = eye;
|
||||||
switch (m_stereomode)
|
switch (m_stereomode)
|
||||||
@@ -574,7 +574,7 @@ RAS_IRasterizer::StereoEye RAS_OpenGLRasterizer::GetEye()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void RAS_OpenGLRasterizer::SetEyeSeparation(float eyeseparation)
|
void RAS_OpenGLRasterizer::SetEyeSeparation(const float eyeseparation)
|
||||||
{
|
{
|
||||||
m_eyeseparation = eyeseparation;
|
m_eyeseparation = eyeseparation;
|
||||||
m_seteyesep = true;
|
m_seteyesep = true;
|
||||||
@@ -585,7 +585,7 @@ float RAS_OpenGLRasterizer::GetEyeSeparation()
|
|||||||
return m_eyeseparation;
|
return m_eyeseparation;
|
||||||
}
|
}
|
||||||
|
|
||||||
void RAS_OpenGLRasterizer::SetFocalLength(float focallength)
|
void RAS_OpenGLRasterizer::SetFocalLength(const float focallength)
|
||||||
{
|
{
|
||||||
m_focallength = focallength;
|
m_focallength = focallength;
|
||||||
m_setfocallength = true;
|
m_setfocallength = true;
|
||||||
|
Reference in New Issue
Block a user