Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve GCC warnings in assimp_cmd

Browse Source 
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@570 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2010-03-02 21:45:28 +00:00
parent f7aa189118
commit 98bac7094b
3 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/assimp_cmd/ImageExtractor.cpp
+4 -4
View File
@@ -131,7 +131,7 @@ int SaveAsBMP (FILE* file, const aiTexel* data, unsigned int width, unsigned int
}
BITMAPFILEHEADER header;
header.bfType = 'MB';
header.bfType = 'B' | (int('M') << 8u);
header.bfOffBits = sizeof(BITMAPFILEHEADER)+sizeof(BITMAPINFOHEADER);
header.bfSize = header.bfOffBits+width*height*numc;
header.bfReserved1 = header.bfReserved2 = 0;
@@ -221,13 +221,13 @@ int Assimp_Extract (const char** params, unsigned int num)
// --help
if (!::strcmp( params[0], "-h") || !::strcmp( params[0], "--help") || !::strcmp( params[0], "-?") ) {
printf(AICMD_MSG_DUMP_HELP_E);
printf("%s",AICMD_MSG_DUMP_HELP_E);
return 0;
}
// asssimp extract in out [options]
if (num < 1) {
printf("assimp extract: Invalid number of arguments. See \'assimp dump --help\'\n");
printf("assimp extract: Invalid number of arguments. See \'assimp extract --help\'\n");
return 1;
}
@@ -357,4 +357,4 @@ int Assimp_Extract (const char** params, unsigned int num)
return m;
}
return 0;
}
}