mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-16 16:50:06 +02:00
32 lines
1022 B
Plaintext
32 lines
1022 B
Plaintext
From 3ee1412e7c9d070c2a4392be40400f38b8526ac3 Mon Sep 17 00:00:00 2001
|
|
From: begasus <begasus@gmail.com>
|
|
Date: Mon, 1 May 2017 17:13:01 +0200
|
|
Subject: fix gcc2 parse error
|
|
|
|
|
|
diff --git a/libexif/exif-entry.c b/libexif/exif-entry.c
|
|
index 54a90a2..b008358 100644
|
|
--- a/libexif/exif-entry.c
|
|
+++ b/libexif/exif-entry.c
|
|
@@ -1380,7 +1380,8 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
|
|
|
|
/* The tag may not be U+0000-terminated , so make a local
|
|
U+0000-terminated copy before converting it */
|
|
- unsigned short *utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short));
|
|
+ {
|
|
+ unsigned short *utf16 = exif_mem_alloc (e->priv->mem, e->size+sizeof(unsigned short));
|
|
if (!utf16) break;
|
|
memcpy(utf16, e->data, e->size);
|
|
utf16[e->size/sizeof(unsigned short)] = 0;
|
|
@@ -1391,6 +1392,7 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen)
|
|
exif_mem_free(e->priv->mem, utf16);
|
|
break;
|
|
}
|
|
+ }
|
|
|
|
default:
|
|
/* Use a generic value formatting */
|
|
--
|
|
2.7.0
|
|
|