fix some warning for makernote
authorlyang56 <liang.l.yang@intel.com>
Tue, 8 Mar 2011 03:05:26 +0000 (11:05 +0800)
committerHu Gang <gang.a.hu@intel.com>
Mon, 28 Mar 2011 03:36:49 +0000 (11:36 +0800)
Signed-off-by: Xiaolin Zhang <xiaolin.zhang@intel.com>
gst-libs/gst/camera/gstmfldcamerasrc.h
gst/mfldv4l2cam/exifmakernote_util.c [changed mode: 0755->0644]

index 7c8a93f..e499fcf 100644 (file)
@@ -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
old mode 100755 (executable)
new mode 100644 (file)
index 49c2c63..00ed2c2
@@ -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++;
     }
   }