From 0a2326ac73c308877932d591f35198ec2619f4e2 Mon Sep 17 00:00:00 2001 From: Jihoon Jung Date: Thu, 4 Mar 2021 16:00:13 +0900 Subject: [PATCH] Add enum value and definition for HEIF image format Change-Id: I25a45e3a0d5bc56fc7b20ff42b79fba172ebf1a7 Signed-off-by: Jihoon Jung --- packaging/libmtp.spec | 2 +- src/libmtp.c | 1 + src/libmtp.h.in | 1 + src/ptp.c | 1 + src/ptp.h | 2 ++ 5 files changed, 6 insertions(+), 1 deletion(-) diff --git a/packaging/libmtp.spec b/packaging/libmtp.spec index 401b8af..ad03958 100755 --- a/packaging/libmtp.spec +++ b/packaging/libmtp.spec @@ -3,7 +3,7 @@ Name: libmtp Summary: Library for media transfer protocol (mtp) Version: 1.1.11 -Release: 13 +Release: 14 Group: Network & Connectivity/Other License: LGPL-2.1 Source0: libmtp-%{version}.tar.gz diff --git a/src/libmtp.c b/src/libmtp.c index c329034..b53877a 100755 --- a/src/libmtp.c +++ b/src/libmtp.c @@ -385,6 +385,7 @@ static void init_filemap() register_filetype("GIF bitmap file", LIBMTP_FILETYPE_GIF, PTP_OFC_GIF); register_filetype("PICT bitmap file", LIBMTP_FILETYPE_PICT, PTP_OFC_PICT); register_filetype("Portable Network Graphics", LIBMTP_FILETYPE_PNG, PTP_OFC_PNG); + register_filetype("HEIF file", LIBMTP_FILETYPE_HEIF, PTP_OFC_HEIF); register_filetype("Microsoft Windows Image Format", LIBMTP_FILETYPE_WINDOWSIMAGEFORMAT, PTP_OFC_MTP_WindowsImageFormat); register_filetype("VCalendar version 1", LIBMTP_FILETYPE_VCALENDAR1, PTP_OFC_MTP_vCalendar1); register_filetype("VCalendar version 2", LIBMTP_FILETYPE_VCALENDAR2, PTP_OFC_MTP_vCalendar2); diff --git a/src/libmtp.h.in b/src/libmtp.h.in index c880765..e6d0433 100755 --- a/src/libmtp.h.in +++ b/src/libmtp.h.in @@ -131,6 +131,7 @@ typedef enum { //helper enum value LIBMTP_FILETYPE_ALL, LIBMTP_FILETYPE_ALL_IMAGE, + LIBMTP_FILETYPE_HEIF, #endif /* TIZEN_EXT */ } LIBMTP_filetype_t; diff --git a/src/ptp.c b/src/ptp.c index 0f904a9..7fe93e0 100755 --- a/src/ptp.c +++ b/src/ptp.c @@ -5887,6 +5887,7 @@ struct { {PTP_OFC_JP2,"JP2"}, {PTP_OFC_JPX,"JPX"}, {PTP_OFC_DNG,"DNG"}, + {PTP_OFC_HEIF,"HEIF"}, }; struct { diff --git a/src/ptp.h b/src/ptp.h index b30a627..97bb46d 100755 --- a/src/ptp.h +++ b/src/ptp.h @@ -964,6 +964,8 @@ typedef struct _PTPObjectInfo PTPObjectInfo; #define PTP_OFC_JPX 0x3810 /* ptp v1.1 has only DNG new */ #define PTP_OFC_DNG 0x3811 +/* iOS image format extention */ +#define PTP_OFC_HEIF 0x3812 /* Eastman Kodak extension ancillary format */ #define PTP_OFC_EK_M3U 0xb002 /* Canon extension */ -- 2.7.4