From Gideon May, compile fixes for OSX.

This commit is contained in:
Robert Osfield
2005-11-07 11:14:23 +00:00
parent 4ea3956fda
commit efd96108fb
6 changed files with 14 additions and 9 deletions

View File

@@ -222,7 +222,7 @@ void ApplicationUsage::writeEnvironmentSettings(std::ostream& output)
{
std::string::size_type len = citr->first.find_first_of("\n\r\t ");
if (len == std::string::npos) len = citr->first.size();
maxNumCharsInOptions = maximum(maxNumCharsInOptions,len);
maxNumCharsInOptions = maximum(maxNumCharsInOptions,(unsigned int) len);
}
unsigned int optionPos = 2;

View File

@@ -152,7 +152,12 @@ bool CameraNode_readLocalData(Object& obj, Input& fr)
if (fr.matchSequence("internalFormat %i"))
{
fr[1].getUInt(attachment._internalFormat);
// In their infinite wisdom, the Apple engineers changed the type
// of GLenum from 'unsigned int' to 'unsigned long', thus breaking
// the call by reference of getUInt.
unsigned int format;
fr[1].getUInt(format);
attachment._internalFormat = format;
fr += 2;
localAdvance = true;
}

View File

@@ -13,7 +13,7 @@
#include <osg/Notify>
#include <osg/Image>
#include <string>
#include <Quicktime/Quicktime.h>
#include <QuickTime/QuickTime.h>
namespace osg {
@@ -54,4 +54,4 @@ namespace osg {
} // namespace
#endif
#endif

View File

@@ -8,7 +8,7 @@
*/
#include <osg/Notify>
#include <Quicktime/Quicktime.h>
#include <QuickTime/QuickTime.h>
#include <Carbon/Carbon.h>
#include "QTUtils.h"
@@ -78,4 +78,4 @@ namespace osgQuicktime {
} // namespace
} // namespace

View File

@@ -8,7 +8,7 @@
*/
#include <Carbon/Carbon.h>
#include <Quicktime/Quicktime.h>
#include <QuickTime/QuickTime.h>
namespace osgQuicktime {
@@ -17,4 +17,4 @@ namespace osgQuicktime {
OSStatus MakeFSSpecFromPath(const char* path, FSSpec* spec);
OSStatus MakeMovieFromPath(const char* path, Movie* movie);
}
}

View File

@@ -17,7 +17,7 @@
# define SEEK_SET 0
#endif
#include <Carbon/Carbon.h>
#include <Quicktime/Quicktime.h>
#include <QuickTime/QuickTime.h>
#include "QTtexture.h"
#include "QuicktimeImageStream.h"