aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChien Yang <[email protected]>2006-10-06 22:00:09 +0000
committerChien Yang <[email protected]>2006-10-06 22:00:09 +0000
commita1601b3d1b38533127ce290aaf5e197f002748d5 (patch)
treeeb9c4b73820e402c992f8269c6d8755bdc0bde22
parent08d704b54c0dd01508b64338dea63b8f8f0fc78d (diff)
Remove the bit of VC 64bit compilation warning
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@715 ba19aa83-45c5-6ac9-afd3-db810772062c
-rw-r--r--src/native/ogl/Attributes.c2
-rw-r--r--src/native/ogl/GLSLShaderProgram.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/native/ogl/Attributes.c b/src/native/ogl/Attributes.c
index 4439524..2538bc4 100644
--- a/src/native/ogl/Attributes.c
+++ b/src/native/ogl/Attributes.c
@@ -485,7 +485,7 @@ void JNICALL Java_javax_media_j3d_NativePipeline_setLightEnables(
#endif
for (i=0; i<nlights; i++) {
- if (enable_mask & (1L<<i)) {
+ if (enable_mask & ((long)(1<<i))) {
glEnable(GL_LIGHT0 + i);
}
else {
diff --git a/src/native/ogl/GLSLShaderProgram.c b/src/native/ogl/GLSLShaderProgram.c
index 26c19f6..1196b16 100644
--- a/src/native/ogl/GLSLShaderProgram.c
+++ b/src/native/ogl/GLSLShaderProgram.c
@@ -755,7 +755,7 @@ Java_javax_media_j3d_NativePipeline_lookupGLSLShaderAttrNames(
* Issue 247 - we need to workaround an ATI bug where they erroneously
* report individual elements of arrays rather than the array itself
*/
- len = strlen(name);
+ len = (int) strlen(name);
if (len >= 3 && name[len-1] == ']') {
if (strcmp(&name[len-3], "[0]") == 0) {
/* fprintf(stderr, "**** changing \"%s\" ", name); */