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

[trunk] final round of minor cleanups

This commit is contained in:
Mathieu Malaterre 2014-02-28 14:38:45 +00:00
parent 6ee2a51edc
commit b7bccf86c3
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
tests/comparePGXimages.c
View File

@ -560,32 +560,24 @@ int main(int argc, char **argv)
memsizetestfilename = (int)strlen(inParam.test_filename) + 1 + 5 + 2 + 4; memsizetestfilename = (int)strlen(inParam.test_filename) + 1 + 5 + 2 + 4;
imageBase = readImageFromFilePGX( inParam.base_filename, nbFilenamePGXbase, inParam.separator_base); imageBase = readImageFromFilePGX( inParam.base_filename, nbFilenamePGXbase, inParam.separator_base);
if ( imageBase != NULL) if ( imageBase == NULL )
{
filenamePNGbase = (char*) malloc(memsizebasefilename);
strcpy(filenamePNGbase, inParam.test_filename);
strcat(filenamePNGbase, ".base");
/*printf("filenamePNGbase = %s [%d / %d octets]\n",filenamePNGbase, strlen(filenamePNGbase),memsizebasefilename );*/
}
else
{
goto cleanup; goto cleanup;
}
filenamePNGbase = (char*) malloc(memsizebasefilename);
strcpy(filenamePNGbase, inParam.test_filename);
strcat(filenamePNGbase, ".base");
/*printf("filenamePNGbase = %s [%d / %d octets]\n",filenamePNGbase, strlen(filenamePNGbase),memsizebasefilename );*/
/*----------TEST IMAGE--------*/ /*----------TEST IMAGE--------*/
imageTest = readImageFromFilePGX(inParam.test_filename, nbFilenamePGXtest, inParam.separator_test); imageTest = readImageFromFilePGX(inParam.test_filename, nbFilenamePGXtest, inParam.separator_test);
if ( imageTest != NULL) if ( imageTest == NULL )
{
filenamePNGtest = (char*) malloc(memsizetestfilename);
strcpy(filenamePNGtest, inParam.test_filename);
strcat(filenamePNGtest, ".test");
/*printf("filenamePNGtest = %s [%d / %d octets]\n",filenamePNGtest, strlen(filenamePNGtest),memsizetestfilename );*/
}
else
{
goto cleanup; goto cleanup;
}
filenamePNGtest = (char*) malloc(memsizetestfilename);
strcpy(filenamePNGtest, inParam.test_filename);
strcat(filenamePNGtest, ".test");
/*printf("filenamePNGtest = %s [%d / %d octets]\n",filenamePNGtest, strlen(filenamePNGtest),memsizetestfilename );*/
/*----------DIFF IMAGE--------*/ /*----------DIFF IMAGE--------*/