From 689813901d53069f5f8c3e612346d3aca0d4d705 Mon Sep 17 00:00:00 2001 From: lyang56 Date: Tue, 8 Mar 2011 11:05:26 +0800 Subject: [PATCH] fix some warning for makernote Signed-off-by: Xiaolin Zhang --- gst-libs/gst/camera/gstmfldcamerasrc.h | 5 ++++- gst/mfldv4l2cam/exifmakernote_util.c | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) mode change 100755 => 100644 gst/mfldv4l2cam/exifmakernote_util.c diff --git a/gst-libs/gst/camera/gstmfldcamerasrc.h b/gst-libs/gst/camera/gstmfldcamerasrc.h index 7c8a93f..e499fcf 100644 --- a/gst-libs/gst/camera/gstmfldcamerasrc.h +++ b/gst-libs/gst/camera/gstmfldcamerasrc.h @@ -239,7 +239,10 @@ struct _GstCameraSrc { * @set_zoom: Set the zoom factor. * @get_max_zoom: Ask for maximum zoom factor that can be used. * @get_supported_caps: Ask subclass about supported caps for given mode. - * + * @get_makernote: Get driver's makernote part + * @makernote_init: Init makernote + * @makernote_deal: The main part for deal with makernote + * @makernote_uninit: Uninit makernote * #GstCameraSrc class object. */ struct _GstCameraSrcClass diff --git a/gst/mfldv4l2cam/exifmakernote_util.c b/gst/mfldv4l2cam/exifmakernote_util.c old mode 100755 new mode 100644 index 49c2c63..00ed2c2 --- a/gst/mfldv4l2cam/exifmakernote_util.c +++ b/gst/mfldv4l2cam/exifmakernote_util.c @@ -318,7 +318,7 @@ static void __makernote_util_static_awb(int handle, GstCameraSrc * camerasrc) unsigned short shift; int msqWbGain[3]; int msqCcMtrx[9]; - short * pccmtrx = (short *)&msqCcMtrx; + int * pccmtrx = msqCcMtrx; v4l2camsrc = GST_V4L2CAMSRC (camerasrc); @@ -344,8 +344,7 @@ static void __makernote_util_static_awb(int handle, GstCameraSrc * camerasrc) { for(j = 0; j < 3; j++) { - awb.rgb2yuv_matrix[i][j] = *pccmtrx; - pccmtrx++; + awb.rgb2yuv_matrix[i][j] = (TInt16)(*pccmtrx & 0xff); pccmtrx++; } } -- 2.7.4