Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk

  • trunk/src/3rdparty/libjpeg/jdct.h

    r2 r846  
    1515
    1616/*
    17  * A forward DCT routine is given a pointer to a work area of type DCTELEM[];
    18  * the DCT is to be performed in-place in that buffer.  Type DCTELEM is int
    19  * for 8-bit samples, INT32 for 12-bit samples.  (NOTE: Floating-point DCT
    20  * implementations use an array of type FAST_FLOAT, instead.)
    21  * The DCT inputs are expected to be signed (range +-CENTERJSAMPLE).
     17 * A forward DCT routine is given a pointer to an input sample array and
     18 * a pointer to a work area of type DCTELEM[]; the DCT is to be performed
     19 * in-place in that buffer.  Type DCTELEM is int for 8-bit samples, INT32
     20 * for 12-bit samples.  (NOTE: Floating-point DCT implementations use an
     21 * array of type FAST_FLOAT, instead.)
     22 * The input data is to be fetched from the sample array starting at a
     23 * specified column.  (Any row offset needed will be applied to the array
     24 * pointer before it is passed to the FDCT code.)
     25 * Note that the number of samples fetched by the FDCT routine is
     26 * DCT_h_scaled_size * DCT_v_scaled_size.
    2227 * The DCT outputs are returned scaled up by a factor of 8; they therefore
    2328 * have a range of +-8K for 8-bit data, +-128K for 12-bit data.  This
    … …  
    3338#endif
    3439
    35 typedef JMETHOD(void, forward_DCT_method_ptr, (DCTELEM * data));
    36 typedef JMETHOD(void, float_DCT_method_ptr, (FAST_FLOAT * data));
     40typedef JMETHOD(void, forward_DCT_method_ptr, (DCTELEM * data,
     41                                               JSAMPARRAY sample_data,
     42                                               JDIMENSION start_col));
     43typedef JMETHOD(void, float_DCT_method_ptr, (FAST_FLOAT * data,
     44                                             JSAMPARRAY sample_data,
     45                                             JDIMENSION start_col));
    3746
    3847
    … …  
    4554 * be applied to the array pointer before it is passed to the IDCT code.)
    4655 * Note that the number of samples emitted by the IDCT routine is
    47  * DCT_scaled_size * DCT_scaled_size.
     56 * DCT_h_scaled_size * DCT_v_scaled_size.
    4857 */
    4958
    … …  
    8594#define jpeg_fdct_ifast         jFDifast
    8695#define jpeg_fdct_float         jFDfloat
     96#define jpeg_fdct_7x7           jFD7x7
     97#define jpeg_fdct_6x6           jFD6x6
     98#define jpeg_fdct_5x5           jFD5x5
     99#define jpeg_fdct_4x4           jFD4x4
     100#define jpeg_fdct_3x3           jFD3x3
     101#define jpeg_fdct_2x2           jFD2x2
     102#define jpeg_fdct_1x1           jFD1x1
     103#define jpeg_fdct_9x9           jFD9x9
     104#define jpeg_fdct_10x10         jFD10x10
     105#define jpeg_fdct_11x11         jFD11x11
     106#define jpeg_fdct_12x12         jFD12x12
     107#define jpeg_fdct_13x13         jFD13x13
     108#define jpeg_fdct_14x14         jFD14x14
     109#define jpeg_fdct_15x15         jFD15x15
     110#define jpeg_fdct_16x16         jFD16x16
     111#define jpeg_fdct_16x8          jFD16x8
     112#define jpeg_fdct_14x7          jFD14x7
     113#define jpeg_fdct_12x6          jFD12x6
     114#define jpeg_fdct_10x5          jFD10x5
     115#define jpeg_fdct_8x4           jFD8x4
     116#define jpeg_fdct_6x3           jFD6x3
     117#define jpeg_fdct_4x2           jFD4x2
     118#define jpeg_fdct_2x1           jFD2x1
     119#define jpeg_fdct_8x16          jFD8x16
     120#define jpeg_fdct_7x14          jFD7x14
     121#define jpeg_fdct_6x12          jFD6x12
     122#define jpeg_fdct_5x10          jFD5x10
     123#define jpeg_fdct_4x8           jFD4x8
     124#define jpeg_fdct_3x6           jFD3x6
     125#define jpeg_fdct_2x4           jFD2x4
     126#define jpeg_fdct_1x2           jFD1x2
    87127#define jpeg_idct_islow         jRDislow
    88128#define jpeg_idct_ifast         jRDifast
    89129#define jpeg_idct_float         jRDfloat
     130#define jpeg_idct_7x7           jRD7x7
     131#define jpeg_idct_6x6           jRD6x6
     132#define jpeg_idct_5x5           jRD5x5
    90133#define jpeg_idct_4x4           jRD4x4
     134#define jpeg_idct_3x3           jRD3x3
    91135#define jpeg_idct_2x2           jRD2x2
    92136#define jpeg_idct_1x1           jRD1x1
     137#define jpeg_idct_9x9           jRD9x9
     138#define jpeg_idct_10x10         jRD10x10
     139#define jpeg_idct_11x11         jRD11x11
     140#define jpeg_idct_12x12         jRD12x12
     141#define jpeg_idct_13x13         jRD13x13
     142#define jpeg_idct_14x14         jRD14x14
     143#define jpeg_idct_15x15         jRD15x15
     144#define jpeg_idct_16x16         jRD16x16
     145#define jpeg_idct_16x8          jRD16x8
     146#define jpeg_idct_14x7          jRD14x7
     147#define jpeg_idct_12x6          jRD12x6
     148#define jpeg_idct_10x5          jRD10x5
     149#define jpeg_idct_8x4           jRD8x4
     150#define jpeg_idct_6x3           jRD6x3
     151#define jpeg_idct_4x2           jRD4x2
     152#define jpeg_idct_2x1           jRD2x1
     153#define jpeg_idct_8x16          jRD8x16
     154#define jpeg_idct_7x14          jRD7x14
     155#define jpeg_idct_6x12          jRD6x12
     156#define jpeg_idct_5x10          jRD5x10
     157#define jpeg_idct_4x8           jRD4x8
     158#define jpeg_idct_3x6           jRD3x8
     159#define jpeg_idct_2x4           jRD2x4
     160#define jpeg_idct_1x2           jRD1x2
    93161#endif /* NEED_SHORT_EXTERNAL_NAMES */
    94162
    95163/* Extern declarations for the forward and inverse DCT routines. */
    96164
    97 EXTERN(void) jpeg_fdct_islow JPP((DCTELEM * data));
    98 EXTERN(void) jpeg_fdct_ifast JPP((DCTELEM * data));
    99 EXTERN(void) jpeg_fdct_float JPP((FAST_FLOAT * data));
     165EXTERN(void) jpeg_fdct_islow
     166    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     167EXTERN(void) jpeg_fdct_ifast
     168    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     169EXTERN(void) jpeg_fdct_float
     170    JPP((FAST_FLOAT * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     171EXTERN(void) jpeg_fdct_7x7
     172    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     173EXTERN(void) jpeg_fdct_6x6
     174    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     175EXTERN(void) jpeg_fdct_5x5
     176    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     177EXTERN(void) jpeg_fdct_4x4
     178    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     179EXTERN(void) jpeg_fdct_3x3
     180    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     181EXTERN(void) jpeg_fdct_2x2
     182    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     183EXTERN(void) jpeg_fdct_1x1
     184    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     185EXTERN(void) jpeg_fdct_9x9
     186    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     187EXTERN(void) jpeg_fdct_10x10
     188    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     189EXTERN(void) jpeg_fdct_11x11
     190    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     191EXTERN(void) jpeg_fdct_12x12
     192    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     193EXTERN(void) jpeg_fdct_13x13
     194    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     195EXTERN(void) jpeg_fdct_14x14
     196    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     197EXTERN(void) jpeg_fdct_15x15
     198    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     199EXTERN(void) jpeg_fdct_16x16
     200    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     201EXTERN(void) jpeg_fdct_16x8
     202    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     203EXTERN(void) jpeg_fdct_14x7
     204    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     205EXTERN(void) jpeg_fdct_12x6
     206    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     207EXTERN(void) jpeg_fdct_10x5
     208    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     209EXTERN(void) jpeg_fdct_8x4
     210    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     211EXTERN(void) jpeg_fdct_6x3
     212    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     213EXTERN(void) jpeg_fdct_4x2
     214    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     215EXTERN(void) jpeg_fdct_2x1
     216    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     217EXTERN(void) jpeg_fdct_8x16
     218    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     219EXTERN(void) jpeg_fdct_7x14
     220    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     221EXTERN(void) jpeg_fdct_6x12
     222    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     223EXTERN(void) jpeg_fdct_5x10
     224    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     225EXTERN(void) jpeg_fdct_4x8
     226    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     227EXTERN(void) jpeg_fdct_3x6
     228    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     229EXTERN(void) jpeg_fdct_2x4
     230    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
     231EXTERN(void) jpeg_fdct_1x2
     232    JPP((DCTELEM * data, JSAMPARRAY sample_data, JDIMENSION start_col));
    100233
    101234EXTERN(void) jpeg_idct_islow
    … …  
    108241    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
    109242         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     243EXTERN(void) jpeg_idct_7x7
     244    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     245         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     246EXTERN(void) jpeg_idct_6x6
     247    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     248         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     249EXTERN(void) jpeg_idct_5x5
     250    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     251         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
    110252EXTERN(void) jpeg_idct_4x4
    111253    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
    112254         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     255EXTERN(void) jpeg_idct_3x3
     256    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     257         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
    113258EXTERN(void) jpeg_idct_2x2
    114259    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
    115260         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
    116261EXTERN(void) jpeg_idct_1x1
     262    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     263         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     264EXTERN(void) jpeg_idct_9x9
     265    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     266         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     267EXTERN(void) jpeg_idct_10x10
     268    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     269         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     270EXTERN(void) jpeg_idct_11x11
     271    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     272         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     273EXTERN(void) jpeg_idct_12x12
     274    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     275         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     276EXTERN(void) jpeg_idct_13x13
     277    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     278         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     279EXTERN(void) jpeg_idct_14x14
     280    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     281         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     282EXTERN(void) jpeg_idct_15x15
     283    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     284         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     285EXTERN(void) jpeg_idct_16x16
     286    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     287         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     288EXTERN(void) jpeg_idct_16x8
     289    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     290         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     291EXTERN(void) jpeg_idct_14x7
     292    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     293         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     294EXTERN(void) jpeg_idct_12x6
     295    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     296         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     297EXTERN(void) jpeg_idct_10x5
     298    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     299         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     300EXTERN(void) jpeg_idct_8x4
     301    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     302         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     303EXTERN(void) jpeg_idct_6x3
     304    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     305         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     306EXTERN(void) jpeg_idct_4x2
     307    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     308         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     309EXTERN(void) jpeg_idct_2x1
     310    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     311         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     312EXTERN(void) jpeg_idct_8x16
     313    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     314         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     315EXTERN(void) jpeg_idct_7x14
     316    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     317         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     318EXTERN(void) jpeg_idct_6x12
     319    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     320         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     321EXTERN(void) jpeg_idct_5x10
     322    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     323         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     324EXTERN(void) jpeg_idct_4x8
     325    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     326         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     327EXTERN(void) jpeg_idct_3x6
     328    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     329         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     330EXTERN(void) jpeg_idct_2x4
     331    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
     332         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
     333EXTERN(void) jpeg_idct_1x2
    117334    JPP((j_decompress_ptr cinfo, jpeg_component_info * compptr,
    118335         JCOEFPTR coef_block, JSAMPARRAY output_buf, JDIMENSION output_col));
Note: See TracChangeset for help on using the changeset viewer.