exif 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfc6778c57933986114267b125c79dcc46e21ef1
-  data.tar.gz: 34fb03f95acd3955bbdca79d97ddeff8ae0029ea
+  metadata.gz: 33f58a4ce4cca70c469d9d6df0ec65a5ba2709ac
+  data.tar.gz: 4cb22e01351311cc90cca4280e72030d4cefbddd
 SHA512:
-  metadata.gz: f93647cdb95d30d49575efc2117f92cd6cef714f2d02c6f3beaa385db034eb4fc93ac3e2cc60859e349c0d00aa665341101ca2a1530f185c716f2aa67532324f
-  data.tar.gz: 04a4b02e1f799d1c41301582d55c9d68f0d6afb0056caf08bb6427e808e55eaa1460e42f64d06ed6fbf2e0d043b4c15438a108ce53d17218927c1e661ddbf941
+  metadata.gz: 82bb019a423559815f06793736aef8fc6bea78f8cdff7e602ef555087f66cf436d240f5842caad8951e5a9b43eaba16bb2be8bcfd2b53fbb8337e77bbf9d0b77
+  data.tar.gz: 826aa853744d59ec237eeca0c4fc7c57f60f596abf236110d82e4a6aabb6838dbc86e65913a3772d7e5a1121b049ddf5c2bba030aa3863c158ec42c42977769c

data/ext/exif/data.c

@@ -1,40 +1,191 @@
 #include "data.h"
-#include "libjpeg/jpeg-data.h"
 #include "ruby.h"
 
 #include <libexif/exif-data.h>
 #include <libexif/exif-loader.h>
-#include <time.h>
 #include <stdint.h>
+#include <time.h>
 
 extern VALUE rb_mExif, rb_eNotReadble, rb_eIFDNotFound;
-extern const char* exif_entry_to_ivar(ExifEntry* entry);
+extern const char *exif_entry_to_ivar(ExifEntry *entry);
 
 VALUE rb_cExifData;
-static const char* ifd_name_mapping[] = {"ifd0", "ifd1", "exif", "gps", "interoperability"};
-static const char* attr_readers[] = {"ifds", "aperture_value", "artist", "battery_level", "bits_per_sample", "brightness_value", "cfa_pattern", "cfa_repeat_pattern_dim", "color_space", "components_configuration", "compressed_bits_per_pixel", "compression", "contrast", "copyright", "custom_rendered", "date_time", "date_time_digitized", "date_time_original", "device_setting_description", "digital_zoom_ratio", "document_name", "exif_ifd_pointer", "exif_version", "exposure_bias_value", "exposure_index", "exposure_mode", "exposure_program", "exposure_time", "file_source", "fill_order", "flash", "flash_energy", "flash_pix_version", "fnumber", "focal_length", "focal_length_in_35mm_film", "focal_plane_resolution_unit", "focal_plane_x_resolution", "focal_plane_y_resolution", "gain_control", "gamma", "gps_altitude", "gps_altitude_ref", "gps_area_information", "gps_date_stamp", "gps_dest_bearing", "gps_dest_bearing_ref", "gps_dest_distance", "gps_dest_distance_ref", "gps_dest_latitude", "gps_dest_latitude_ref", "gps_dest_longitude", "gps_dest_longitude_ref", "gps_differential", "gps_dop", "gps_img_direction", "gps_img_direction_ref", "gps_info_ifd_pointer", "gps_latitude", "gps_latitude_ref", "gps_longitude", "gps_longitude_ref", "gps_map_datum", "gps_measure_mode", "gps_processing_method", "gps_satellites", "gps_speed", "gps_speed_ref", "gps_status", "gps_time_stamp", "gps_track", "gps_track_ref", "gps_version_id", "image_description", "image_length", "image_resources", "image_unique_id", "image_width", "inter_color_profile", "interoperability_ifd_pointer", "interoperability_index", "interoperability_version", "iptc_naa", "iso_speed_ratings", "jpeg_interchange_format", "jpeg_interchange_format_length", "jpeg_proc", "light_source", "make", "maker_note", "max_aperture_value", "metering_mode", "model", "new_cfa_pattern", "new_subfile_type", "oecf", "orientation", "padding", "photometric_interpretation", "pixel_x_dimension", "pixel_y_dimension", "planar_configuration", "primary_chromaticities", "print_image_matching", "reference_black_white", "related_image_file_format", "related_image_length", "related_image_width", "related_sound_file", "resolution_unit", "rows_per_strip", "samples_per_pixel", "saturation", "scene_capture_type", "scene_type", "sensing_method", "sharpness", "shutter_speed_value", "software", "spatial_frequency_response", "spectral_sensitivity", "strip_byte_counts", "strip_offsets", "sub_ifds", "sub_sec_time", "sub_sec_time_digitized", "sub_sec_time_original", "subject_area", "subject_distance", "subject_distance_range", "subject_location", "tiff_ep_standard_id", "time_zone_offset", "transfer_function", "transfer_range", "user_comment", "white_balance", "white_point", "x_resolution", "xml_packet", "xp_author", "xp_comment", "xp_keywords", "xp_subject", "xp_title", "y_resolution", "ycbcr_coefficients", "ycbcr_positioning", "ycbcr_sub_sampling"};
+static const char *ifd_name_mapping[] = {"ifd0", "ifd1", "exif", "gps",
+                                         "interoperability"};
+static const char *attr_readers[] = {"ifds",
+                                     "aperture_value",
+                                     "artist",
+                                     "battery_level",
+                                     "bits_per_sample",
+                                     "brightness_value",
+                                     "cfa_pattern",
+                                     "cfa_repeat_pattern_dim",
+                                     "color_space",
+                                     "components_configuration",
+                                     "compressed_bits_per_pixel",
+                                     "compression",
+                                     "contrast",
+                                     "copyright",
+                                     "custom_rendered",
+                                     "date_time",
+                                     "date_time_digitized",
+                                     "date_time_original",
+                                     "device_setting_description",
+                                     "digital_zoom_ratio",
+                                     "document_name",
+                                     "exif_ifd_pointer",
+                                     "exif_version",
+                                     "exposure_bias_value",
+                                     "exposure_index",
+                                     "exposure_mode",
+                                     "exposure_program",
+                                     "exposure_time",
+                                     "file_source",
+                                     "fill_order",
+                                     "flash",
+                                     "flash_energy",
+                                     "flash_pix_version",
+                                     "fnumber",
+                                     "focal_length",
+                                     "focal_length_in_35mm_film",
+                                     "focal_plane_resolution_unit",
+                                     "focal_plane_x_resolution",
+                                     "focal_plane_y_resolution",
+                                     "gain_control",
+                                     "gamma",
+                                     "gps_altitude",
+                                     "gps_altitude_ref",
+                                     "gps_area_information",
+                                     "gps_date_stamp",
+                                     "gps_dest_bearing",
+                                     "gps_dest_bearing_ref",
+                                     "gps_dest_distance",
+                                     "gps_dest_distance_ref",
+                                     "gps_dest_latitude",
+                                     "gps_dest_latitude_ref",
+                                     "gps_dest_longitude",
+                                     "gps_dest_longitude_ref",
+                                     "gps_differential",
+                                     "gps_dop",
+                                     "gps_img_direction",
+                                     "gps_img_direction_ref",
+                                     "gps_info_ifd_pointer",
+                                     "gps_latitude",
+                                     "gps_latitude_ref",
+                                     "gps_longitude",
+                                     "gps_longitude_ref",
+                                     "gps_map_datum",
+                                     "gps_measure_mode",
+                                     "gps_processing_method",
+                                     "gps_satellites",
+                                     "gps_speed",
+                                     "gps_speed_ref",
+                                     "gps_status",
+                                     "gps_time_stamp",
+                                     "gps_track",
+                                     "gps_track_ref",
+                                     "gps_version_id",
+                                     "image_description",
+                                     "image_length",
+                                     "image_resources",
+                                     "image_unique_id",
+                                     "image_width",
+                                     "inter_color_profile",
+                                     "interoperability_ifd_pointer",
+                                     "interoperability_index",
+                                     "interoperability_version",
+                                     "iptc_naa",
+                                     "iso_speed_ratings",
+                                     "jpeg_interchange_format",
+                                     "jpeg_interchange_format_length",
+                                     "jpeg_proc",
+                                     "light_source",
+                                     "make",
+                                     "maker_note",
+                                     "max_aperture_value",
+                                     "metering_mode",
+                                     "model",
+                                     "new_cfa_pattern",
+                                     "new_subfile_type",
+                                     "oecf",
+                                     "orientation",
+                                     "padding",
+                                     "photometric_interpretation",
+                                     "pixel_x_dimension",
+                                     "pixel_y_dimension",
+                                     "planar_configuration",
+                                     "primary_chromaticities",
+                                     "print_image_matching",
+                                     "reference_black_white",
+                                     "related_image_file_format",
+                                     "related_image_length",
+                                     "related_image_width",
+                                     "related_sound_file",
+                                     "resolution_unit",
+                                     "rows_per_strip",
+                                     "samples_per_pixel",
+                                     "saturation",
+                                     "scene_capture_type",
+                                     "scene_type",
+                                     "sensing_method",
+                                     "sharpness",
+                                     "shutter_speed_value",
+                                     "software",
+                                     "spatial_frequency_response",
+                                     "spectral_sensitivity",
+                                     "strip_byte_counts",
+                                     "strip_offsets",
+                                     "sub_ifds",
+                                     "sub_sec_time",
+                                     "sub_sec_time_digitized",
+                                     "sub_sec_time_original",
+                                     "subject_area",
+                                     "subject_distance",
+                                     "subject_distance_range",
+                                     "subject_location",
+                                     "tiff_ep_standard_id",
+                                     "time_zone_offset",
+                                     "transfer_function",
+                                     "transfer_range",
+                                     "user_comment",
+                                     "white_balance",
+                                     "white_point",
+                                     "x_resolution",
+                                     "xml_packet",
+                                     "xp_author",
+                                     "xp_comment",
+                                     "xp_keywords",
+                                     "xp_subject",
+                                     "xp_title",
+                                     "y_resolution",
+                                     "ycbcr_coefficients",
+                                     "ycbcr_positioning",
+                                     "ycbcr_sub_sampling"};
 
-static VALUE new(VALUE self, VALUE input);
+static VALUE new (VALUE self, VALUE input);
 static VALUE dump(VALUE self);
 static VALUE brackets(VALUE self, VALUE ifd_symbol);
 static void each_content(ExifContent *ec, void *user_data);
 static void each_entry(ExifEntry *, void *user_data);
 static VALUE exif_entry_to_rb_value(ExifEntry *);
+static VALUE rational_to_num(ExifRational rational);
+static VALUE srational_to_num(ExifSRational srational);
 
-void init_data(){
+void init_data() {
   int length;
 
   rb_cExifData = rb_define_class_under(rb_mExif, "Data", rb_cObject);
-  length = sizeof(attr_readers) / sizeof(char*);
-  for(int i = 0; i < length; ++i) rb_define_attr(rb_cExifData, attr_readers[i], 1, 0);
+  length = sizeof(attr_readers) / sizeof(char *);
+  for (int i = 0; i < length; ++i)
+    rb_define_attr(rb_cExifData, attr_readers[i], 1, 0);
   rb_define_alias(rb_cExifData, "to_h", "ifds");
   rb_define_singleton_method(rb_cExifData, "new", new, 1);
   rb_define_method(rb_cExifData, "dump", dump, 0);
   rb_define_method(rb_cExifData, "[]", brackets, 1);
 }
 
-VALUE new(VALUE self, VALUE input){
-  ExifData* ed;
+VALUE new (VALUE self, VALUE input) {
+  ExifData *ed;
   VALUE read_data;
 
   switch (TYPE(input)) {
@@ -45,15 +196,17 @@ VALUE new(VALUE self, VALUE input){
     read_data = rb_funcall(input, rb_intern("read"), 0);
     break;
   default:
-    rb_raise(rb_eTypeError, "wrong argument type %s (expected String or IO)", rb_obj_classname(input));
+    rb_raise(rb_eTypeError, "wrong argument type %s (expected String or IO)",
+             rb_obj_classname(input));
   }
 
-	ExifLoader *loader = exif_loader_new();
-	exif_loader_write(loader, (unsigned char*)RSTRING_PTR(read_data), RSTRING_LEN(read_data));
-	ed = exif_loader_get_data(loader);
-	exif_loader_unref (loader);
-  if(!ed) rb_raise(rb_eNotReadble, "File not readable or no EXIF data in file.");
-
+  ExifLoader *loader = exif_loader_new();
+  exif_loader_write(loader, (unsigned char *)RSTRING_PTR(read_data),
+                    RSTRING_LEN(read_data));
+  ed = exif_loader_get_data(loader);
+  exif_loader_unref(loader);
+  if (!ed)
+    rb_raise(rb_eNotReadble, "File not readable or no EXIF data in file.");
 
   VALUE rb_data = Data_Wrap_Struct(self, NULL, exif_data_free, ed);
   rb_iv_set(rb_data, "@ifds", rb_hash_new());
@@ -61,138 +214,135 @@ VALUE new(VALUE self, VALUE input){
   return rb_data;
 }
 
-static VALUE dump(VALUE self){
+static VALUE dump(VALUE self) {
   ExifData *ed;
   Data_Get_Struct(self, ExifData, ed);
   exif_data_dump(ed);
   return Qnil;
 }
 
-static VALUE brackets(VALUE self, VALUE ifd_symbol){
+static VALUE brackets(VALUE self, VALUE ifd_symbol) {
   return rb_hash_aref(rb_iv_get(self, "@ifds"), ifd_symbol);
 }
 
-static void each_content(ExifContent *ec, void *self_ptr){
+static void each_content(ExifContent *ec, void *self_ptr) {
   VALUE *self;
   ExifIfd ifd;
 
   ifd = exif_content_get_ifd(ec);
-  if(ifd == EXIF_IFD_COUNT) rb_raise(rb_eIFDNotFound, "Con't get IFD.");
-  rb_hash_aset(rb_iv_get(*(VALUE*)self_ptr, "@ifds"), ID2SYM(rb_intern(ifd_name_mapping[ifd])), rb_hash_new());
+  if (ifd == EXIF_IFD_COUNT)
+    rb_raise(rb_eIFDNotFound, "Con't get IFD.");
+  rb_hash_aset(rb_iv_get(*(VALUE *)self_ptr, "@ifds"),
+               ID2SYM(rb_intern(ifd_name_mapping[ifd])), rb_hash_new());
   exif_content_foreach_entry(ec, each_entry, self_ptr);
 }
 
-static void each_entry(ExifEntry *entry, void *self_ptr){
+static void each_entry(ExifEntry *entry, void *self_ptr) {
   VALUE value;
   const char *ivar_name;
 
   ivar_name = exif_entry_to_ivar(entry);
   value = exif_entry_to_rb_value(entry);
-  rb_hash_aset(
-    rb_hash_aref(
-      rb_iv_get(*(VALUE*)self_ptr, "@ifds"),
-      ID2SYM(rb_intern(ifd_name_mapping[exif_entry_get_ifd(entry)]))
-    ),
-    ID2SYM(rb_intern(ivar_name + 1)),
-    value
-  );
-  if(TYPE(rb_ivar_defined(*(VALUE*)self_ptr, rb_intern(ivar_name))) == T_FALSE){
-    rb_iv_set(*(VALUE*)self_ptr, ivar_name, value);
+  rb_hash_aset(rb_hash_aref(rb_iv_get(*(VALUE *)self_ptr, "@ifds"),
+                            ID2SYM(rb_intern(
+                                ifd_name_mapping[exif_entry_get_ifd(entry)]))),
+               ID2SYM(rb_intern(ivar_name + 1)), value);
+  if (TYPE(rb_ivar_defined(*(VALUE *)self_ptr, rb_intern(ivar_name))) ==
+      T_FALSE) {
+    rb_iv_set(*(VALUE *)self_ptr, ivar_name, value);
   }
 }
 
-static VALUE exif_entry_to_rb_value(ExifEntry *entry){
-  ExifData  *data;
+#define TYPECAST(value1, value2)                                               \
+  do {                                                                         \
+    if (entry->components > 1) {                                               \
+      ret = rb_ary_new2(entry->components);                                    \
+      for (i = 0; i < entry->components; i++)                                  \
+        rb_ary_push(ret, value1);                                              \
+    } else                                                                     \
+      ret = value2;                                                            \
+  } while (0)
+
+#define TYPECAST_BYTE(c_to_rb, type)                                           \
+  TYPECAST(c_to_rb((type)entry->data[i]), c_to_rb((type)entry->data[0]))
+
+#define TYPECAST_EXIF(c_to_rb, exif_get)                                       \
+  TYPECAST(c_to_rb(exif_get_##exif_get(entry->data + i * size, order)),        \
+           c_to_rb(exif_get_##exif_get(entry->data, order)))
+
+static VALUE exif_entry_to_rb_value(ExifEntry *entry) {
+  ExifData *data;
   ExifByteOrder order;
   ExifRational rational;
   ExifSRational srational;
   VALUE ret;
   size_t len, i;
   unsigned char size;
-  struct tm tm = {};
 
   data = entry->parent->parent;
   order = exif_data_get_byte_order(data);
   ret = Qnil;
   size = exif_format_get_size(entry->format);
 
-  switch(entry->format){
+  switch (entry->format) {
   case EXIF_FORMAT_UNDEFINED:
-    ret = rb_str_new((const char*)entry->data, entry->size);
+    ret = rb_str_new((const char *)entry->data, entry->size);
     break;
   case EXIF_FORMAT_BYTE:
-    if(entry->components > 1){
-      ret = rb_ary_new2(entry->components);
-      for (i = 0; i < entry->components; i++)
-        rb_ary_push(ret, INT2FIX((uint8_t)entry->data[i]));
-    }else ret = INT2FIX((uint8_t)entry->data[0]);
+    TYPECAST_BYTE(INT2FIX, uint8_t);
   case EXIF_FORMAT_SBYTE:
-    if(entry->components > 1){
-      ret = rb_ary_new2(entry->components);
-  		for (i = 0; i < entry->components; i++)
-        rb_ary_push(ret, INT2FIX((int8_t)entry->data[i]));
-    }else ret = INT2FIX((int8_t)entry->data[0]);
+    TYPECAST_BYTE(INT2FIX, int8_t);
     break;
   case EXIF_FORMAT_SHORT:
-    if(entry->components > 1){
-      ret = rb_ary_new2(entry->components);
-      for(i = 0; i < entry->components; i++)
-        rb_ary_push(ret, INT2FIX(exif_get_short(entry->data + i*size, order)));
-    }else ret = INT2FIX(exif_get_short(entry->data, order));
+    TYPECAST_EXIF(INT2FIX, short);
     break;
   case EXIF_FORMAT_SSHORT:
-    if(entry->components > 1){
-      ret = rb_ary_new2(entry->components);
-      for(i = 0; i < entry->components; i++)
-        rb_ary_push(ret, INT2FIX(exif_get_sshort(entry->data + i*size, order)));
-    }else ret = INT2FIX(exif_get_sshort(entry->data, order));
+    TYPECAST_EXIF(INT2FIX, sshort);
     break;
   case EXIF_FORMAT_LONG:
-    if(entry->components > 1){
-      ret = rb_ary_new2(entry->components);
-      for(i = 0; i < entry->components; i++)
-        rb_ary_push(ret, ULONG2NUM(exif_get_long(entry->data + i*size, order)));
-    }else ret = ULONG2NUM(exif_get_long(entry->data, order));
+    TYPECAST_EXIF(ULONG2NUM, long);
     break;
   case EXIF_FORMAT_SLONG:
-    if(entry->components > 1){
-      ret = rb_ary_new2(entry->components);
-      for(i = 0; i < entry->components; i++)
-        rb_ary_push(ret, LONG2NUM(exif_get_slong(entry->data + i*size, order)));
-    }else ret = LONG2NUM(exif_get_slong(entry->data, order));
+    TYPECAST_EXIF(LONG2NUM, slong);
     break;
   case EXIF_FORMAT_ASCII:
     ret = rb_str_new2((const char *)entry->data);
     break;
   case EXIF_FORMAT_RATIONAL:
-    if(entry->components > 1){
-      ret = rb_ary_new2(entry->components);
-      for(i = 0; i < entry->components; i++){
-        rational = exif_get_rational(entry->data + i * size, order);
-        rb_ary_push(ret, rb_rational_new(ULONG2NUM(rational.numerator), ULONG2NUM(rational.denominator)));
-      }
-    } else {
-      rational = exif_get_rational(entry->data, order);
-      ret = rb_rational_new(ULONG2NUM(rational.numerator), ULONG2NUM(rational.denominator));
-    }
+    TYPECAST_EXIF(rational_to_num, rational);
     break;
   case EXIF_FORMAT_SRATIONAL:
-    if(entry->components > 1){
-      ret = rb_ary_new2(entry->components);
-      for(int i = 0; i < entry->components; i++){
-        srational = exif_get_srational(entry->data + i * size, order);
-        rb_ary_push(ret, rb_rational_new(LONG2FIX(srational.numerator), LONG2FIX(srational.denominator)));
-      }
-    } else {
-      srational = exif_get_srational(entry->data, order);
-      ret = rb_rational_new(LONG2FIX(srational.numerator), LONG2FIX(srational.denominator));
-    }
+    TYPECAST_EXIF(srational_to_num, srational);
     break;
   case EXIF_FORMAT_DOUBLE:
   case EXIF_FORMAT_FLOAT:
-    ret = rb_float_new(*(double*)entry->data);
+    ret = rb_float_new(*(double *)entry->data);
     break;
   }
 
   return ret;
 }
+
+#undef TYPECAST
+#undef TYPECAST_BYTE
+#undef TYPECAST_EXIF
+
+VALUE rational_to_num(ExifRational rational) {
+  if (rational.numerator == 0 && rational.denominator == 0)
+    return DBL2NUM(NAN);
+  else if (rational.denominator == 0)
+    return DBL2NUM(INFINITY);
+  else
+    return rb_rational_new(ULONG2NUM(rational.numerator),
+                           ULONG2NUM(rational.denominator));
+}
+
+VALUE srational_to_num(ExifSRational srational) {
+  if (srational.numerator == 0 && srational.denominator == 0)
+    return DBL2NUM(NAN);
+  else if (srational.denominator == 0)
+    return DBL2NUM(srational.numerator > 0 ? INFINITY : -INFINITY);
+  else
+    return rb_rational_new(LONG2NUM(srational.numerator),
+                           LONG2NUM(srational.denominator));
+}

data/ext/exif/exif.c

@@ -1,15 +1,16 @@
-#include "ruby.h"
 #include "data.h"
+#include "ruby.h"
 
 VALUE rb_mExif, rb_eError, rb_eNotReadble, rb_eIFDNotFound, rb_eUnknownDataType;
 
-void Init_exif(void){
+void Init_exif(void) {
   rb_mExif = rb_define_module("Exif");
 
   rb_eError = rb_define_class_under(rb_mExif, "Error", rb_eStandardError);
   rb_eNotReadble = rb_define_class_under(rb_mExif, "NotReadble", rb_eError);
   rb_eIFDNotFound = rb_define_class_under(rb_mExif, "IFDNotFound", rb_eError);
-  rb_eUnknownDataType = rb_define_class_under(rb_mExif, "UnknownDataType", rb_eError);
+  rb_eUnknownDataType =
+      rb_define_class_under(rb_mExif, "UnknownDataType", rb_eError);
 
   init_data();
 }

data/ext/exif/exif_entry_to_ivar.c

@@ -1,15 +1,16 @@
 #include <libexif/exif-entry.h>
 
-const char* exif_entry_to_ivar(ExifEntry* ee){
+const char *exif_entry_to_ivar(ExifEntry *ee) {
   ExifIfd ifd;
   ExifTag tag;
 
   ifd = exif_entry_get_ifd(ee);
   tag = ee->tag;
 
-  switch((int)tag){
+  switch ((int)tag) {
   case EXIF_TAG_INTEROPERABILITY_INDEX: /* EXIF_TAG_GPS_LATITUDE_REF */
-    return ifd == EXIF_IFD_GPS ? "@gps_latitude_ref" : "@interoperability_index";
+    return ifd == EXIF_IFD_GPS ? "@gps_latitude_ref"
+                               : "@interoperability_index";
     break;
   case EXIF_TAG_INTEROPERABILITY_VERSION: /* EXIF_TAG_GPS_LATITUDE */
     return ifd == EXIF_IFD_GPS ? "@gps_latitude" : "@interoperability_version";

data/lib/exif/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Exif
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: exif
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Jian Weihang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,10 +78,6 @@ files:
 - ext/exif/exif.c
 - ext/exif/exif_entry_to_ivar.c
 - ext/exif/extconf.rb
-- ext/exif/libjpeg/jpeg-data.c
-- ext/exif/libjpeg/jpeg-data.h
-- ext/exif/libjpeg/jpeg-marker.c
-- ext/exif/libjpeg/jpeg-marker.h
 - lib/exif.rb
 - lib/exif/version.rb
 homepage: https://github.com/tonytonyjan/exif

data/ext/exif/libjpeg/jpeg-data.c

@@ -1,490 +0,0 @@
-/* jpeg-data.c
- *
- * Copyright � 2001 Lutz M�ller <lutz@users.sourceforge.net>
- *
- * 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
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA.
- */
-
-#include "config.h"
-#include "jpeg-data.h"
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-
-/* This refers to the exif-i18n.h file from the "exif" package and is
- * NOT to be confused with the libexif/i18n.h file.
- */
-#include "exif/exif-i18n.h"
-
-/* realloc that cleans up on memory failure and returns to caller */
-#define CLEANUP_REALLOC(p,s) { \
-	unsigned char *cleanup_ptr = realloc((p),(s)); \
-	if (!cleanup_ptr) { free(p); (p) = NULL; return; } \
-	(p) = cleanup_ptr; \
-}
-
-struct _JPEGDataPrivate
-{
-	unsigned int ref_count;
-
-	ExifLog *log;
-};
-
-JPEGData *
-jpeg_data_new (void)
-{
-	JPEGData *data;
-
-	data = malloc (sizeof (JPEGData));
-	if (!data)
-		return (NULL);
-	memset (data, 0, sizeof (JPEGData));
-	data->priv = malloc (sizeof (JPEGDataPrivate));
-	if (!data->priv) {
-		free (data);
-		return (NULL);
-	}
-	memset (data->priv, 0, sizeof (JPEGDataPrivate));
-	data->priv->ref_count = 1;
-
-	return (data);
-}
-
-void
-jpeg_data_append_section (JPEGData *data)
-{
-	JPEGSection *s;
-
-	if (!data) return;
-
-	if (!data->count)
-		s = malloc (sizeof (JPEGSection));
-	else
-		s = realloc (data->sections,
-			     sizeof (JPEGSection) * (data->count + 1));
-	if (!s) {
-		EXIF_LOG_NO_MEMORY (data->priv->log, "jpeg-data", 
-				sizeof (JPEGSection) * (data->count + 1));
-		return;
-	}
-	memset(s + data->count, 0, sizeof (JPEGSection));
-	data->sections = s;
-	data->count++;
-}
-
-/*! jpeg_data_save_file returns 1 on success, 0 on failure */
-int
-jpeg_data_save_file (JPEGData *data, const char *path)
-{
-	FILE *f;
-	unsigned char *d = NULL;
-	unsigned int size = 0, written;
-
-	jpeg_data_save_data (data, &d, &size);
-	if (!d)
-		return 0;
-
-	remove (path);
-	f = fopen (path, "wb");
-	if (!f) {
-		free (d);
-		return 0;
-	}
-	written = fwrite (d, 1, size, f);
-	fclose (f);
-	free (d);
-	if (written == size)  {
-		return 1;
-	}
-	remove(path);
-	return 0;
-}
-
-void
-jpeg_data_save_data (JPEGData *data, unsigned char **d, unsigned int *ds)
-{
-	unsigned int i, eds = 0;
-	JPEGSection s;
-	unsigned char *ed = NULL;
-
-	if (!data)
-		return;
-	if (!d)
-		return;
-	if (!ds)
-		return;
-
-	for (*ds = i = 0; i < data->count; i++) {
-		s = data->sections[i];
-
-		/* Write the marker */
-		CLEANUP_REALLOC (*d, sizeof (char) * (*ds + 2));
-		(*d)[*ds + 0] = 0xff;
-		(*d)[*ds + 1] = s.marker;
-		*ds += 2;
-
-		switch (s.marker) {
-		case JPEG_MARKER_SOI:
-		case JPEG_MARKER_EOI:
-			break;
-		case JPEG_MARKER_APP1:
-			exif_data_save_data (s.content.app1, &ed, &eds);
-			if (!ed) break;
-			CLEANUP_REALLOC (*d, sizeof (char) * (*ds + 2));
-			(*d)[*ds + 0] = (eds + 2) >> 8;
-			(*d)[*ds + 1] = (eds + 2) >> 0;
-			*ds += 2;
-			CLEANUP_REALLOC (*d, sizeof (char) * (*ds + eds));
-			memcpy (*d + *ds, ed, eds);
-			*ds += eds;
-			free (ed);
-			break;
-		default:
-			CLEANUP_REALLOC (*d, sizeof (char) *
-					(*ds + s.content.generic.size + 2));
-			(*d)[*ds + 0] = (s.content.generic.size + 2) >> 8;
-			(*d)[*ds + 1] = (s.content.generic.size + 2) >> 0;
-			*ds += 2;
-			memcpy (*d + *ds, s.content.generic.data,
-				s.content.generic.size);
-			*ds += s.content.generic.size;
-
-			/* In case of SOS, we need to write the data. */
-			if (s.marker == JPEG_MARKER_SOS) {
-				CLEANUP_REALLOC (*d, *ds + data->size);
-				memcpy (*d + *ds, data->data, data->size);
-				*ds += data->size;
-			}
-			break;
-		}
-	}
-}
-
-JPEGData *
-jpeg_data_new_from_data (const unsigned char *d,
-			 unsigned int size)
-{
-	JPEGData *data;
-
-	data = jpeg_data_new ();
-	jpeg_data_load_data (data, d, size);
-	return (data);
-}
-
-void
-jpeg_data_load_data (JPEGData *data, const unsigned char *d,
-		     unsigned int size)
-{
-	unsigned int i, o, len;
-	JPEGSection *s;
-	JPEGMarker marker;
-
-	if (!data) return;
-	if (!d) return;
-
-	for (o = 0; o < size;) {
-
-		/*
-		 * JPEG sections start with 0xff. The first byte that is
-		 * not 0xff is a marker (hopefully).
-		 */
-		for (i = 0; i < MIN(7, size - o); i++)
-			if (d[o + i] != 0xff)
-				break;
-		if ((i >= size - o) || !JPEG_IS_MARKER (d[o + i])) {
-			exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "jpeg-data",
-					_("Data does not follow JPEG specification."));
-			return;
-		}
-		marker = d[o + i];
-
-		/* Append this section */
-		jpeg_data_append_section (data);
-		if (!data->count) return;
-		s = &data->sections[data->count - 1];
-		s->marker = marker;
-		o += i + 1;
-
-		switch (s->marker) {
-		case JPEG_MARKER_SOI:
-		case JPEG_MARKER_EOI:
-			break;
-		default:
-
-			/* Read the length of the section */
-			if (2 > size - o) { o = size; break; }
-			len = ((d[o] << 8) | d[o + 1]) - 2;
-			if (len > size) { o = size; break; }
-			o += 2;
-			if (len > size - o) { o = size; break; }
-
-			switch (s->marker) {
-			case JPEG_MARKER_APP1:
-				s->content.app1 = exif_data_new_from_data (
-							d + o - 4, len + 4);
-				break;
-			default:
-				s->content.generic.data =
-						malloc (sizeof (char) * len);
-				if (!s->content.generic.data) {
-					EXIF_LOG_NO_MEMORY (data->priv->log, "jpeg-data", sizeof (char) * len);
-					return;
-				}
-				s->content.generic.size = len;
-				memcpy (s->content.generic.data, &d[o], len);
-
-				/* In case of SOS, image data will follow. */
-				if (s->marker == JPEG_MARKER_SOS) {
-					data->size = size - o - len;
-					if (data->size >= 2) {
-						/* -2 means 'take all but the last 2 bytes which are
-						   hoped to be JPEG_MARKER_EOI */
-						data->size -= 2;
-						if (d[o + len + data->size] != 0xFF) {
-							/* A truncated file (i.e. w/o JPEG_MARKER_EOI at the end).
-							   Instead of trying to use the last two bytes as marker,
-							   touching memory beyond allocated memory and posssibly saving
-							   back screwed file, we rather take the rest of the file. */
-							data->size += 2;
-						}
-					}
-					data->data = malloc (
-						sizeof (char) * data->size);
-					if (!data->data) {
-						EXIF_LOG_NO_MEMORY (data->priv->log, "jpeg-data", sizeof (char) * data->size);
-						data->size = 0;
-						return;
-					}
-					memcpy (data->data, d + o + len,
-						data->size);
-					o += data->size;
-				}
-				break;
-			}
-			o += len;
-			break;
-		}
-	}
-}
-
-JPEGData *
-jpeg_data_new_from_file (const char *path)
-{
-	JPEGData *data;
-
-	data = jpeg_data_new ();
-	jpeg_data_load_file (data, path);
-	return (data);
-}
-
-void
-jpeg_data_load_file (JPEGData *data, const char *path)
-{
-	FILE *f;
-	unsigned char *d;
-	unsigned int size;
-
-	if (!data) return;
-	if (!path) return;
-
-	f = fopen (path, "rb");
-	if (!f) {
-		exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "jpeg-data",
-				_("Path '%s' invalid."), path);
-		return;
-	}
-
-	/* For now, we read the data into memory. Patches welcome... */
-	fseek (f, 0, SEEK_END);
-	size = ftell (f);
-	fseek (f, 0, SEEK_SET);
-	d = malloc (size);
-	if (!d) {
-		EXIF_LOG_NO_MEMORY (data->priv->log, "jpeg-data", size);
-		fclose (f);
-		return;
-	}
-	if (fread (d, 1, size, f) != size) {
-		free (d);
-		fclose (f);
-		exif_log (data->priv->log, EXIF_LOG_CODE_CORRUPT_DATA, "jpeg-data",
-				_("Could not read '%s'."), path);
-		return;
-	}
-	fclose (f);
-
-	jpeg_data_load_data (data, d, size);
-	free (d);
-}
-
-void
-jpeg_data_ref (JPEGData *data)
-{
-	if (!data)
-		return;
-
-	data->priv->ref_count++;
-}
-
-void
-jpeg_data_unref (JPEGData *data)
-{
-	if (!data)
-		return;
-
-	if (data->priv) {
-		data->priv->ref_count--;
-		if (!data->priv->ref_count)
-			jpeg_data_free (data);
-	}
-}
-
-void
-jpeg_data_free (JPEGData *data)
-{
-	unsigned int i;
-	JPEGSection s;
-
-	if (!data)
-		return;
-
-	if (data->count) {
-		for (i = 0; i < data->count; i++) {
-			s = data->sections[i];
-			switch (s.marker) {
-			case JPEG_MARKER_SOI:
-			case JPEG_MARKER_EOI:
-				break;
-			case JPEG_MARKER_APP1:
-				exif_data_unref (s.content.app1);
-				break;
-			default:
-				free (s.content.generic.data);
-				break;
-			}
-		}
-		free (data->sections);
-	}
-
-	if (data->data)
-		free (data->data);
-
-	if (data->priv) {
-		if (data->priv->log) {
-			exif_log_unref (data->priv->log);
-			data->priv->log = NULL;
-		}
-		free (data->priv);
-	}
-
-	free (data);
-}
-
-void
-jpeg_data_dump (JPEGData *data)
-{
-	unsigned int i;
-	JPEGContent content;
-	JPEGMarker marker;
-
-	if (!data)
-		return;
-
-	printf ("Dumping JPEG data (%i bytes of data)...\n", data->size);
-	for (i = 0; i < data->count; i++) {
-		marker = data->sections[i].marker;
-		content = data->sections[i].content;
-		printf ("Section %i (marker 0x%x - %s):\n", i, marker,
-			jpeg_marker_get_name (marker));
-		printf ("  Description: %s\n",
-			jpeg_marker_get_description (marker));
-		switch (marker) {
-                case JPEG_MARKER_SOI:
-                case JPEG_MARKER_EOI:
-			break;
-                case JPEG_MARKER_APP1:
-			exif_data_dump (content.app1);
-			break;
-                default:
-			printf ("  Size: %i\n", content.generic.size);
-                        printf ("  Unknown content.\n");
-                        break;
-                }
-        }
-}
-
-static JPEGSection *
-jpeg_data_get_section (JPEGData *data, JPEGMarker marker)
-{
-	unsigned int i;
-
-	if (!data)
-		return (NULL);
-
-	for (i = 0; i < data->count; i++)
-		if (data->sections[i].marker == marker)
-			return (&data->sections[i]);
-	return (NULL);
-}
-
-ExifData *
-jpeg_data_get_exif_data (JPEGData *data)
-{
-	JPEGSection *section;
-
-	if (!data)
-		return NULL;
-
-	section = jpeg_data_get_section (data, JPEG_MARKER_APP1);
-	if (section) {
-		exif_data_ref (section->content.app1);
-		return (section->content.app1);
-	}
-
-	return (NULL);
-}
-
-void
-jpeg_data_set_exif_data (JPEGData *data, ExifData *exif_data)
-{
-	JPEGSection *section;
-
-	if (!data) return;
-
-	section = jpeg_data_get_section (data, JPEG_MARKER_APP1);
-	if (!section) {
-		jpeg_data_append_section (data);
-		if (data->count < 2) return;
-		memmove (&data->sections[2], &data->sections[1],
-			 sizeof (JPEGSection) * (data->count - 2));
-		section = &data->sections[1];
-	} else {
-		exif_data_unref (section->content.app1);
-	}
-	section->marker = JPEG_MARKER_APP1;
-	section->content.app1 = exif_data;
-	exif_data_ref (exif_data);
-}
-
-void
-jpeg_data_log (JPEGData *data, ExifLog *log)
-{
-	if (!data || !data->priv) return;
-	if (data->priv->log) exif_log_unref (data->priv->log);
-	data->priv->log = log;
-	exif_log_ref (log);
-}

data/ext/exif/libjpeg/jpeg-data.h

@@ -1,92 +0,0 @@
-/* jpeg-data.h
- *
- * Copyright � 2001 Lutz M�ller <lutz@users.sourceforge.net>
- *
- * 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
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA.
- */
-
-#ifndef __JPEG_DATA_H__
-#define __JPEG_DATA_H__
-
-#include "libjpeg/jpeg-marker.h"
-
-#include <libexif/exif-data.h>
-#include <libexif/exif-log.h>
-
-typedef ExifData * JPEGContentAPP1;
-
-typedef struct _JPEGContentGeneric JPEGContentGeneric;
-struct _JPEGContentGeneric
-{
-	unsigned char *data;
-	unsigned int size;
-};
-
-typedef union _JPEGContent JPEGContent;
-union _JPEGContent
-{
-	JPEGContentGeneric generic;
-	JPEGContentAPP1    app1;
-};
-
-typedef struct _JPEGSection JPEGSection;
-struct _JPEGSection
-{
-	JPEGMarker marker;
-	JPEGContent content;
-};
-
-typedef struct _JPEGData        JPEGData;
-typedef struct _JPEGDataPrivate JPEGDataPrivate;
-
-struct _JPEGData
-{
-	JPEGSection *sections;
-	unsigned int count;
-
-	unsigned char *data;
-	unsigned int size;
-
-	JPEGDataPrivate *priv;
-};
-
-JPEGData *jpeg_data_new           (void);
-JPEGData *jpeg_data_new_from_file (const char *path);
-JPEGData *jpeg_data_new_from_data (const unsigned char *data,
-				   unsigned int size);
-
-void      jpeg_data_ref   (JPEGData *data);
-void      jpeg_data_unref (JPEGData *data);
-void      jpeg_data_free  (JPEGData *data);
-
-void      jpeg_data_load_data     (JPEGData *data, const unsigned char *d,
-				   unsigned int size);
-void      jpeg_data_save_data     (JPEGData *data, unsigned char **d,
-				   unsigned int *size);
-
-void      jpeg_data_load_file     (JPEGData *data, const char *path);
-int       jpeg_data_save_file     (JPEGData *data, const char *path);
-
-void      jpeg_data_set_exif_data (JPEGData *data, ExifData *exif_data);
-ExifData *jpeg_data_get_exif_data (JPEGData *data);
-
-void      jpeg_data_dump (JPEGData *data);
-
-void      jpeg_data_append_section (JPEGData *data);
-
-void      jpeg_data_log (JPEGData *data, ExifLog *log);
-
-#endif /* __JPEG_DATA_H__ */

data/ext/exif/libjpeg/jpeg-marker.c

@@ -1,122 +0,0 @@
-/* jpeg-marker.c
- *
- * Copyright � 2001-2008 Lutz M�ller <lutz@users.sourceforge.net>
- *
- * 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
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA.
- */
-#include "config.h"
-#include "jpeg-marker.h"
-
-#include <stdlib.h>
-
-static const struct {
-        JPEGMarker marker;
-        const char *name;
-        const char *description;
-} JPEGMarkerTable[] = {
-        {JPEG_MARKER_SOF0, "SOF0", "Encoding (baseline)"},
-        {JPEG_MARKER_SOF1, "SOF1", "Encoding (extended sequential)"},
-        {JPEG_MARKER_SOF2, "SOF2", "Encoding (progressive)"},
-        {JPEG_MARKER_SOF3, "SOF3", "Encoding (lossless)"},
-        {JPEG_MARKER_SOF5, "SOF5", "Encoding (differential sequential)"},
-        {JPEG_MARKER_SOF6, "SOF6", "Encoding (differential progressive)"},
-        {JPEG_MARKER_SOF7, "SOF7", "Encoding (differential lossless)"},
-        {JPEG_MARKER_SOF9, "SOF9",
-		"Encoding (extended sequential, arithmetic)"},
-        {JPEG_MARKER_SOF10, "SOF10", "Encoding (progressive, arithmetic)"},
-        {JPEG_MARKER_SOF11, "SOF11", "Encoding (lossless, arithmetic)"},
-        {JPEG_MARKER_SOF13, "SOF13",
-		"Encoding (differential sequential, arithmetic)"},
-        {JPEG_MARKER_SOF14, "SOF14",
-		"Encoding (differential progressive, arithmetic)"},
-        {JPEG_MARKER_SOF15, "SOF15",
-		"Encoding (differential lossless, arithmetic)"},
-	{JPEG_MARKER_SOI, "SOI", "Start of image"},
-	{JPEG_MARKER_EOI, "EOI", "End of image"},
-	{JPEG_MARKER_SOS, "SOS", "Start of scan"},
-	{JPEG_MARKER_COM, "COM", "Comment"},
-	{JPEG_MARKER_DHT, "DHT", "Define Huffman table"},
-	{JPEG_MARKER_JPG, "JPG", "Extension"},
-	{JPEG_MARKER_DAC, "DAC", "Define arithmetic coding conditioning"},
-	{JPEG_MARKER_RST1, "RST1", "Restart 1"},
-	{JPEG_MARKER_RST2, "RST2", "Restart 2"},
-	{JPEG_MARKER_RST3, "RST3", "Restart 3"},
-	{JPEG_MARKER_RST4, "RST4", "Restart 4"},
-	{JPEG_MARKER_RST5, "RST5", "Restart 5"},
-	{JPEG_MARKER_RST6, "RST6", "Restart 6"},
-	{JPEG_MARKER_RST7, "RST7", "Restart 7"},
-	{JPEG_MARKER_DQT, "DQT", "Define quantization table"},
-	{JPEG_MARKER_DNL, "DNL", "Define number of lines"},
-	{JPEG_MARKER_DRI, "DRI", "Define restart interval"},
-	{JPEG_MARKER_DHP, "DHP", "Define hierarchical progression"},
-	{JPEG_MARKER_EXP, "EXP", "Expand reference component"},
-	{JPEG_MARKER_APP0, "APP0", "Application segment 0"},
-	{JPEG_MARKER_APP1, "APP1", "Application segment 1"},
-	{JPEG_MARKER_APP2, "APP2", "Application segment 2"},
-	{JPEG_MARKER_APP3, "APP3", "Application segment 3"},
-	{JPEG_MARKER_APP4, "APP4", "Application segment 4"},
-	{JPEG_MARKER_APP5, "APP5", "Application segment 5"},
-	{JPEG_MARKER_APP6, "APP6", "Application segment 6"},
-	{JPEG_MARKER_APP7, "APP7", "Application segment 7"},
-	{JPEG_MARKER_APP8, "APP8", "Application segment 8"},
-	{JPEG_MARKER_APP9, "APP9", "Application segment 9"},
-	{JPEG_MARKER_APP10, "APP10", "Application segment 10"},
-	{JPEG_MARKER_APP11, "APP11", "Application segment 11"},
-	{JPEG_MARKER_APP12, "APP12", "Application segment 12"},
-	{JPEG_MARKER_APP13, "APP13", "Application segment 13"},
-	{JPEG_MARKER_APP14, "APP14", "Application segment 14"},
-	{JPEG_MARKER_APP15, "APP15", "Application segment 15"},
-	{JPEG_MARKER_JPG0, "JPG0", "Extension 0"},
-	{JPEG_MARKER_JPG1, "JPG1", "Extension 1"},
-	{JPEG_MARKER_JPG2, "JPG2", "Extension 2"},
-	{JPEG_MARKER_JPG3, "JPG3", "Extension 3"},
-	{JPEG_MARKER_JPG4, "JPG4", "Extension 4"},
-	{JPEG_MARKER_JPG5, "JPG5", "Extension 5"},
-	{JPEG_MARKER_JPG6, "JPG6", "Extension 6"},
-	{JPEG_MARKER_JPG7, "JPG7", "Extension 7"},
-	{JPEG_MARKER_JPG8, "JPG8", "Extension 8"},
-	{JPEG_MARKER_JPG9, "JPG9", "Extension 9"},
-	{JPEG_MARKER_JPG10, "JPG10", "Extension 10"},
-	{JPEG_MARKER_JPG11, "JPG11", "Extension 11"},
-	{JPEG_MARKER_JPG12, "JPG12", "Extension 12"},
-	{JPEG_MARKER_JPG13, "JPG13", "Extension 13"},
-	{0, NULL, NULL}
-};
-
-const char *
-jpeg_marker_get_name (JPEGMarker marker)
-{
-	unsigned int i;
-
-	for (i = 0; JPEGMarkerTable[i].name; i++)
-		if (JPEGMarkerTable[i].marker == marker)
-			break;
-
-	return (JPEGMarkerTable[i].name);
-}
-
-const char *
-jpeg_marker_get_description (JPEGMarker marker)
-{
-	unsigned int i;
-
-	for (i = 0; JPEGMarkerTable[i].description; i++)
-		if (JPEGMarkerTable[i].marker == marker)
-			break;
-
-	return (JPEGMarkerTable[i].description);
-}
-

data/ext/exif/libjpeg/jpeg-marker.h

@@ -1,103 +0,0 @@
-/* jpeg-marker.h
- *
- * Copyright � 2001 Lutz M�ller <lutz@users.sourceforge.net>
- *
- * 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
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful, 
- * but WITHOUT ANY WARRANTY; without even the implied warranty of 
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details. 
- *
- * 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., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA.
- */
-#ifndef __JPEG_MARKER_H__
-#define __JPEG_MARKER_H__
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-typedef enum {
-        JPEG_MARKER_SOF0        = 0xc0,
-        JPEG_MARKER_SOF1        = 0xc1,
-        JPEG_MARKER_SOF2        = 0xc2,
-        JPEG_MARKER_SOF3        = 0xc3,
-	JPEG_MARKER_DHT		= 0xc4,
-        JPEG_MARKER_SOF5        = 0xc5,
-        JPEG_MARKER_SOF6        = 0xc6,
-        JPEG_MARKER_SOF7        = 0xc7,
-	JPEG_MARKER_JPG		= 0xc8,
-        JPEG_MARKER_SOF9        = 0xc9,
-        JPEG_MARKER_SOF10       = 0xca,
-        JPEG_MARKER_SOF11       = 0xcb,
-	JPEG_MARKER_DAC		= 0xcc,
-        JPEG_MARKER_SOF13       = 0xcd,
-        JPEG_MARKER_SOF14       = 0xce,
-        JPEG_MARKER_SOF15       = 0xcf,
-        JPEG_MARKER_RST0	= 0xd0,
-        JPEG_MARKER_RST1	= 0xd1,
-        JPEG_MARKER_RST2	= 0xd2,
-        JPEG_MARKER_RST3	= 0xd3,
-        JPEG_MARKER_RST4	= 0xd4,
-	JPEG_MARKER_RST5	= 0xd5,
-        JPEG_MARKER_RST6	= 0xd6,
-        JPEG_MARKER_RST7	= 0xd7,
-        JPEG_MARKER_SOI         = 0xd8,
-        JPEG_MARKER_EOI         = 0xd9,
-        JPEG_MARKER_SOS         = 0xda,
-        JPEG_MARKER_DQT		= 0xdb,
-        JPEG_MARKER_DNL		= 0xdc,
-        JPEG_MARKER_DRI		= 0xdd,
-        JPEG_MARKER_DHP		= 0xde,
-        JPEG_MARKER_EXP		= 0xdf,
-	JPEG_MARKER_APP0	= 0xe0,
-        JPEG_MARKER_APP1        = 0xe1,
-	JPEG_MARKER_APP2        = 0xe2,
-	JPEG_MARKER_APP3        = 0xe3,
-	JPEG_MARKER_APP4        = 0xe4,
-	JPEG_MARKER_APP5        = 0xe5,
-	JPEG_MARKER_APP6        = 0xe6,
-	JPEG_MARKER_APP7        = 0xe7,
-	JPEG_MARKER_APP8        = 0xe8,
-	JPEG_MARKER_APP9        = 0xe9,
-	JPEG_MARKER_APP10       = 0xea,
-	JPEG_MARKER_APP11       = 0xeb,
-	JPEG_MARKER_APP12       = 0xec,
-	JPEG_MARKER_APP13       = 0xed,
-	JPEG_MARKER_APP14       = 0xee,
-	JPEG_MARKER_APP15       = 0xef,
-	JPEG_MARKER_JPG0	= 0xf0,
-	JPEG_MARKER_JPG1	= 0xf1,
-	JPEG_MARKER_JPG2	= 0xf2,
-	JPEG_MARKER_JPG3	= 0xf3,
-	JPEG_MARKER_JPG4	= 0xf4,
-	JPEG_MARKER_JPG5	= 0xf5,
-	JPEG_MARKER_JPG6	= 0xf6,
-	JPEG_MARKER_JPG7	= 0xf7,
-	JPEG_MARKER_JPG8	= 0xf8,
-	JPEG_MARKER_JPG9	= 0xf9,
-	JPEG_MARKER_JPG10	= 0xfa,
-	JPEG_MARKER_JPG11	= 0xfb,
-	JPEG_MARKER_JPG12	= 0xfc,
-	JPEG_MARKER_JPG13	= 0xfd,
-        JPEG_MARKER_COM         = 0xfe
-} JPEGMarker;
-
-#define JPEG_IS_MARKER(m) (((m) >= JPEG_MARKER_SOF0) &&		\
-			   ((m) <= JPEG_MARKER_COM))
-
-const char *jpeg_marker_get_name        (JPEGMarker marker);
-const char *jpeg_marker_get_description (JPEGMarker marker);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* __JPEG_MARKER_H__ */