Merge branch 'master' of gitee.com:openharmony/third_party_libexif into 0521_libexif_update_6.25_test1

Signed-off-by: duanhan <duanhan1@huawei.com>

libexif/exif-data.c

@@ -1233,6 +1233,10 @@ interpret_maker_note(ExifData *data, const unsigned char *d, unsigned int ds)
 		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG,
 			"ExifData", "Apple MakerNote variant type %d", mnoteid);
 		data->priv->md = exif_mnote_data_apple_new (data->priv->mem);
+	} else if ((mnoteid = exif_mnote_data_huawei_identify (data, e)) != 0) {
+		exif_log (data->priv->log, EXIF_LOG_CODE_DEBUG,
+			"ExifData", "Huawei MakerNote variant type %d", mnoteid);
+		data->priv->md = exif_mnote_data_huawei_new (data->priv->mem);
 	}
 */ 
 

test/inc-comparetool.sh

@@ -1,5 +1,4 @@
-# -*- sh -*-
-#
+#!/bin/sh
 # cmp(1) creates the same exit code as diff in case of files being
 # different or the same, even though the diff(1) output is more
 # informative