Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  fix paste issue
This commit is contained in:
Remi Collet 2019-04-02 11:05:54 +02:00
commit 002983e463

View file

@ -2620,7 +2620,7 @@ static void exif_process_CME (image_info_type *image_info, char *value, size_t l
if (length>3) { if (length>3) {
switch(value[2]) { switch(value[2]) {
case 0: case 0:
exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_UNDEFINED, length, value), length; exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_UNDEFINED, length, value, length);
break; break;
case 1: case 1:
exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length, value, length); exif_iif_add_tag(image_info, SECTION_COMMENT, "Comment", TAG_COMPUTED_VALUE, TAG_FMT_STRING, length, value, length);