From 9df691c0c5b065bfcff84565cb6fb2a1879f852d Mon Sep 17 00:00:00 2001 From: clanmills Date: Mon, 11 May 2020 19:05:28 +0100 Subject: [PATCH] Report Comments as charset=encoding data (not charset="encoding" data) --- man/man1/exiv2.1 | 6 +++--- src/value.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/man/man1/exiv2.1 b/man/man1/exiv2.1 index 2453e043..eb0bb29d 100644 --- a/man/man1/exiv2.1 +++ b/man/man1/exiv2.1 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH EXIV2 1 "April 30, 2020" +.TH EXIV2 1 "May 11, 2020" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -543,13 +543,13 @@ $ exiv2 -M'set Exif.Photo.UserComment charset=Ascii My photo' x.jpg $ exiv2 -pa --grep UserComment x.jpg Exif.Photo.UserComment Undefined 16 My photo $ exiv2 -pv --grep UserComment x.jpg -0x9286 Photo UserComment Undefined 16 charset="Ascii" My photo +0x9286 Photo UserComment Undefined 16 charset=Ascii My photo $ exiv2 -M'set Exif.Photo.UserComment charset=Unicode \\u0052\\u006f\\u0062\\u0069\\u006e' x.jpg $ exiv2 -pa --grep UserComment x.jpg Exif.Photo.UserComment Undefined 18 Robin $ exiv2 -pv --grep UserComment x.jpg -0x9286 Photo UserComment Undefined 18 charset="Unicode" Robin +0x9286 Photo UserComment Undefined 18 charset=Unicode Robin $ exiv2 -M'set Exif.GPSInfo.GPSProcessingMethod HYBRID-FIX' x.jpg $ exiv2 -pa --grep ProcessingMethod x.jpg diff --git a/src/value.cpp b/src/value.cpp index 45e31dbb..835ab8ce 100644 --- a/src/value.cpp +++ b/src/value.cpp @@ -550,7 +550,7 @@ namespace Exiv2 { { CharsetId csId = charsetId(); if (csId != undefined) { - os << "charset=\"" << CharsetInfo::name(csId) << "\" "; + os << "charset=" << CharsetInfo::name(csId) << " "; } return os << comment(); }