gpujpeg_metadata: more generic

allow more metadata items + add flag if it is set or not

gpujpegtool: if orientation not set, do not print its value

Author: MartinPulec

libgpujpeg/gpujpeg_type.h

@@ -142,15 +142,24 @@ struct gpujpeg_component_sampling_factor
     uint8_t vertical;
 };
 
+enum {
+    GPUJPEG_METADATA_ORIENTATION,
+    GPUJPEG_METADATA_COUNT,
+};
 struct gpujpeg_orientation /// as defined in SPIFF
 {
     unsigned rotation : 2; ///< in multiples of 90° clock-wise
     unsigned flip : 1;     ///< 1 - left-to-right orientation flipped after rotation applied
 };
-
 struct gpujpeg_image_metadata
 {
-    struct gpujpeg_orientation orientation;
+    struct
+    {
+        union {
+            struct gpujpeg_orientation orient;
+        };
+        unsigned set : 1; ///< item is set, otherwise the union value is undefined
+    } vals[GPUJPEG_METADATA_COUNT];
 };
 
 #ifdef __cplusplus

src/gpujpeg_exif.c

@@ -630,7 +630,8 @@ exif_orieintation_to_metadata(unsigned val, struct gpujpeg_image_metadata* parse
         {3, 0}, // 8 = The 0th row is the visual left-hand side of the image, and the 0th column is the visual bottom.
     };
     // clang-format on
-    parsed->orientation = map[val - 1];
+    parsed->vals[GPUJPEG_METADATA_ORIENTATION].orient = map[val - 1];
+    parsed->vals[GPUJPEG_METADATA_ORIENTATION].set = 1;
 }
 
 static void

src/gpujpeg_reader.c

@@ -1638,8 +1638,12 @@ gpujpeg_reader_read_image(struct gpujpeg_decoder* decoder, uint8_t* image, size_
         return -1;
     }
 
-    if ( reader.metadata.orientation.rotation != 0 || reader.metadata.orientation.flip != 0 ) {
-        WARN_MSG("Orientation %s not handled!\n", gpujpeg_orientation_get_name(reader.metadata.orientation));
+    if ( reader.metadata.vals[GPUJPEG_METADATA_ORIENTATION].set ) {
+        if ( reader.metadata.vals[GPUJPEG_METADATA_ORIENTATION].orient.rotation != 0 ||
+             reader.metadata.vals[GPUJPEG_METADATA_ORIENTATION].orient.flip != 0 ) {
+            WARN_MSG("Orientation %s not handled!\n",
+                     gpujpeg_orientation_get_name(reader.metadata.vals[GPUJPEG_METADATA_ORIENTATION].orient));
+        }
     }
 
     return 0;

src/main.c

@@ -206,7 +206,10 @@ static int print_image_info_jpeg(const char *filename, int verbose) {
                                        gpujpeg_subsampling_get_name(info.param.comp_count, info.param.sampling_factor));
         printf("interleaved: %s\n", info.param.interleaved ? "yes" : "no");
         printf("header type: %s\n", gpujpeg_header_type_get_name(info.header_type));
-        printf("orientation: %s\n", gpujpeg_orientation_get_name(info.metadata.orientation));
+        if ( info.metadata.vals[GPUJPEG_METADATA_ORIENTATION].set ) {
+            printf("orientation: %s\n",
+                   gpujpeg_orientation_get_name(info.metadata.vals[GPUJPEG_METADATA_ORIENTATION].orient));
+        }
         if ( info.segment_count ) {
             printf("segment count: %d (DRI = %d)\n", info.segment_count, info.param.restart_interval);
         }