tmp

Author: MartinPulec

src/gpujpeg_exif.c

@@ -239,6 +239,16 @@ struct gpujpeg_exif_tags {
     } tags[2]; // 0 - tiff, 1 - exif
 };
 
+static int
+ifd_sort(const void* a, const void* b)
+{
+    const uint8_t* aa = a;
+    const uint8_t *bb = b;
+    int a_tag_id = aa[0] << 8 | aa[1];
+    int b_tag_id = bb[0] << 8 | bb[1];
+    return a_tag_id - b_tag_id;
+}
+
 /**
  * @param tags  array of tags, should be ordered awcending according to exif_tiff_tag_info_t.id
  */
@@ -253,6 +263,7 @@ gpujpeg_write_ifd(struct gpujpeg_writer* writer, const uint8_t* start, size_t co
     uint8_t* end = writer->buffer_current + EXIF_IFD_NUM_SZ + (count_all * IFD_ITEM_SZ) + NEXT_IFD_PTR_SZ;
     gpujpeg_writer_emit_2byte(writer, count_all); // IFD Item Count
 
+    uint8_t *first_rec = writer->buffer_current;
     for ( unsigned i = 0; i < count; ++i ) {
         const struct tag_value* info = &tags[i];
         union value_u value = info->value;
@@ -266,6 +277,9 @@ gpujpeg_write_ifd(struct gpujpeg_writer* writer, const uint8_t* start, size_t co
         write_exif_tag(writer, custom_tags->vals[i].type, custom_tags->vals[i].tag_id, custom_tags->vals[i].value,
                        start, &end);
     }
+    if (custom_tags->count > 0) { // ensure custom_tags are in-ordered
+        qsort(first_rec, (writer->buffer_current - first_rec) /IFD_ITEM_SZ,IFD_ITEM_SZ, ifd_sort);
+    }
     gpujpeg_writer_emit_4byte(writer, 0); // Next IFD Offset (none)
     writer->buffer_current = end;         // jump after the section Value longer than 4Byte of 0th IFD
 }
@@ -408,4 +422,9 @@ gpujpeg_exif_add_tag(struct gpujpeg_exif_tags** exif_tags, const char* cfg)
 void
 gpujpeg_exif_tags_destroy(struct gpujpeg_exif_tags* exif_tags)
 {
+    if (exif_tags == NULL) {
+        return;
+    }
+    free(exif_tags->tags[0].vals);
+    free(exif_tags->tags[1].vals);
 }