Ryzom
/
ryzom-core
1
1
Fork 0
Code Issues 38 Pull Requests Projects 1 Releases 1 Activity

Fixed: C++-style comments in PIC C code, eliminates errors on recent gcc compilers for tile editor.

Browse Source
hg/feature/sound
"Matt Raykowski" 15 years ago
parent b4d5572a83
commit e22b5c02f1
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File

24
code/nel/tools/3d/tile_edit_qt/pic/PIC_System.c
Unescape Escape View File

@ -13,7 +13,7 @@ static unsigned long PIC_Sys_MEM_NbAllocs;
#define _msize malloc_usable_size #define _msize malloc_usable_size
#endif /* __GNUC__ */ #endif /* __GNUC__ */
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */
void *Pic_malloc(unsigned long size) void *Pic_malloc(unsigned long size)
{ {
@ -26,7 +26,7 @@ void *Pic_malloc(unsigned long size)
} }
return(mem); return(mem);
} }
// ----- /* ----- */
void *Pic_calloc(unsigned long count, unsigned long size) void *Pic_calloc(unsigned long count, unsigned long size)
{ {
void *mem; void *mem;
@ -38,7 +38,7 @@ void *Pic_calloc(unsigned long count, unsigned long size)
} }
return(mem); return(mem);
} }
// ----- /* ----- */
void Pic_free(void *memblock) void Pic_free(void *memblock)
{ {
unsigned long size; unsigned long size;
@ -47,23 +47,23 @@ void Pic_free(void *memblock)
PIC_Sys_MEM_NbAllocs--; PIC_Sys_MEM_NbAllocs--;
free(memblock); free(memblock);
} }
// ----- /* ----- */
unsigned long Pic__msize(void *memblock) unsigned long Pic__msize(void *memblock)
{ {
return(_msize(memblock)); return(_msize(memblock));
} }
// ----- /* ----- */
unsigned long PIC_GetMemNbAllocs(void) unsigned long PIC_GetMemNbAllocs(void)
{ {
return(PIC_Sys_MEM_NbAllocs); return(PIC_Sys_MEM_NbAllocs);
} }
// ----- /* ----- */
unsigned long PIC_GetMemAllocated(void) unsigned long PIC_GetMemAllocated(void)
{ {
return(PIC_Sys_MEM_Allocated); return(PIC_Sys_MEM_Allocated);
} }
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */
static unsigned char PIC_ErrorFlag; static unsigned char PIC_ErrorFlag;
static unsigned char PIC_ErrorString[PIC_ERRSIZE]; static unsigned char PIC_ErrorString[PIC_ERRSIZE];
@ -95,23 +95,23 @@ void Pic_SetError(unsigned char *msg, ...)
if (PIC_Sys_FnctActive) PIC_Sys_Fnct(); if (PIC_Sys_FnctActive) PIC_Sys_Fnct();
return; return;
} }
// ----- /* ----- */
char* PIC_GetError(void) char* PIC_GetError(void)
{ {
return(PIC_ErrorString); return(PIC_ErrorString);
} }
// ----- /* ----- */
unsigned char PIC_Error(void) unsigned char PIC_Error(void)
{ {
return(PIC_ErrorFlag); return(PIC_ErrorFlag);
} }
// ----- /* ----- */
void PIC_ResetError(void) void PIC_ResetError(void)
{ {
strcpy(PIC_ErrorString,""); strcpy(PIC_ErrorString,"");
PIC_ErrorFlag=0; PIC_ErrorFlag=0;
} }
// ----- /* ----- */
unsigned char PIC_OnErrorCall( void pFnct(void) ) unsigned char PIC_OnErrorCall( void pFnct(void) )
{ {
if (pFnct != NULL) if (pFnct != NULL)
@ -126,5 +126,5 @@ unsigned char PIC_OnErrorCall( void pFnct(void) )
return(1); return(1);
} }
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */

6
code/nel/tools/3d/tile_edit_qt/pic/Pic_Manage.c
Unescape Escape View File

@ -595,7 +595,7 @@ unsigned long PIC_Save(unsigned long id, char* FileName, unsigned long type, uns
err=1; err=1;
} }
break; break;
// --- /* --- */
default: default:
Pic_SetError("Save %s, unknow save format/type",FileName); Pic_SetError("Save %s, unknow save format/type",FileName);
err=1; err=1;
@ -608,7 +608,7 @@ unsigned long PIC_Save(unsigned long id, char* FileName, unsigned long type, uns
return(err-1); return(err-1);
} }
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */
unsigned long PIC_Destroy(unsigned long id) unsigned long PIC_Destroy(unsigned long id)
{ {
@ -651,4 +651,4 @@ unsigned long PIC_Destroy(unsigned long id)
return(1); return(1);
} }
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */

6
code/nel/tools/3d/tile_edit_qt/pic/Pic_TGA.c
Unescape Escape View File

@ -5,7 +5,7 @@
#include "pic_private.h" #include "pic_private.h"
#include "pic.h" #include "pic.h"
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */
#pragma pack(1) #pragma pack(1)
typedef struct TGA_HEADER typedef struct TGA_HEADER
@ -25,7 +25,7 @@ typedef struct TGA_HEADER
} TGA_HEADER; } TGA_HEADER;
#pragma pack() #pragma pack()
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */
unsigned long Pic_TGA_Read( unsigned char *FileName, unsigned long Pic_TGA_Read( unsigned char *FileName,
unsigned char **ppPal, unsigned char **ppDatas, unsigned char **ppPal, unsigned char **ppDatas,
@ -138,7 +138,7 @@ unsigned long Pic_TGA_Read( unsigned char *FileName,
} }
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */
unsigned long Pic_TGA_Write( unsigned char *FileName, unsigned long Pic_TGA_Write( unsigned char *FileName,
unsigned char *pPal,unsigned char *pDatas, unsigned char *pPal,unsigned char *pDatas,

28
code/nel/tools/3d/tile_edit_qt/pic/pic_private.h
Unescape Escape View File

@ -17,12 +17,12 @@ typedef struct PIC_PICTURE
struct PIC_PICTURE *Next; struct PIC_PICTURE *Next;
} PIC_PICTURE; } PIC_PICTURE;
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */
// /*
// JPG * JPG
// */
extern unsigned long Pic_JPG_Read( unsigned char *FileName, extern unsigned long Pic_JPG_Read( unsigned char *FileName,
@ -33,9 +33,9 @@ extern unsigned long Pic_JPG_Write( unsigned char *FileName,
unsigned long Qual, unsigned long Qual,
unsigned char *pDatas, unsigned char *pDatas,
unsigned long w, unsigned long h); unsigned long w, unsigned long h);
// /*
// TGA * TGA
// */
extern unsigned long Pic_TGA_Read( unsigned char *FileName, extern unsigned long Pic_TGA_Read( unsigned char *FileName,
unsigned char **ppPal, unsigned char **ppDatas, unsigned char **ppPal, unsigned char **ppDatas,
unsigned long *pWidth, unsigned long *pHeight, unsigned long *pWidth, unsigned long *pHeight,
@ -43,9 +43,9 @@ extern unsigned long Pic_TGA_Read( unsigned char *FileName,
extern unsigned long Pic_TGA_Write( unsigned char *FileName, extern unsigned long Pic_TGA_Write( unsigned char *FileName,
unsigned char *pPal,unsigned char *pDatas, unsigned char *pPal,unsigned char *pDatas,
unsigned long w, unsigned long h, unsigned long d); unsigned long w, unsigned long h, unsigned long d);
// /*
// BMP * BMP
// */
extern unsigned long Pic_BMP_Read( unsigned char *FileName, extern unsigned long Pic_BMP_Read( unsigned char *FileName,
unsigned char **ppPal, unsigned char **ppDatas, unsigned char **ppPal, unsigned char **ppDatas,
unsigned long *pWidth, unsigned long *pHeight, unsigned long *pWidth, unsigned long *pHeight,
@ -54,16 +54,16 @@ extern unsigned long Pic_BMP_Read( unsigned char *FileName,
extern unsigned long Pic_BMP_Write( unsigned char *FileName, extern unsigned long Pic_BMP_Write( unsigned char *FileName,
unsigned char *pPal,unsigned char *pDatas, unsigned char *pPal,unsigned char *pDatas,
unsigned long w, unsigned long h, unsigned long d); unsigned long w, unsigned long h, unsigned long d);
// /*
// System * System
// */
extern void* Pic_malloc(unsigned long size); extern void* Pic_malloc(unsigned long size);
extern void* Pic_calloc(unsigned long count, unsigned long size); extern void* Pic_calloc(unsigned long count, unsigned long size);
extern void Pic_free(void *memblock); extern void Pic_free(void *memblock);
extern unsigned long Pic__msize(void *memblock); extern unsigned long Pic__msize(void *memblock);
extern void Pic_SetError(unsigned char *msg, ...); extern void Pic_SetError(unsigned char *msg, ...);
// ---------------------------------------------------------------------------------------------------------------------------------- /* ---------------------------------------------------------------------------------------------------------------------------------- */
#ifdef __cplusplus #ifdef __cplusplus
} }

Write Preview
Loading…
Cancel
Save