diff options
author | monkeyman_67156 <monkeyman_67156@svn> | 2009-10-17 04:30:10 +0000 |
---|---|---|
committer | monkeyman_67156 <monkeyman_67156@svn> | 2009-10-17 04:30:10 +0000 |
commit | 69bb7e6a8d819cf47932891c2388f5b88c6cacdd (patch) | |
tree | 7f0bdcb9aba51f38582d08a906be3c8ae7cc013c /tools/TexturePacker | |
parent | 3605d9d37cb5d56bab4449b7798a9140f896166e (diff) |
cosmetic: silence some compilation warnings
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@23782 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'tools/TexturePacker')
-rw-r--r-- | tools/TexturePacker/SDL_anigif.c | 72 | ||||
-rw-r--r-- | tools/TexturePacker/XBMCTex.cpp | 2 | ||||
-rw-r--r-- | tools/TexturePacker/XBTFWriter.cpp | 2 |
3 files changed, 38 insertions, 38 deletions
diff --git a/tools/TexturePacker/SDL_anigif.c b/tools/TexturePacker/SDL_anigif.c index b77b7bcdb0..ed81f269df 100644 --- a/tools/TexturePacker/SDL_anigif.c +++ b/tools/TexturePacker/SDL_anigif.c @@ -109,9 +109,9 @@ static SDL_Surface* ReadImage( gifdata* gd, int len, int height, int, unsigned c -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
int AG_isGIF( SDL_RWops* src )
{
int isGIF = FALSE;
@@ -137,9 +137,9 @@ int AG_isGIF( SDL_RWops* src ) -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
int AG_LoadGIF( const char* file, AG_Frame* frames, int size )
{
int n = 0;
@@ -157,9 +157,9 @@ int AG_LoadGIF( const char* file, AG_Frame* frames, int size ) -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
void AG_FreeSurfaces( AG_Frame* frames, int nFrames )
{
int i;
@@ -179,9 +179,9 @@ void AG_FreeSurfaces( AG_Frame* frames, int nFrames ) -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
int AG_ConvertSurfacesToDisplayFormat( AG_Frame* frames, int nFrames )
{
int i;
@@ -210,9 +210,9 @@ int AG_ConvertSurfacesToDisplayFormat( AG_Frame* frames, int nFrames ) -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
int AG_NormalizeSurfacesToDisplayFormat( AG_Frame* frames, int nFrames )
{
int n = 0;
@@ -272,9 +272,9 @@ int AG_NormalizeSurfacesToDisplayFormat( AG_Frame* frames, int nFrames ) -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
int AG_LoadGIF_RW( SDL_RWops* src, AG_Frame* frames, int maxFrames )
{
int start;
@@ -422,9 +422,9 @@ done: -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
static int ReadColorMap( gifdata* gd, int number, unsigned char buffer[3][MAXCOLORMAPSIZE] )
{
int i;
@@ -452,9 +452,9 @@ static int ReadColorMap( gifdata* gd, int number, unsigned char buffer[3][MAXCOL -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
static int DoExtension( gifdata* gd, int label )
{
unsigned char buf[256];
@@ -493,9 +493,9 @@ static int DoExtension( gifdata* gd, int label ) -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
static int GetDataBlock( gifdata* gd, unsigned char* buf )
{
unsigned char count;
@@ -519,9 +519,9 @@ static int GetDataBlock( gifdata* gd, unsigned char* buf ) -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
static int GetCode( gifdata* gd, int code_size, int flag )
{
int i, j, ret;
@@ -566,9 +566,9 @@ static int GetCode( gifdata* gd, int code_size, int flag ) -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
static int LWZReadByte( gifdata* gd, int flag, int input_code_size )
{
int i, code, incode;
@@ -690,9 +690,9 @@ static int LWZReadByte( gifdata* gd, int flag, int input_code_size ) -/*--------------------------------------------------------------------------*/
-/*
-/*--------------------------------------------------------------------------*/
+/*--------------------------------------------------------------------------*
+ *
+ *--------------------------------------------------------------------------*/
static SDL_Surface* ReadImage( gifdata* gd, int len, int height, int cmapSize, unsigned char cmap[3][MAXCOLORMAPSIZE], int interlace, int ignore )
{
SDL_Surface* image;
diff --git a/tools/TexturePacker/XBMCTex.cpp b/tools/TexturePacker/XBMCTex.cpp index 07d3ca9302..0991a6db41 100644 --- a/tools/TexturePacker/XBMCTex.cpp +++ b/tools/TexturePacker/XBMCTex.cpp @@ -327,7 +327,7 @@ int createBundle(const std::string& InputDir, const std::string& OutputFile, dou continue; } - printf(output.c_str()); + printf("%s", output.c_str()); CXBTFFrame frame = createXBTFFrame(image, writer, maxMSE, flags); diff --git a/tools/TexturePacker/XBTFWriter.cpp b/tools/TexturePacker/XBTFWriter.cpp index eea8195382..ed9d784cb8 100644 --- a/tools/TexturePacker/XBTFWriter.cpp +++ b/tools/TexturePacker/XBTFWriter.cpp @@ -122,7 +122,7 @@ bool CXBTFWriter::UpdateHeader() // Sanity check int64_t pos = ftell(m_file); - if (pos != m_xbtf.GetHeaderSize()) + if (pos != (int64_t)m_xbtf.GetHeaderSize()) { printf("Expected header size (%" PRId64 ") != actual size (%" PRId64 ")\n", m_xbtf.GetHeaderSize(), pos); return false; |