[trunk] Remove all non-ascii characters (Several compilers and development tools are confused by non-ascii characters in source code. These have been removed) thanks to Hans Johnson
This commit is contained in:
parent
47b18d89f6
commit
de9e1a0693
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
|
* Copyright (c) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
|
* Copyright (c) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2007, Digital Signal Processing Laboratory, Università degli studi di Perugia (UPG), Italy
|
* Copyright (c) 2007, Digital Signal Processing Laboratory, Universita degli studi di Perugia (UPG), Italy
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
* Redistribution and use in source and binary forms, with or without
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
|
|
@ -46,7 +46,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*--------------------------------------------------------
|
/*--------------------------------------------------------
|
||||||
Matrix für sYCC, Amendment 1 to IEC 61966-2-1
|
Matrix for sYCC, Amendment 1 to IEC 61966-2-1
|
||||||
|
|
||||||
Y : 0.299 0.587 0.114 :R
|
Y : 0.299 0.587 0.114 :R
|
||||||
Cb: -0.1687 -0.3312 0.5 :G
|
Cb: -0.1687 -0.3312 0.5 :G
|
||||||
|
|
|
@ -44,8 +44,8 @@ typedef struct auxtrans_param{
|
||||||
/**
|
/**
|
||||||
* Initialize auxiliary transport server of JPIP server
|
* Initialize auxiliary transport server of JPIP server
|
||||||
*
|
*
|
||||||
* @param[in] tcp_auxport opening tcp auxiliary port ( 0 not to open, valid No. 49152–65535)
|
* @param[in] tcp_auxport opening tcp auxiliary port ( 0 not to open, valid No. 49152-65535)
|
||||||
* @param[in] udp_auxport opening udp auxiliary port ( 0 not to open, valid No. 49152–65535)
|
* @param[in] udp_auxport opening udp auxiliary port ( 0 not to open, valid No. 49152-65535)
|
||||||
* @return intialized transport parameters
|
* @return intialized transport parameters
|
||||||
*/
|
*/
|
||||||
auxtrans_param_t init_aux_transport( int tcp_auxport, int udp_auxport);
|
auxtrans_param_t init_aux_transport( int tcp_auxport, int udp_auxport);
|
||||||
|
|
|
@ -85,8 +85,8 @@ typedef struct QR{
|
||||||
/**
|
/**
|
||||||
* Initialize the JPIP server
|
* Initialize the JPIP server
|
||||||
*
|
*
|
||||||
* @param[in] tcp_auxport opening tcp auxiliary port ( 0 not to open, valid No. 49152–65535)
|
* @param[in] tcp_auxport opening tcp auxiliary port ( 0 not to open, valid No. 49152-65535)
|
||||||
* @param[in] udp_auxport opening udp auxiliary port ( 0 not to open, valid No. 49152–65535)
|
* @param[in] udp_auxport opening udp auxiliary port ( 0 not to open, valid No. 49152-65535)
|
||||||
* @return intialized server record pointer
|
* @return intialized server record pointer
|
||||||
*/
|
*/
|
||||||
server_record_t * init_JPIPserver( int tcp_auxport, int udp_auxport);
|
server_record_t * init_JPIPserver( int tcp_auxport, int udp_auxport);
|
||||||
|
@ -169,7 +169,7 @@ typedef SOCKET client_t;
|
||||||
/**
|
/**
|
||||||
* Initialize the image decoding server
|
* Initialize the image decoding server
|
||||||
*
|
*
|
||||||
* @param[in] port opening tcp port (valid No. 49152–65535)
|
* @param[in] port opening tcp port (valid No. 49152-65535)
|
||||||
* @return intialized decoding server record pointer
|
* @return intialized decoding server record pointer
|
||||||
*/
|
*/
|
||||||
dec_server_record_t * init_dec_server( int port);
|
dec_server_record_t * init_dec_server( int port);
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003-2004, François-Olivier Devaux
|
* Copyright (c) 2003-2004, Francois-Olivier Devaux
|
||||||
* Copyright (c) 2002-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
* Copyright (c) 2002-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003-2004, François-Olivier Devaux
|
* Copyright (c) 2003-2004, Francois-Olivier Devaux
|
||||||
* Copyright (c) 2003-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
* Copyright (c) 2003-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003-2004, François-Olivier Devaux
|
* Copyright (c) 2003-2004, Francois-Olivier Devaux
|
||||||
* Copyright (c) 2002-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
* Copyright (c) 2002-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
* Copyright (c) 2003-2004, François-Olivier Devaux
|
* Copyright (c) 2003-2004, Francois-Olivier Devaux
|
||||||
* Copyright (c) 2002-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
* Copyright (c) 2002-2004, Communications and remote sensing Laboratory, Universite catholique de Louvain, Belgium
|
||||||
* All rights reserved.
|
* All rights reserved.
|
||||||
*
|
*
|
||||||
|
|
|
@ -1563,7 +1563,7 @@ void opj_jp2_setup_encoder( opj_jp2_v2_t *jp2,
|
||||||
}
|
}
|
||||||
if (jp2->meth == 1) {
|
if (jp2->meth == 1) {
|
||||||
if (image->color_space == 1)
|
if (image->color_space == 1)
|
||||||
jp2->enumcs = 16; /* sRGB as defined by IEC 61966–2–1 */
|
jp2->enumcs = 16; /* sRGB as defined by IEC 61966-2-1 */
|
||||||
else if (image->color_space == 2)
|
else if (image->color_space == 2)
|
||||||
jp2->enumcs = 17; /* greyscale */
|
jp2->enumcs = 17; /* greyscale */
|
||||||
else if (image->color_space == 3)
|
else if (image->color_space == 3)
|
||||||
|
|
Loading…
Reference in New Issue