walkero
/
openjpeg
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

[trunk] Remove remaining of OPJ_INT64_F/OPJ_UINT64_F before move to C99 convention

This commit is contained in:
Mathieu Malaterre 2012-03-19 10:00:06 +00:00
parent e6f8b59010
commit 8d0e5899b9
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libopenjpeg/openjpeg.h
View File

@ -93,8 +93,6 @@ typedef int32_t OPJ_INT32;
typedef uint32_t OPJ_UINT32; typedef uint32_t OPJ_UINT32;
typedef int64_t OPJ_INT64; typedef int64_t OPJ_INT64;
typedef uint64_t OPJ_UINT64; typedef uint64_t OPJ_UINT64;
#define OPJ_INT64_F "ll"
#define OPJ_UINT64_F "ll"
#else #else
#if defined(_WIN32) #if defined(_WIN32)
typedef signed __int8 OPJ_INT8; typedef signed __int8 OPJ_INT8;
@ -105,8 +103,6 @@ typedef signed __int32 OPJ_INT32;
typedef unsigned __int32 OPJ_UINT32; typedef unsigned __int32 OPJ_UINT32;
typedef signed __int64 OPJ_INT64; typedef signed __int64 OPJ_INT64;
typedef unsigned __int64 OPJ_UINT64; typedef unsigned __int64 OPJ_UINT64;
#define OPJ_INT64_F "I64"
#define OPJ_UINT64_F "I64"
#else #else
#error unsupported platform #error unsupported platform
#endif #endif
@ -114,7 +110,6 @@ typedef unsigned __int64 OPJ_UINT64;
/* 64-bit file offset type */ /* 64-bit file offset type */
typedef OPJ_INT64 OPJ_OFF_T; typedef OPJ_INT64 OPJ_OFF_T;
#define OPJ_OFF_F OPJ_INT64_F
/* Avoid compile-time warning because parameter is not used */ /* Avoid compile-time warning because parameter is not used */
#define OPJ_ARG_NOT_USED(x) (void)(x) #define OPJ_ARG_NOT_USED(x) (void)(x)

9
tests/comparePGXimages.c
View File

@ -93,7 +93,7 @@ void comparePGXimages_help_display(void) {
/******************************************************************************* /*******************************************************************************
* Parse command line * Parse command line
*******************************************************************************/ *******************************************************************************/
int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param) static int parse_cmdline_cmp(int argc, char **argv, test_cmp_parameters* param)
{ {
char *MSElistvalues = NULL; char *PEAKlistvalues= NULL; char *MSElistvalues = NULL; char *PEAKlistvalues= NULL;
char *separatorList = NULL; char *separatorList = NULL;
@ -332,7 +332,7 @@ double* parseToleranceValues( char* inArg, const int nbcomp)
* Create filenames from a filename by used separator and nb components * Create filenames from a filename by used separator and nb components
* (begin to 0) * (begin to 0)
*******************************************************************************/ *******************************************************************************/
char* createMultiComponentsFilename(const char* inFilename, const int indexF, const char* separator) static char* createMultiComponentsFilename(const char* inFilename, const int indexF, const char* separator)
{ {
char s[255]; char s[255];
char *outFilename, *ptr; char *outFilename, *ptr;
@ -497,7 +497,7 @@ int imageToPNG(const opj_image_t* image, const char* filename, int num_comp_sele
int main(int argc, char **argv) int main(int argc, char **argv)
{ {
test_cmp_parameters inParam; test_cmp_parameters inParam;
int it_comp, itpxl; OPJ_UINT32 it_comp, itpxl;
int failed = 0; int failed = 0;
int nbFilenamePGXbase, nbFilenamePGXtest; int nbFilenamePGXbase, nbFilenamePGXtest;
char *filenamePNGtest= NULL, *filenamePNGbase = NULL, *filenamePNGdiff = NULL; char *filenamePNGtest= NULL, *filenamePNGbase = NULL, *filenamePNGdiff = NULL;
@ -531,7 +531,8 @@ int main(int argc, char **argv)
inParam.nr_flag, inParam.separator_base, inParam.separator_test); inParam.nr_flag, inParam.separator_base, inParam.separator_test);
if ( (inParam.tabMSEvalues != NULL) && (inParam.tabPEAKvalues != NULL)) if ( (inParam.tabMSEvalues != NULL) && (inParam.tabPEAKvalues != NULL))
{ {
int it_comp;
printf(" MSE values = ["); printf(" MSE values = [");
for (it_comp = 0; it_comp < inParam.nbcomp; it_comp++) for (it_comp = 0; it_comp < inParam.nbcomp; it_comp++)
printf(" %f ", inParam.tabMSEvalues[it_comp]); printf(" %f ", inParam.tabMSEvalues[it_comp]);