diff options
| author | Chien Yang <[email protected]> | 2006-10-06 18:54:34 +0000 |
|---|---|---|
| committer | Chien Yang <[email protected]> | 2006-10-06 18:54:34 +0000 |
| commit | 08d704b54c0dd01508b64338dea63b8f8f0fc78d (patch) | |
| tree | 2eb48ed2e3092dbce9881def8190dca69c11c9c1 /src/native/ogl/Canvas3D.c | |
| parent | 2162c6f30fe20c4aae00e717b087c5383accf09e (diff) | |
1) Fixed a logic bug in earlier putback
2) Fixed Issue 352 : VC compiler generates warning on Windows AMD64 build
3) Clean up build script and code to eliminate warning from VC compiler.
git-svn-id: https://svn.java.net/svn/j3d-core~svn/trunk@714 ba19aa83-45c5-6ac9-afd3-db810772062c
Diffstat (limited to 'src/native/ogl/Canvas3D.c')
| -rw-r--r-- | src/native/ogl/Canvas3D.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/native/ogl/Canvas3D.c b/src/native/ogl/Canvas3D.c index 026d17d..c8a8db1 100644 --- a/src/native/ogl/Canvas3D.c +++ b/src/native/ogl/Canvas3D.c @@ -1000,7 +1000,7 @@ LONG WINAPI WndProc( HWND hWnd, UINT msg, /* This function handles any messages that we didn't. */ /* (Which is most messages) It belongs to the OS. */ - return DefWindowProc( hWnd, msg, wParam, lParam ); + return (LONG) DefWindowProc( hWnd, msg, wParam, lParam ); } #endif /*end of WIN32 */ @@ -1108,10 +1108,7 @@ jlong JNICALL Java_javax_media_j3d_NativePipeline_createNewContext( LPTSTR errString; jboolean result; PixelFormatInfo *PixelFormatInfoPtr = (PixelFormatInfo *)fbConfigListPtr; - int i; /* Fix for issue 76 */ - - /* fprintf(stderr, "Canvas3D_createNewContext: \n"); fprintf(stderr, "window 0x%x\n", window); @@ -1147,7 +1144,7 @@ jlong JNICALL Java_javax_media_j3d_NativePipeline_createNewContext( } } - if (SetPixelFormat(hdc, PixelFormatID, NULL)) { + if (!SetPixelFormat(hdc, PixelFormatID, NULL)) { printErrorMessage("Canvas3D_createNewContext: Failed in SetPixelFormat"); return 0; } |