Revert "Uprev libmtp to 1.1.12"

examples/thumb.c

 /** 
  * \file thumb.c
  * Example program to send and associate album art to an entity 
  * on a device.
  *
  * Copyright (C) 2006 Robert Reardon <rreardon@monkshatch.vispa.com>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ skipping 29 matching lines @@
 }
 
 int main (int argc, char **argv) {
   int opt;
   extern int optind;
   extern char *optarg;
   LIBMTP_mtpdevice_t *device = NULL;
   int fd;
   uint32_t id = 0;
   uint64_t filesize;
-  char *imagedata = NULL;
+  uint8_t *imagedata = NULL;
   char *path = NULL;
   char *rest;
   struct stat statbuff;
   int ret;
 
   fprintf(stdout, "libmtp version: " LIBMTP_VERSION_STRING "\n\n");
 
   while ( (opt = getopt(argc, argv, "hi:")) != -1 ) {
     switch (opt) {
     case 'h':
@@ skipping 13 matching lines @@
     usage();
   }
 
   path = argv[0];
 
   if ( stat(path, &statbuff) == -1 ) {
     fprintf(stderr, "%s: ", path);
     perror("stat");
     exit(1);
   }
-  filesize = statbuff.st_size;
-  imagedata = malloc(filesize);
+  filesize = (uint64_t) statbuff.st_size;
+  imagedata = malloc(filesize * sizeof(uint16_t));
 
 #ifdef __WIN32__
   if ( (fd = open(path, O_RDONLY|O_BINARY) == -1) ) {
 #else
   if ( (fd = open(path, O_RDONLY)) == -1) {
 #endif
     printf("Couldn't open image file %s (%s)\n",path,strerror(errno));
     return 1;
-  } else {
-    ret = read(fd, imagedata, filesize);
-    if (ret == -1) perror("read thumb data");
+  }
+  else {
+    read(fd, imagedata, filesize);
     close(fd);
   }
 
   LIBMTP_Init();
   device = LIBMTP_Get_First_Device();
   if (device == NULL) {
     printf("No devices.\n");
     return 0;
   }
   
   LIBMTP_filesampledata_t *thumb = LIBMTP_new_filesampledata_t();
-  thumb->data = imagedata;
+
+  int i;
+  thumb->data = malloc(sizeof(uint16_t) * filesize);
+  for (i = 0; i < filesize; i++) {
+    thumb->data[i] = imagedata[i];
+  }
+
   thumb->size = filesize;
   thumb->filetype = LIBMTP_FILETYPE_JPEG;
+  
   ret = LIBMTP_Send_Representative_Sample(device,id,thumb);
   if (ret != 0) {
     printf("Couldn't send thumbnail\n");
     LIBMTP_Dump_Errorstack(device);
     LIBMTP_Clear_Errorstack(device);
   }
 
+  free(imagedata);
   LIBMTP_destroy_filesampledata_t(thumb);
 
   LIBMTP_Release_Device(device);
   printf("OK.\n");
   return 0;
 }