From 627a27581688e0b12300370c751e3823b1afe44b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Fri, 6 Jul 2012 01:58:09 +0200
Subject: C code: remove warnings
---
.../native/libav/jogamp_opengl_util_av_impl_FFMPEGMediaPlayer.c | 6 +++---
src/nativewindow/native/x11/Xmisc.c | 8 ++++----
src/newt/native/X11Display.c | 8 ++++----
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/jogl/native/libav/jogamp_opengl_util_av_impl_FFMPEGMediaPlayer.c b/src/jogl/native/libav/jogamp_opengl_util_av_impl_FFMPEGMediaPlayer.c
index 647de15ef..7fb64dade 100644
--- a/src/jogl/native/libav/jogamp_opengl_util_av_impl_FFMPEGMediaPlayer.c
+++ b/src/jogl/native/libav/jogamp_opengl_util_av_impl_FFMPEGMediaPlayer.c
@@ -572,7 +572,7 @@ JNIEXPORT jint JNICALL Java_jogamp_opengl_util_av_impl_FFMPEGMediaPlayer_readNex
(JNIEnv *env, jobject instance, jlong ptr, jlong jProcAddrGLTexSubImage2D, jint texTarget, jint texFmt, jint texType)
{
FFMPEGToolBasicAV_t *pAV = (FFMPEGToolBasicAV_t *)((void *)((intptr_t)ptr));
- PFNGLTEXSUBIMAGE2DPROC procAddrGLTexSubImage2D = (PFNGLTEXSUBIMAGE2DPROC) jProcAddrGLTexSubImage2D;
+ PFNGLTEXSUBIMAGE2DPROC procAddrGLTexSubImage2D = (PFNGLTEXSUBIMAGE2DPROC) (intptr_t)jProcAddrGLTexSubImage2D;
jint res = 0; // 1 - audio, 2 - video
AVPacket packet;
@@ -694,10 +694,10 @@ JNIEXPORT jint JNICALL Java_jogamp_opengl_util_av_impl_FFMPEGMediaPlayer_seek0
if(pos1 < pos0) {
flags |= AVSEEK_FLAG_BACKWARD;
}
- fprintf(stderr, "SEEK: pre : u %d, p %d -> u %d, p %d\n", pos0, pts0, pos1, pts1);
+ fprintf(stderr, "SEEK: pre : u %ld, p %ld -> u %ld, p %ld\n", pos0, pts0, pos1, pts1);
sp_av_seek_frame(pAV->pFormatCtx, pAV->vid, pts1, flags);
pAV->vPTS = pAV->pVFrame->pkt_pts * my_av_q2i32(1000, pAV->pVStream->time_base);
- fprintf(stderr, "SEEK: post : u %d, p %d\n", pAV->vPTS, pAV->pVFrame->pkt_pts);
+ fprintf(stderr, "SEEK: post : u %ld, p %ld\n", pAV->vPTS, pAV->pVFrame->pkt_pts);
return pAV->vPTS;
}
diff --git a/src/nativewindow/native/x11/Xmisc.c b/src/nativewindow/native/x11/Xmisc.c
index 5cbf5c04a..21771c9aa 100644
--- a/src/nativewindow/native/x11/Xmisc.c
+++ b/src/nativewindow/native/x11/Xmisc.c
@@ -188,8 +188,8 @@ static int x11ErrorHandler(Display *dpy, XErrorEvent *e)
XGetErrorText(dpy, e->error_code, errCodeStr, sizeof(errCodeStr));
fprintf(stderr, "Info: Nativewindow X11 Error (Thread: %s): %d - %s, dpy %p, id %x, # %d: %d:%d %s\n",
- threadName, e->error_code, errCodeStr, e->display, e->resourceid, e->serial,
- e->request_code, e->minor_code, reqCodeStr);
+ threadName, e->error_code, errCodeStr, e->display, (int)e->resourceid, (int)e->serial,
+ (int)e->request_code, (int)e->minor_code, reqCodeStr);
if( errorHandlerDebug ) {
(*jniEnv)->CallStaticVoidMethod(jniEnv, X11UtilClazz, dumpStackID);
@@ -198,8 +198,8 @@ static int x11ErrorHandler(Display *dpy, XErrorEvent *e)
if(errorHandlerThrowException) {
if(NULL != jniEnv) {
NativewindowCommon_throwNewRuntimeException(jniEnv, "Nativewindow X11 Error (Thread: %s): %d - %s, dpy %p, id %x, # %d: %d:%d %s\n",
- threadName, e->error_code, errCodeStr, e->display, e->resourceid, e->serial,
- e->request_code, e->minor_code, reqCodeStr);
+ threadName, e->error_code, errCodeStr, e->display, (int)e->resourceid, (int)e->serial,
+ (int)e->request_code, (int)e->minor_code, reqCodeStr);
} else {
fprintf(stderr, "Nativewindow X11 Error: null JNIEnv");
#if 0
diff --git a/src/newt/native/X11Display.c b/src/newt/native/X11Display.c
index 5e2dc7c61..ce7d9a0e1 100644
--- a/src/newt/native/X11Display.c
+++ b/src/newt/native/X11Display.c
@@ -84,8 +84,8 @@ static int x11ErrorHandler(Display *dpy, XErrorEvent *e)
XGetErrorText(dpy, e->error_code, errCodeStr, sizeof(errCodeStr));
fprintf(stderr, "Info: Newt X11 Error (Thread: %s): %d - %s, dpy %p, id %x, # %d: %d:%d %s\n",
- threadName, e->error_code, errCodeStr, e->display, e->resourceid, e->serial,
- e->request_code, e->minor_code, reqCodeStr);
+ threadName, e->error_code, errCodeStr, e->display, (int)e->resourceid, (int)e->serial,
+ (int)e->request_code, (int)e->minor_code, reqCodeStr);
if( errorHandlerDebug ) {
(*jniEnv)->CallStaticVoidMethod(jniEnv, X11NewtWindowClazz, dumpStackID);
@@ -94,8 +94,8 @@ static int x11ErrorHandler(Display *dpy, XErrorEvent *e)
if(errorHandlerThrowException) {
if(NULL != jniEnv) {
NewtCommon_throwNewRuntimeException(jniEnv, "Newt X11 Error (Thread: %s): %d - %s, dpy %p, id %x, # %d: %d:%d %s\n",
- threadName, e->error_code, errCodeStr, e->display, e->resourceid, e->serial,
- e->request_code, e->minor_code, reqCodeStr);
+ threadName, e->error_code, errCodeStr, e->display, (int)e->resourceid, (int)e->serial,
+ (int)e->request_code, (int)e->minor_code, reqCodeStr);
} else {
fprintf(stderr, "Nativewindow X11 Error: null JNIEnv");
#if 0
--
cgit v1.2.3