Ignore:
Timestamp:
Jul 13, 2017, 11:01:58 AM (7 years ago)
Author:
meunier
Message:
  • Mise à jour NR2 et Rosenfeld
File:
1 edited

Legend:

Unmodified
Added
Removed

  • soft/giet_vm/applications/rosenfeld/nrc2/include/nrmem2.h

    r772 r826  
    1111#define _NRMEM2_H_
    1212
    13 #ifdef __cplusplus
    14 #ifdef PRAGMA_VERBOSE
    15 #pragma message ("C++")
    16 #endif
    17 extern "C" {
    18 #endif
    19 
    20 
    2113/*
    2214 * ------------------
    … …  
    2517 */
    2618
    27 IMAGE_EXPORT(void) dup_si8matrix    (sint8  **X, long nrl,long nrh,long ncl, long nch,  sint8   **Y);
    28 IMAGE_EXPORT(void) dup_ui8matrix    (uint8  **X, long nrl,long nrh,long ncl, long nch,  uint8   **Y);
    29 IMAGE_EXPORT(void) dup_si16matrix   (sint16 **X, long nrl,long nrh,long ncl, long nch,  sint16  **Y);
    30 IMAGE_EXPORT(void) dup_ui16matrix   (uint16 **X, long nrl,long nrh,long ncl, long nch,  uint16  **Y);
    31 IMAGE_EXPORT(void) dup_si32matrix   (sint32 **X, long nrl,long nrh,long ncl, long nch,  sint32  **Y);
    32 IMAGE_EXPORT(void) dup_ui32matrix   (uint32 **X, long nrl,long nrh,long ncl, long nch,  uint32  **Y);
    33 IMAGE_EXPORT(void) dup_si64matrix   (sint64 **X, long nrl,long nrh,long ncl, long nch,  sint64  **Y);
    34 IMAGE_EXPORT(void) dup_ui64matrix   (uint64 **X, long nrl,long nrh,long ncl, long nch,  uint64  **Y);
     19#define dup_type_matrix(t) \
     20void short_name(t,dup_,matrix)(t ** X, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, t ** Y);
    3521
    36 IMAGE_EXPORT(void) dup_f32matrix   (float32 **X, long nrl,long nrh,long ncl, long nch,  float32 **Y);
    37 IMAGE_EXPORT(void) dup_f64matrix   (float64 **X, long nrl,long nrh,long ncl, long nch,  float64 **Y);
     22dup_type_matrix(int8_t);
     23dup_type_matrix(uint8_t);
     24dup_type_matrix(int16_t);
     25dup_type_matrix(uint16_t);
     26dup_type_matrix(int32_t);
     27dup_type_matrix(uint32_t);
     28dup_type_matrix(int64_t);
     29dup_type_matrix(uint64_t);
     30dup_type_matrix(float);
     31dup_type_matrix(double);
     32dup_type_matrix(rgb8);
     33dup_type_matrix(rgbx8);
    3834
    39 IMAGE_EXPORT(void) dup_rgb8matrix  (rgb8    **X, long nrl,long nrh,long ncl, long nch,  rgb8    **Y);
    40 IMAGE_EXPORT(void) dup_rgbx8matrix (rgbx8   **X, long nrl,long nrh,long ncl, long nch,  rgbx8   **Y);
    4135
    4236
    … …  
    4741 */
    4842
    49 IMAGE_EXPORT(void) resize_si8matrix  (sint8   **m, long nrl, long nrh, long ncl, long nch);
    50 IMAGE_EXPORT(void) resize_ui8matrix  (uint8   **m, long nrl, long nrh, long ncl, long nch);
    51 IMAGE_EXPORT(void) resize_si16matrix (sint16  **m, long nrl, long nrh, long ncl, long nch);
    52 IMAGE_EXPORT(void) resize_ui16matrix (uint16  **m, long nrl, long nrh, long ncl, long nch);
    53 IMAGE_EXPORT(void) resize_si32matrix (sint32  **m, long nrl, long nrh, long ncl, long nch);
    54 IMAGE_EXPORT(void) resize_ui32matrix (uint32  **m, long nrl, long nrh, long ncl, long nch);
     43#undef resize_type_matrix
     44#define resize_type_matrix(t) \
     45void short_name(t,resize_,matrix)(t ** m, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch);
    5546
    56 IMAGE_EXPORT(void) resize_f32matrix  (float32 **m, long nrl, long nrh, long ncl, long nch);
    57 IMAGE_EXPORT(void) resize_f64matrix  (float64 **m, long nrl, long nrh, long ncl, long nch);
     47resize_type_matrix(int8_t);
     48resize_type_matrix(uint8_t);
     49resize_type_matrix(int16_t);
     50resize_type_matrix(uint16_t);
     51resize_type_matrix(int32_t);
     52resize_type_matrix(uint32_t);
     53resize_type_matrix(int64_t);
     54resize_type_matrix(uint64_t);
     55resize_type_matrix(float);
     56resize_type_matrix(double);
     57resize_type_matrix(rgb8);
     58resize_type_matrix(rgbx8);
    5859
    59 IMAGE_EXPORT(void) resize_rgb8matrix (rgb8    **m, long nrl, long nrh, long ncl, long nch);
    60 IMAGE_EXPORT(void) resize_rgbx8matrix(rgbx8   **m, long nrl, long nrh, long ncl, long nch);
    6160
    6261
    … …  
    6766 */
    6867
    69 /* new versions UP */
    70 IMAGE_EXPORT(void) convert_si8matrix_si16matrix(sint8 **X, int nrl, int nrh, int ncl, int nch, sint16  **Y);
    71 IMAGE_EXPORT(void) convert_si8matrix_si32matrix(sint8 **X, int nrl, int nrh, int ncl, int nch, sint32  **Y);
    72 IMAGE_EXPORT(void) convert_si8matrix_f32matrix (sint8 **X, int nrl, int nrh, int ncl, int nch, float32 **Y);
    73 IMAGE_EXPORT(void) convert_si8matrix_f64matrix (sint8 **X, int nrl, int nrh, int ncl, int nch, float64 **Y);
     68#define convert_type_matrix(t1,t2) \
     69void short_name(t1,convert_,short_name(t2,matrix_,matrix))(t1 ** X, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, t2 ** Y);
    7470
    75 IMAGE_EXPORT(void) convert_ui8matrix_ui32matrix (uint8 **X, int nrl, int nrh, int ncl, int nch, uint32  **Y);
    76 IMAGE_EXPORT(void) convert_ui8matrix_ui16matrix (uint8 **X, int nrl, int nrh, int ncl, int nch, uint16  **Y);
    77 IMAGE_EXPORT(void) convert_ui8matrix_f32matrix  (uint8 **X, int nrl, int nrh, int ncl, int nch, float32 **Y);
    78 IMAGE_EXPORT(void) convert_ui8matrix_f64matrix  (uint8 **X, int nrl, int nrh, int ncl, int nch, float64 **Y);
     71convert_type_matrix(int8_t,int16_t);
     72convert_type_matrix(int8_t,int32_t);
     73convert_type_matrix(int8_t,float);
     74convert_type_matrix(int8_t,double);
     75convert_type_matrix(uint8_t,uint16_t);
     76convert_type_matrix(uint8_t,uint32_t);
     77convert_type_matrix(uint8_t,float);
     78convert_type_matrix(uint8_t,double);
     79convert_type_matrix(uint8_t,rgb8);
     80convert_type_matrix(uint8_t,rgbx8);
     81convert_type_matrix(int16_t,int32_t);
     82convert_type_matrix(int16_t,float);
     83convert_type_matrix(int16_t,double);
     84convert_type_matrix(uint16_t,uint32_t);
     85convert_type_matrix(uint16_t,float);
     86convert_type_matrix(uint16_t,double);
     87convert_type_matrix(int32_t,float);
     88convert_type_matrix(int32_t,double);
     89convert_type_matrix(uint32_t,float);
     90convert_type_matrix(uint32_t,double);
    7991
    80 IMAGE_EXPORT(void) convert_ui8matrix_rgb8matrix (uint8 **X, int nrl, int nrh, int ncl, int nch, rgb8    **Y);
    81 IMAGE_EXPORT(void) convert_ui8matrix_rgbx8matrix(uint8 **X, int nrl, int nrh, int ncl, int nch, rgbx8   **Y);
    82 
    83 IMAGE_EXPORT(void) convert_si16matrix_si32matrix(sint16 **X, int nrl, int nrh, int ncl, int nch, sint32  **Y);
    84 IMAGE_EXPORT(void) convert_si16matrix_f32matrix (sint16 **X, int nrl, int nrh, int ncl, int nch, float32 **Y);
    85 IMAGE_EXPORT(void) convert_si16matrix_f64matrix (sint16 **X, int nrl, int nrh, int ncl, int nch, float64 **Y);
    86 
    87 IMAGE_EXPORT(void) convert_ui16matrix_ui32matrix(uint16 **X, int nrl, int nrh, int ncl, int nch, uint32  **Y);
    88 IMAGE_EXPORT(void) convert_ui16matrix_f32matrix (uint16 **X, int nrl, int nrh, int ncl, int nch, float32 **Y);
    89 IMAGE_EXPORT(void) convert_ui16matrix_f64matrix (uint16 **X, int nrl, int nrh, int ncl, int nch, float64 **Y);
    90 
    91 IMAGE_EXPORT(void) convert_si32matrix_f32matrix (sint32 **X, int nrl, int nrh, int ncl, int nch, float32 **Y);
    92 IMAGE_EXPORT(void) convert_si32matrix_f64matrix (sint32 **X, int nrl, int nrh, int ncl, int nch, float64 **Y);
    93 
    94 IMAGE_EXPORT(void) convert_ui32matrix_f32matrix (uint32 **X, int nrl, int nrh, int ncl, int nch, float32 **Y);
    95 IMAGE_EXPORT(void) convert_ui32matrix_f64matrix (uint32 **X, int nrl, int nrh, int ncl, int nch, float64 **Y);
     92convert_type_matrix(int16_t,int8_t);
     93convert_type_matrix(uint16_t,uint8_t);
     94convert_type_matrix(int32_t,int8_t);
     95convert_type_matrix(uint32_t,uint8_t);
     96convert_type_matrix(int32_t,int16_t);
     97convert_type_matrix(uint32_t,uint16_t);
     98convert_type_matrix(float,int8_t);
     99convert_type_matrix(float,uint8_t);
     100convert_type_matrix(float,int16_t);
     101convert_type_matrix(float,uint16_t);
     102convert_type_matrix(float,int32_t);
     103convert_type_matrix(float,uint32_t);
     104convert_type_matrix(double,int8_t);
     105convert_type_matrix(double,uint8_t);
     106convert_type_matrix(double,int16_t);
     107convert_type_matrix(double,uint16_t);
     108convert_type_matrix(double,int32_t);
     109convert_type_matrix(double,uint32_t);
     110convert_type_matrix(double,float);
     111convert_type_matrix(rgb8,uint8_t);
    96112
    97113
    98 /* new versions DOWN */
    99 IMAGE_EXPORT(void) convert_ui16matrix_ui8matrix(uint16 **X, int nrl, int nrh, int ncl, int nch, uint8 **y);
    100 IMAGE_EXPORT(void) convert_si16matrix_si8matrix(sint16 **X, int nrl, int nrh, int ncl, int nch, sint8 **y);
    101 IMAGE_EXPORT(void) convert_ui32matrix_ui8matrix(uint32 **X, int nrl, int nrh, int ncl, int nch, uint8 **y);
    102 IMAGE_EXPORT(void) convert_si32matrix_si8matrix(sint32 **X, int nrl, int nrh, int ncl, int nch, sint8 **y);
    103 IMAGE_EXPORT(void) convert_f32matrix_ui8matrix (float32 **X, int nrl, int nrh, int ncl, int nch, uint8 **y);
    104 IMAGE_EXPORT(void) convert_f32matrix_si8matrix (float32 **X, int nrl, int nrh, int ncl, int nch, sint8 **y);
    105 
    106 IMAGE_EXPORT(void) convert_ui32matrix_ui16matrix(uint32 **X, int nrl, int nrh, int ncl, int nch, uint16 **y);
    107 IMAGE_EXPORT(void) convert_si32matrix_si16matrix(sint32 **X, int nrl, int nrh, int ncl, int nch, sint16 **y);
    108 IMAGE_EXPORT(void) convert_f32matrix_ui16matrix (float32 **X, int nrl, int nrh, int ncl, int nch, uint16 **y);
    109 IMAGE_EXPORT(void) convert_f32matrix_si16matrix (float32 **X, int nrl, int nrh, int ncl, int nch, sint16 **y);
    110 
    111 IMAGE_EXPORT(void) convert_f32matrix_ui32matrix (float32 **X, int nrl, int nrh, int ncl, int nch, uint32 **y);
    112 IMAGE_EXPORT(void) convert_f32matrix_si32matrix (float32 **X, int nrl, int nrh, int ncl, int nch, sint32 **y);
    113114
    114115/*
    … …  
    118119 */
    119120
    120 IMAGE_EXPORT(void) lowpart_ui32matrix_ui8matrix (uint32 **X, long nrl,long nrh,long ncl, long nch, uint8  **Y);
    121 IMAGE_EXPORT(void) lowpart_ui32matrix_ui16matrix(uint32 **X, long nrl,long nrh,long ncl, long nch, uint16 **Y);
     121void lowpart_ui16matrix_ui8matrix(uint16_t ** X, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, uint8_t ** Y);
     122void lowpart_ui32matrix_ui8matrix(uint32_t ** X, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, uint8_t ** Y);
     123
    122124
    123125/*
    … …  
    127129 */
    128130
    129 IMAGE_EXPORT(void) split_rgb8matrix(rgb8 **X, long nrl, long nrh, long ncl, long nch, uint8 **R, uint8 **G, uint8 **B);
    130 IMAGE_EXPORT(void) merge_rgb8matrix(uint8 **R, uint8 **G, uint8 **B, long nrl, long nrh, long ncl, long nch, rgb8 **X);
     131void split_rgb8matrix(rgb8 ** X, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, uint8_t ** R, uint8_t ** G, uint8_t ** B);
     132void merge_rgb8matrix(uint8_t ** R, uint8_t ** G, uint8_t ** B, int32_t nrl, int32_t nrh, int32_t ncl, int32_t nch, rgb8 ** X);
    131133
     134#endif /* _NRMEM2_H_ */
    132135
    133 #ifdef __cplusplus
    134 }
    135 #endif
     136// Local Variables:
     137// tab-width: 4
     138// c-basic-offset: 4
     139// c-file-offsets:((innamespace . 0)(inline-open . 0))
     140// indent-tabs-mode: nil
     141// End:
    136142
    137 #else
    138 //#pragma message(" Warning : attemp to re-include nrmem2.h")
    139 #endif /* _NRMEM2_H_ */
     143// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=4:softtabstop=4
     144
Note: See TracChangeset for help on using the changeset viewer.