Changeset 336

Show
Ignore:
Timestamp:
01/01/10 20:40:05 (2 years ago)
Author:
mwarning
Message:

fix conversion bugs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/jpeglib.d

    r334 r336  
    705705   * end of processing. 
    706706   */ 
    707   long num_warnings;      /* number of corrupt-data warnings */ 
     707  size_t num_warnings;        /* number of corrupt-data warnings */ 
    708708 
    709709  /* These fields point to the table(s) of error message strings. 
     
    733733  void function(j_common_ptr cinfo) progress_monitor; 
    734734 
    735   long pass_counter;      /* work units completed in this pass */ 
    736   long pass_limit;        /* total number of work units in this pass */ 
     735  size_t pass_counter;        /* work units completed in this pass */ 
     736  size_t pass_limit;      /* total number of work units in this pass */ 
    737737  int completed_passes;     /* passes completed so far */ 
    738738  int total_passes;     /* total number of passes expected */ 
     
    760760  void function(j_decompress_ptr cinfo) init_source; 
    761761  boolean function(j_decompress_ptr cinfo) fill_input_buffer; 
    762   void function(j_decompress_ptr cinfo, long num_bytes) skip_input_data; 
     762  void function(j_decompress_ptr cinfo, size_t num_bytes) skip_input_data; 
    763763  boolean function(j_decompress_ptr cinfo, int desired) resync_to_restart; 
    764764  void function(j_decompress_ptr cinfo) term_source; 
     
    787787struct jpeg_memory_mgr { 
    788788  /* Method pointers */ 
    789   void * function(j_common_ptr cinfo, int pool_id, 
     789  void* function(j_common_ptr cinfo, int pool_id, 
    790790                size_t sizeofobject) alloc_small; 
    791791  void /*FAR*/ * function (j_common_ptr cinfo, int pool_id, 
     
    828828   * after creating the JPEG object. 
    829829   */ 
    830   long max_memory_to_use; 
     830  size_t max_memory_to_use; 
    831831 
    832832  /* Maximum allocation request accepted by alloc_large. */ 
    833   long max_alloc_chunk; 
     833  size_t max_alloc_chunk; 
    834834} 
    835835 
     
    11021102//#ifdef INCOMPLETE_TYPES_BROKEN 
    11031103//#ifndef JPEG_INTERNALS        /* will be defined in jpegint.h */ 
    1104 struct jvirt_sarray_control { long dummy; }; 
    1105 struct jvirt_barray_control { long dummy; }; 
    1106 struct jpeg_comp_master { long dummy; }; 
    1107 struct jpeg_c_main_controller { long dummy; }; 
    1108 struct jpeg_c_prep_controller { long dummy; }; 
    1109 struct jpeg_c_coef_controller { long dummy; }; 
    1110 struct jpeg_marker_writer { long dummy; }; 
    1111 struct jpeg_color_converter { long dummy; }; 
    1112 struct jpeg_downsampler { long dummy; }; 
    1113 struct jpeg_forward_dct { long dummy; }; 
    1114 struct jpeg_entropy_encoder { long dummy; }; 
    1115 struct jpeg_decomp_master { long dummy; }; 
    1116 struct jpeg_d_main_controller { long dummy; }; 
    1117 struct jpeg_d_coef_controller { long dummy; }; 
    1118 struct jpeg_d_post_controller { long dummy; }; 
    1119 struct jpeg_input_controller { long dummy; }; 
    1120 struct jpeg_marker_reader { long dummy; }; 
    1121 struct jpeg_entropy_decoder { long dummy; }; 
    1122 struct jpeg_inverse_dct { long dummy; }; 
    1123 struct jpeg_upsampler { long dummy; }; 
    1124 struct jpeg_color_deconverter { long dummy; }; 
    1125 struct jpeg_color_quantizer { long dummy; }; 
     1104struct jvirt_sarray_control { size_t dummy; }; 
     1105struct jvirt_barray_control { size_t dummy; }; 
     1106struct jpeg_comp_master { size_t dummy; }; 
     1107struct jpeg_c_main_controller { size_t dummy; }; 
     1108struct jpeg_c_prep_controller { size_t dummy; }; 
     1109struct jpeg_c_coef_controller { size_t dummy; }; 
     1110struct jpeg_marker_writer { size_t dummy; }; 
     1111struct jpeg_color_converter { size_t dummy; }; 
     1112struct jpeg_downsampler { size_t dummy; }; 
     1113struct jpeg_forward_dct { size_t dummy; }; 
     1114struct jpeg_entropy_encoder { size_t dummy; }; 
     1115struct jpeg_decomp_master { size_t dummy; }; 
     1116struct jpeg_d_main_controller { size_t dummy; }; 
     1117struct jpeg_d_coef_controller { size_t dummy; }; 
     1118struct jpeg_d_post_controller { size_t dummy; }; 
     1119struct jpeg_input_controller { size_t dummy; }; 
     1120struct jpeg_marker_reader { size_t dummy; }; 
     1121struct jpeg_entropy_decoder { size_t dummy; }; 
     1122struct jpeg_inverse_dct { size_t dummy; }; 
     1123struct jpeg_upsampler { size_t dummy; }; 
     1124struct jpeg_color_deconverter { size_t dummy; }; 
     1125struct jpeg_color_quantizer { size_t dummy; }; 
    11261126//#endif /* JPEG_INTERNALS */ 
    11271127//#endif /* INCOMPLETE_TYPES_BROKEN */ 
  • trunk/videodev2.d

    r333 r336  
    5959 *  et al. 
    6060 */ 
    61  module videodev2; //videodev2.h 
     61 module videodev2; 
    6262  
    6363 /* 
     
    7878alias ulong __u64; 
    7979alias ushort __u16; 
    80 alias ulong c_ulong; //unsigned long 
    8180alias uint __le32; //TODO!! defined in /usr/include/linux/types.h 
    8281 
     
    526525 union M { 
    527526  __u32           offset; 
    528  c_ulong   userptr; 
     527 size_t   userptr; 
    529528 } 
    530529 
     
    543542 /*union*/ M /*{ 
    544543  __u32           offset; 
    545  c_ulong   userptr; 
     544 size_t   userptr; 
    546545 }*/ m; 
    547546 __u32   length;