*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
*/
#include <config.h>
if (!b) return 0;
switch (order) {
case EXIF_BYTE_ORDER_MOTOROLA:
- return ((b[0] << 24) | (b[1] << 16) | (b[2] << 8) | b[3]);
+ return (((uint32_t)b[0] << 24) | ((uint32_t)b[1] << 16) | ((uint32_t)b[2] << 8) | (uint32_t)b[3]);
case EXIF_BYTE_ORDER_INTEL:
- return ((b[3] << 24) | (b[2] << 16) | (b[1] << 8) | b[0]);
+ return (((uint32_t)b[3] << 24) | ((uint32_t)b[2] << 16) | ((uint32_t)b[1] << 8) | (uint32_t)b[0]);
}
/* Won't be reached */
exif_set_slong (buf + 4, order, value.denominator);
}
+/*! This function converts rather UCS-2LE than UTF-16 to UTF-8.
+ * It should really be replaced by iconv().
+ */
void
-exif_convert_utf16_to_utf8 (char *out, const unsigned short *in, int maxlen)
+exif_convert_utf16_to_utf8 (char *out, const unsigned char *in, int maxlen)
{
- /* This function converts rather UCS2 than UTF16 to UTF8 */
if (maxlen <= 0) {
return;
}
- while (*in) {
- if (*in < 0x80) {
+ for (;;) {
+ ExifShort v = exif_get_short(in, EXIF_BYTE_ORDER_INTEL);
+ if (!v)
+ break;
+ if (v < 0x80) {
if (maxlen > 1) {
- *out++ = (char)*in++;
+ *out++ = (char)v;
maxlen--;
} else {
break;
}
- } else if (*in < 0x800) {
+ } else if (v < 0x800) {
if (maxlen > 2) {
- *out++ = ((*in >> 6) & 0x1F) | 0xC0;
- *out++ = (*in++ & 0x3F) | 0x80;
+ *out++ = ((v >> 6) & 0x1F) | 0xC0;
+ *out++ = (v & 0x3F) | 0x80;
maxlen -= 2;
} else {
break;
}
} else {
- if (maxlen > 2) {
- *out++ = ((*in >> 12) & 0x0F) | 0xE0;
- *out++ = ((*in >> 6) & 0x3F) | 0x80;
- *out++ = (*in++ & 0x3F) | 0x80;
+ if (maxlen > 3) {
+ *out++ = ((v >> 12) & 0x0F) | 0xE0;
+ *out++ = ((v >> 6) & 0x3F) | 0x80;
+ *out++ = (v & 0x3F) | 0x80;
maxlen -= 3;
} else {
break;
}
}
+ in += 2;
}
*out = 0;
}