m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some cleanups to the types of vars.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@689 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2009-03-22 17:44:29 +00:00
parent cf99da06b8
commit c324adfff2
6 changed files with 29 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
aide.c
View File

@ -591,7 +591,7 @@ void Bouton_Stats(void)
char Buffer[37]; char Buffer[37];
dword Utilisation_couleur[256]; dword Utilisation_couleur[256];
unsigned long long freeRam; unsigned long long freeRam;
uint64_t Taille = 0; qword Taille = 0;
Ouvrir_fenetre(310,174,"Statistics"); Ouvrir_fenetre(310,174,"Statistics");
@ -643,7 +643,7 @@ void Bouton_Stats(void)
{ {
struct statfs Informations_Disque; struct statfs Informations_Disque;
statfs(Principal_Repertoire_courant,&Informations_Disque); statfs(Principal_Repertoire_courant,&Informations_Disque);
Taille=(uint64_t) Informations_Disque.f_bfree * (uint64_t) Informations_Disque.f_bsize; Taille=(qword) Informations_Disque.f_bfree * (qword) Informations_Disque.f_bsize;
} }
#else #else
// Free disk space is only for shows. Other platforms can display 0. // Free disk space is only for shows. Other platforms can display 0.
@ -652,13 +652,13 @@ void Bouton_Stats(void)
#endif #endif
if(Taille > (100ULL*1024*1024*1024)) if(Taille > (100ULL*1024*1024*1024))
sprintf(Buffer,"%d Gigabytes",(unsigned int)(Taille/(1024*1024*1024))); sprintf(Buffer,"%u Gigabytes",(unsigned int)(Taille/(1024*1024*1024)));
else if(Taille > (100*1024*1024)) else if(Taille > (100*1024*1024))
sprintf(Buffer,"%d Megabytes",(unsigned int)(Taille/(1024*1024))); sprintf(Buffer,"%u Megabytes",(unsigned int)(Taille/(1024*1024)));
else if(Taille > (100*1024)) else if(Taille > (100*1024))
sprintf(Buffer,"%d Kilobytes",(unsigned int)(Taille/1024)); sprintf(Buffer,"%u Kilobytes",(unsigned int)(Taille/1024));
else else
sprintf(Buffer,"%d bytes",(unsigned int)Taille); sprintf(Buffer,"%u bytes",(unsigned int)Taille);
Print_dans_fenetre(146,67,Buffer,STATS_COULEUR_DONNEES,CM_Noir); Print_dans_fenetre(146,67,Buffer,STATS_COULEUR_DONNEES,CM_Noir);
// Affichage des informations sur l'image // Affichage des informations sur l'image

2
divers.c
View File

@ -206,7 +206,7 @@ void Ellipse_Calculer_limites(short Rayon_horizontal,short Rayon_vertical)
byte Pixel_dans_ellipse(void) byte Pixel_dans_ellipse(void)
{ {
uint64_t ediesi = Ellipse_Curseur_X * Ellipse_Curseur_X * Ellipse_Rayon_vertical_au_carre + qword ediesi = Ellipse_Curseur_X * Ellipse_Curseur_X * Ellipse_Rayon_vertical_au_carre +
Ellipse_Curseur_Y * Ellipse_Curseur_Y * Ellipse_Rayon_horizontal_au_carre; Ellipse_Curseur_Y * Ellipse_Curseur_Y * Ellipse_Rayon_horizontal_au_carre;
if((ediesi) <= Ellipse_Limite) return 255; if((ediesi) <= Ellipse_Limite) return 255;

2
files.c
View File

@ -275,7 +275,7 @@ void Lire_liste_des_fichiers(byte Format_demande)
void bstrtostr( BSTR in, STRPTR out, TEXT max ) void bstrtostr( BSTR in, STRPTR out, TEXT max )
{ {
STRPTR iptr; STRPTR iptr;
uint32_t i; dword i;
iptr = BADDR( in ); iptr = BADDR( in );

4
global.h
View File

@ -465,9 +465,7 @@ GFX2_GLOBAL long Ellipse_Curseur_X;
GFX2_GLOBAL long Ellipse_Curseur_Y; GFX2_GLOBAL long Ellipse_Curseur_Y;
GFX2_GLOBAL long Ellipse_Rayon_vertical_au_carre; GFX2_GLOBAL long Ellipse_Rayon_vertical_au_carre;
GFX2_GLOBAL long Ellipse_Rayon_horizontal_au_carre; GFX2_GLOBAL long Ellipse_Rayon_horizontal_au_carre;
//GFX2_GLOBAL long Ellipse_Limite_High; GFX2_GLOBAL qword Ellipse_Limite;
//GFX2_GLOBAL long Ellipse_Limite_Low;
GFX2_GLOBAL uint64_t Ellipse_Limite;
GFX2_GLOBAL long Cercle_Curseur_X; GFX2_GLOBAL long Cercle_Curseur_X;
GFX2_GLOBAL long Cercle_Curseur_Y; GFX2_GLOBAL long Cercle_Curseur_Y;
GFX2_GLOBAL long Cercle_Limite; GFX2_GLOBAL long Cercle_Limite;

22
loadsave.c
View File

@ -2227,22 +2227,22 @@ void Save_LBM(void)
typedef struct typedef struct
{ {
word Signature; // ='BM' = 0x4D42 word Signature; // ='BM' = 0x4D42
uint32_t Taille_1; // =Taille du fichier dword Taille_1; // =Taille du fichier
word Reserv_1; // =0 word Reserv_1; // =0
word Reserv_2; // =0 word Reserv_2; // =0
uint32_t Decalage; // Nb octets avant les données bitmap dword Decalage; // Nb octets avant les données bitmap
uint32_t Taille_2; // =40 dword Taille_2; // =40
uint32_t Width; dword Width;
uint32_t Height; dword Height;
word Plans; // =1 word Plans; // =1
word Nb_bits; // =1,4,8 ou 24 word Nb_bits; // =1,4,8 ou 24
uint32_t Compression; dword Compression;
uint32_t Taille_3; dword Taille_3;
uint32_t XPM; dword XPM;
uint32_t YPM; dword YPM;
uint32_t Nb_Clr; dword Nb_Clr;
uint32_t Clr_Imprt; dword Clr_Imprt;
} __attribute__((__packed__)) T_BMP_Header; } __attribute__((__packed__)) T_BMP_Header;
// -- Tester si un fichier est au format BMP -------------------------------- // -- Tester si un fichier est au format BMP --------------------------------

7
struct.h
View File

@ -32,9 +32,10 @@
// Déclaration des types de base ///////////////////////////////////////////// // Déclaration des types de base /////////////////////////////////////////////
typedef uint8_t byte; #define byte uint8_t
typedef uint16_t word; #define word uint16_t
typedef uint32_t dword; #define dword uint32_t
#define qword uint64_t
typedef void (* fonction_action) (void); typedef void (* fonction_action) (void);
typedef void (* fonction_afficheur) (word,word,byte); typedef void (* fonction_afficheur) (word,word,byte);