Changeset 337 for trunk/jpeglib.d

Show
Ignore:
Timestamp:
01/01/10 22:38:56 (2 years ago)
Author:
mwarning
Message:

fix extern

Files:

Legend:

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

    r336 r337  
    2929//import jmorecfg;      /* seldom changed options */ 
    3030 
     31extern(C): 
     32 
    3133alias char JOCTET; 
    3234alias char JSAMPLE; 
     
    4951 
    5052const DCTSIZE = 8;  /* The basic DCT block is 8x8 samples */ 
    51 const DCTSIZE2 = 64;  /* DCTSIZE squared; # of elements in a block */ 
     53const DCTSIZE2 = 64;  /* DCTSIZE squared; # of elements in a block */ 
    5254const NUM_QUANT_TBLS = 4;   /* Quantization tables are numbered 0..3 */ 
    5355const NUM_HUFF_TBLS = 4;    /* Huffman tables are numbered 0..3 */ 
     
    916918 
    917919/* Default error-management setup */ 
    918 extern(C) /*struct*/ jpeg_error_mgr* jpeg_std_error 
     920/*struct*/ jpeg_error_mgr* jpeg_std_error 
    919921    (/*struct*/ jpeg_error_mgr * err); 
    920922 
     
    939941} 
    940942 
    941 extern(C) void jpeg_CreateCompress (j_compress_ptr cinfo, 
     943void jpeg_CreateCompress (j_compress_ptr cinfo, 
    942944                      int version_, size_t structsize); 
    943 extern(C) void jpeg_CreateDecompress (j_decompress_ptr cinfo, 
     945void jpeg_CreateDecompress (j_decompress_ptr cinfo, 
    944946                    int version_, size_t structsize); 
    945947/* Destruction of JPEG compression objects */ 
    946 extern(C) void jpeg_destroy_compress (j_compress_ptr cinfo); 
    947 extern(C) void jpeg_destroy_decompress (j_decompress_ptr cinfo); 
     948void jpeg_destroy_compress (j_compress_ptr cinfo); 
     949void jpeg_destroy_decompress (j_decompress_ptr cinfo); 
    948950 
    949951/* Standard data source and destination managers: stdio streams. */ 
    950952/* Caller is responsible for opening the file before and closing after. */ 
    951 extern(C) void jpeg_stdio_dest (j_compress_ptr cinfo, FILE * outfile); 
    952 extern(C) void jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile); 
     953void jpeg_stdio_dest (j_compress_ptr cinfo, FILE * outfile); 
     954void jpeg_stdio_src (j_decompress_ptr cinfo, FILE * infile); 
    953955 
    954956/* Default parameter setup for compression */ 
    955 extern(C) void jpeg_set_defaults (j_compress_ptr cinfo); 
     957void jpeg_set_defaults (j_compress_ptr cinfo); 
    956958/* Compression parameter setup aids */ 
    957 extern(C) void jpeg_set_colorspace (j_compress_ptr cinfo, 
     959void jpeg_set_colorspace (j_compress_ptr cinfo, 
    958960                      J_COLOR_SPACE colorspace); 
    959 extern(C) void jpeg_default_colorspace (j_compress_ptr cinfo); 
    960 extern(C) void jpeg_set_quality (j_compress_ptr cinfo, int quality, 
     961void jpeg_default_colorspace (j_compress_ptr cinfo); 
     962void jpeg_set_quality (j_compress_ptr cinfo, int quality, 
    961963                   boolean force_baseline); 
    962 extern(C) void jpeg_set_linear_quality (j_compress_ptr cinfo, 
     964void jpeg_set_linear_quality (j_compress_ptr cinfo, 
    963965                      int scale_factor, 
    964966                      boolean force_baseline); 
    965 extern(C) void jpeg_default_qtables (j_compress_ptr cinfo, 
     967void jpeg_default_qtables (j_compress_ptr cinfo, 
    966968                       boolean force_baseline); 
    967 extern(C) void jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl, 
     969void jpeg_add_quant_table (j_compress_ptr cinfo, int which_tbl, 
    968970                       /*const*/ uint *basic_table, 
    969971                       int scale_factor, 
    970972                       boolean force_baseline); 
    971 extern(C) int jpeg_quality_scaling (int quality); 
    972 extern(C) void jpeg_simple_progression (j_compress_ptr cinfo); 
    973 extern(C) void jpeg_suppress_tables (j_compress_ptr cinfo, 
     973int jpeg_quality_scaling (int quality); 
     974void jpeg_simple_progression (j_compress_ptr cinfo); 
     975void jpeg_suppress_tables (j_compress_ptr cinfo, 
    974976                       boolean suppress); 
    975 extern(C) JQUANT_TBL* jpeg_alloc_quant_table (j_common_ptr cinfo); 
    976 extern(C) JHUFF_TBL* jpeg_alloc_huff_table (j_common_ptr cinfo); 
     977JQUANT_TBL* jpeg_alloc_quant_table (j_common_ptr cinfo); 
     978JHUFF_TBL* jpeg_alloc_huff_table (j_common_ptr cinfo); 
    977979 
    978980/* Main entry points for compression */ 
    979 extern(C) void jpeg_start_compress (j_compress_ptr cinfo, 
     981void jpeg_start_compress (j_compress_ptr cinfo, 
    980982                      boolean write_all_tables); 
    981 extern(C) JDIMENSION jpeg_write_scanlines (j_compress_ptr cinfo, 
     983JDIMENSION jpeg_write_scanlines (j_compress_ptr cinfo, 
    982984                         JSAMPARRAY scanlines, 
    983985                         JDIMENSION num_lines); 
    984 extern(C) void jpeg_finish_compress (j_compress_ptr cinfo); 
     986void jpeg_finish_compress (j_compress_ptr cinfo); 
    985987 
    986988/* Precalculate JPEG dimensions for current compression parameters. */ 
    987 extern(C) void jpeg_calc_jpeg_dimensions (j_compress_ptr cinfo); 
     989void jpeg_calc_jpeg_dimensions (j_compress_ptr cinfo); 
    988990 
    989991/* Replaces jpeg_write_scanlines when writing raw downsampled data. */ 
    990 extern(C) JDIMENSION jpeg_write_raw_data (j_compress_ptr cinfo, 
     992JDIMENSION jpeg_write_raw_data (j_compress_ptr cinfo, 
    991993                        JSAMPIMAGE data, 
    992994                        JDIMENSION num_lines); 
    993995 
    994996/* Write a special marker.  See libjpeg.txt concerning safe usage. */ 
    995 extern(C) void jpeg_write_marker 
     997void jpeg_write_marker 
    996998    (j_compress_ptr cinfo, int marker, 
    997999         /*const*/ JOCTET * dataptr, uint datalen); 
    9981000/* Same, but piecemeal. */ 
    999 extern(C) void jpeg_write_m_header 
     1001void jpeg_write_m_header 
    10001002    (j_compress_ptr cinfo, int marker, uint datalen); 
    1001 extern(C) void jpeg_write_m_byte 
     1003void jpeg_write_m_byte 
    10021004    (j_compress_ptr cinfo, int val); 
    10031005 
    10041006/* Alternate compression function: just write an abbreviated table file */ 
    1005 extern(C) void jpeg_write_tables (j_compress_ptr cinfo); 
     1007void jpeg_write_tables (j_compress_ptr cinfo); 
    10061008 
    10071009/* Decompression startup: read start of JPEG datastream to see what's there */ 
    1008 extern(C) int jpeg_read_header (j_decompress_ptr cinfo, 
     1010int jpeg_read_header (j_decompress_ptr cinfo, 
    10091011                  boolean require_image); 
    10101012/* Return value is one of: */ 
     
    10191021 
    10201022/* Main entry points for decompression */ 
    1021 extern(C) boolean jpeg_start_decompress (j_decompress_ptr cinfo); 
    1022 extern(C) JDIMENSION jpeg_read_scanlines (j_decompress_ptr cinfo, 
     1023boolean jpeg_start_decompress (j_decompress_ptr cinfo); 
     1024JDIMENSION jpeg_read_scanlines (j_decompress_ptr cinfo, 
    10231025                        JSAMPARRAY scanlines, 
    10241026                        JDIMENSION max_lines); 
    1025 extern(C) boolean jpeg_finish_decompress (j_decompress_ptr cinfo); 
     1027boolean jpeg_finish_decompress (j_decompress_ptr cinfo); 
    10261028 
    10271029/* Replaces jpeg_read_scanlines when reading raw downsampled data. */ 
    1028 extern(C) JDIMENSION jpeg_read_raw_data (j_decompress_ptr cinfo, 
     1030JDIMENSION jpeg_read_raw_data (j_decompress_ptr cinfo, 
    10291031                       JSAMPIMAGE data, 
    10301032                       JDIMENSION max_lines); 
    10311033 
    10321034/* Additional entry points for buffered-image mode. */ 
    1033 extern(C) boolean jpeg_has_multiple_scans (j_decompress_ptr cinfo); 
    1034 extern(C) boolean jpeg_start_output (j_decompress_ptr cinfo, 
     1035boolean jpeg_has_multiple_scans (j_decompress_ptr cinfo); 
     1036boolean jpeg_start_output (j_decompress_ptr cinfo, 
    10351037                       int scan_number); 
    1036 extern(C) boolean jpeg_finish_output (j_decompress_ptr cinfo); 
    1037 extern(C) boolean jpeg_input_complete (j_decompress_ptr cinfo); 
    1038 extern(C) void jpeg_new_colormap (j_decompress_ptr cinfo); 
    1039 extern(C) int jpeg_consume_input (j_decompress_ptr cinfo); 
     1038boolean jpeg_finish_output (j_decompress_ptr cinfo); 
     1039boolean jpeg_input_complete (j_decompress_ptr cinfo); 
     1040void jpeg_new_colormap (j_decompress_ptr cinfo); 
     1041int jpeg_consume_input (j_decompress_ptr cinfo); 
    10401042/* Return value is one of: */ 
    10411043/* const JPEG_SUSPENDED = 0;    Suspended due to lack of input data */ 
     
    10461048 
    10471049/* Precalculate output dimensions for current decompression parameters. */ 
    1048 extern(C) void jpeg_calc_output_dimensions (j_decompress_ptr cinfo); 
     1050void jpeg_calc_output_dimensions (j_decompress_ptr cinfo); 
    10491051 
    10501052/* Control saving of COM and APPn markers into marker_list. */ 
    1051 extern(C) void jpeg_save_markers 
     1053void jpeg_save_markers 
    10521054    (j_decompress_ptr cinfo, int marker_code, 
    10531055         uint length_limit); 
    10541056 
    10551057/* Install a special processing method for COM or APPn markers. */ 
    1056 extern(C) void jpeg_set_marker_processor 
     1058void jpeg_set_marker_processor 
    10571059    (j_decompress_ptr cinfo, int marker_code, 
    10581060         jpeg_marker_parser_method routine); 
    10591061 
    10601062/* Read or write raw DCT coefficients --- useful for lossless transcoding. */ 
    1061 extern(C) jvirt_barray_ptr* jpeg_read_coefficients (j_decompress_ptr cinfo); 
    1062 extern(C) void jpeg_write_coefficients (j_compress_ptr cinfo, 
     1063jvirt_barray_ptr* jpeg_read_coefficients (j_decompress_ptr cinfo); 
     1064void jpeg_write_coefficients (j_compress_ptr cinfo, 
    10631065                      jvirt_barray_ptr * coef_arrays); 
    1064 extern(C) void jpeg_copy_critical_parameters (j_decompress_ptr srcinfo, 
     1066void jpeg_copy_critical_parameters (j_decompress_ptr srcinfo, 
    10651067                        j_compress_ptr dstinfo); 
    10661068 
     
    10711073 * reuse it, call this: 
    10721074 */ 
    1073 extern(C) void jpeg_abort_compress (j_compress_ptr cinfo); 
    1074 extern(C) void jpeg_abort_decompress (j_decompress_ptr cinfo); 
     1075void jpeg_abort_compress (j_compress_ptr cinfo); 
     1076void jpeg_abort_decompress (j_decompress_ptr cinfo); 
    10751077 
    10761078/* Generic versions of jpeg_abort and jpeg_destroy that work on either 
    10771079 * flavor of JPEG object.  These may be more convenient in some places. 
    10781080 */ 
    1079 extern(C) void jpeg_abort (j_common_ptr cinfo); 
    1080 extern(C) void jpeg_destroy (j_common_ptr cinfo); 
     1081void jpeg_abort (j_common_ptr cinfo); 
     1082void jpeg_destroy (j_common_ptr cinfo); 
    10811083 
    10821084/* Default restart-marker-resync procedure for use by data source modules */ 
    1083 extern(C) boolean jpeg_resync_to_restart (j_decompress_ptr cinfo, 
     1085boolean jpeg_resync_to_restart (j_decompress_ptr cinfo, 
    10841086                        int desired); 
    10851087