Compile fixes for Win32
This commit is contained in:
@@ -61,8 +61,8 @@ void Object::build(const iff::Chunk_list &data)
|
||||
clips_.clear();
|
||||
surfaces_.clear();
|
||||
layers_.clear();
|
||||
comment_.clear();
|
||||
description_.clear();
|
||||
comment_ = "";
|
||||
description_ = "";
|
||||
|
||||
osg::notify(osg::INFO) << "INFO: lwosg::Object: scanning clips\n";
|
||||
scan_clips(data);
|
||||
|
||||
@@ -91,7 +91,7 @@ namespace iff
|
||||
IP_TMP Chunk *GenericParser<Iter>::parse_chunk(Iter &it, const std::string &context)
|
||||
{
|
||||
std::string tag;
|
||||
for (int i=0; i<4; ++i) tag.push_back(*(it++));
|
||||
for (int i=0; i<4; ++i) tag += *(it++);
|
||||
unsigned int len = ((static_cast<unsigned int>(*(it++)) & 0xFF) << 24) |
|
||||
((static_cast<unsigned int>(*(it++)) & 0xFF) << 16) |
|
||||
((static_cast<unsigned int>(*(it++)) & 0xFF) << 8) |
|
||||
|
||||
@@ -589,7 +589,7 @@ namespace lwo2
|
||||
if (tag == "BLOK") {
|
||||
FORM::SURF::BLOK *chk = new FORM::SURF::BLOK;
|
||||
std::string hid;
|
||||
for (Iter tempit=it; tempit<(it+4); ++tempit) hid.push_back(*tempit);
|
||||
for (Iter tempit=it; tempit<(it+4); ++tempit) hid += *tempit;
|
||||
chk->header = parse_subchunk(it, "FORM::SURF::BLOK");
|
||||
while (it < end) {
|
||||
chk->attributes.push_back(parse_subchunk(it, "FORM::SURF::BLOK::" + hid));
|
||||
@@ -891,7 +891,7 @@ namespace lwo2
|
||||
LP_TMP iff::Chunk *Parser<Iter>::parse_subchunk(Iter &it, const std::string &context)
|
||||
{
|
||||
std::string tag;
|
||||
for (int i=0; i<4; ++i) tag.push_back(*(it++));
|
||||
for (int i=0; i<4; ++i) tag += *(it++);
|
||||
unsigned int len = ((static_cast<unsigned int>(*(it++)) & 0xFF) << 8) |
|
||||
(static_cast<unsigned int>(*(it++)) & 0xFF);
|
||||
os() << "DEBUG INFO: lwo2parser: reading subchunk " << tag << ", length = " << len << ", context = " << context << "\n";
|
||||
|
||||
@@ -79,7 +79,7 @@ S0 read_S0(Iter &it)
|
||||
{
|
||||
S0 value;
|
||||
while (*it) {
|
||||
value.push_back(*(it++));
|
||||
value += *(it++);
|
||||
}
|
||||
++it;
|
||||
if (value.length() % 2 == 0) ++it;
|
||||
|
||||
Reference in New Issue
Block a user