Index: liboslcomp/oslcomp.cpp |
=================================================================== |
--- liboslcomp/oslcomp.cpp (revision 542) |
+++ liboslcomp/oslcomp.cpp (working copy) |
@@ -482,7 +482,6 @@ |
return; |
} |
- // FIXME -- remove the hard-coded version! |
oso ("OpenShadingLanguage %d.%02d\n", |
OSO_FILE_VERSION_MAJOR, OSO_FILE_VERSION_MINOR); |
oso ("# Compiled by oslc %s\n", OSL_LIBRARY_VERSION_STRING); |
@@ -650,7 +649,8 @@ |
// Now read lines up to and including the file we want. |
char buf[10240]; |
while (m_last_sourceline < line) { |
- fgets (buf, sizeof(buf), m_sourcefile); |
+ if (!fgets (buf, sizeof(buf), m_sourcefile)) |
+ ASSERT (0 && "line not found in source file"); |
++m_last_sourceline; |
} |
@@ -1014,7 +1014,7 @@ |
// Loop through all the op's arguments, see if one matches sym |
for (int i = 0; i < op.nargs(); ++i) |
if (m_opargs[i+op.firstarg()] == sym && |
- (read && op.argread(i)) || (write && op.argwrite(i))) |
+ ((read && op.argread(i)) || (write && op.argwrite(i)))) |
return true; |
return false; |
} |