Code comments, log strings and some variable spell fixes.
This commit is contained in:
committed by
Robert Osfield
parent
300ba7aa02
commit
2ade061ced
@@ -275,16 +275,16 @@ bool osgDB::setCurrentWorkingDirectory( const std::string &newCurrentWorkingDire
|
||||
void osgDB::convertStringPathIntoFilePathList(const std::string& paths,FilePathList& filepath)
|
||||
{
|
||||
#if defined(WIN32) && !defined(__CYGWIN__)
|
||||
char delimitor = ';';
|
||||
char delimiter = ';';
|
||||
#else
|
||||
char delimitor = ':';
|
||||
char delimiter = ':';
|
||||
#endif
|
||||
|
||||
if (!paths.empty())
|
||||
{
|
||||
std::string::size_type start = 0;
|
||||
std::string::size_type end;
|
||||
while ((end = paths.find_first_of(delimitor,start))!=std::string::npos)
|
||||
while ((end = paths.find_first_of(delimiter,start))!=std::string::npos)
|
||||
{
|
||||
filepath.push_back(std::string(paths,start,end-start));
|
||||
start = end+1;
|
||||
@@ -988,7 +988,7 @@ bool osgDB::containsCurrentWorkingDirectoryReference(const FilePathList& paths)
|
||||
// The Carbon version is noticeably longer.
|
||||
// Unfortunately, the Cocoa version requires -lobjc to be
|
||||
// linked in when creating an executable.
|
||||
// Rumor is that this will be done autmatically in gcc 3.5/Tiger,
|
||||
// Rumor is that this will be done automatically in gcc 3.5/Tiger,
|
||||
// but for now, this will cause a lot of headaches for people
|
||||
// who aren't familiar with this concept, so the Carbon version
|
||||
// is preferable.
|
||||
|
||||
@@ -576,7 +576,7 @@ void OutputStream::writeImage( const osg::Image* img )
|
||||
std::string encodedData;
|
||||
e.encode((char*)img_itr.data(), img_itr.size(), encodedData);
|
||||
// Each set of data is written into a separate string so we can
|
||||
// distiguish between main data and all mipmap levels, so writing
|
||||
// distinguish between main data and all mipmap levels, so writing
|
||||
// mipmap size is not required for ASCII mode.
|
||||
writeWrappedString(encodedData);
|
||||
}
|
||||
@@ -781,7 +781,7 @@ void OutputStream::start( OutputIterator* outIterator, OutputStream::WriteType t
|
||||
}
|
||||
|
||||
// From SOVERSION 98, start to support binary begin/end brackets so we can easily ignore
|
||||
// errors and unsupport classes, enabling the attribute bit
|
||||
// errors and unsupported classes, enabling the attribute bit
|
||||
if ( _useRobustBinaryFormat )
|
||||
{
|
||||
outIterator->setSupportBinaryBrackets( true );
|
||||
|
||||
@@ -434,7 +434,7 @@ Registry::Registry()
|
||||
addFileExtensionAlias("fnt", "freetype"); // Windows bitmap fonts
|
||||
addFileExtensionAlias("text3d", "freetype"); // use 3D Font instead of 2D Font
|
||||
|
||||
// wont't add type1 and type2 until resolve extension collision with Performer binary and ascii files.
|
||||
// won't add type1 and type2 until resolve extension collision with Performer binary and ascii files.
|
||||
// addFileExtensionAlias("pfb", "freetype"); // type1 binary
|
||||
// addFileExtensionAlias("pfa", "freetype"); // type2 ascii
|
||||
|
||||
|
||||
Reference in New Issue
Block a user