Changeset 23717 for main/branches
- Timestamp:
- 2011-02-17T11:00:10+13:00 (13 years ago)
- Location:
- main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/mgfelics.c
r16583 r23717 55 55 FILE *fp_in = (stdin), *fp_out = (stdout); 56 56 int width, height, maxval; 57 u_long magic;57 mg_u_long magic; 58 58 char *filename = NULL; 59 59 unsigned int *line; -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/pbmtools.c
r16583 r23717 64 64 pbm_isapbmfile (FILE * fp) 65 65 { 66 u_long magic;66 mg_u_long magic; 67 67 68 68 magic = getmagicno_short (fp); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/utils.c
r16583 r23717 230 230 231 231 void 232 magic_write (FILE * fp, u_long magic_num)232 magic_write (FILE * fp, mg_u_long magic_num) 233 233 { 234 234 HTONUL(magic_num); /* [RPAP - Jan 97: Endian Ordering] */ … … 239 239 240 240 void 241 magic_check (FILE * fp, u_long magic_num)242 { 243 u_long magic;241 magic_check (FILE * fp, mg_u_long magic_num) 242 { 243 mg_u_long magic; 244 244 if (fread (&magic, sizeof (magic), 1, fp) != 1 || NTOHUL(magic) != magic_num) /* [RPAP - Jan 97: Endian Ordering] */ 245 245 error_msg ("magic num", "Incorrect magic number.", ""); … … 247 247 248 248 249 u_long249 mg_u_long 250 250 magic_read (FILE * fp) 251 251 { 252 u_long magic;252 mg_u_long magic; 253 253 if (fread (&magic, sizeof (magic), 1, fp) != 1) 254 254 error_msg ("magic num", "Couldn't read magic number.", ""); -
main/branches/64_bit_Greenstone/greenstone2/common-src/indexers/mg/src/images/utils.h
r16583 r23717 45 45 #define MAGIC_BILEVEL GEN_MAGIC('M','G','B','I') 46 46 #define MAGIC_TIC GEN_MAGIC('M','G','T','C') 47 #define IS_MAGIC(a) (((( u_long)(a)) & 0xffff0000) == MAGIC_XXXX)47 #define IS_MAGIC(a) ((((mg_u_long)(a)) & 0xffff0000) == MAGIC_XXXX) 48 48 /* --------------------------------------- */ 49 49 … … 68 68 void readline (char str[], FILE * fp); 69 69 70 void magic_write (FILE * fp, u_long magic_num);71 void magic_check (FILE * fp, u_long magic_num);72 u_long magic_read (FILE * fp);70 void magic_write (FILE * fp, mg_u_long magic_num); 71 void magic_check (FILE * fp, mg_u_long magic_num); 72 mg_u_long magic_read (FILE * fp); 73 73 /* kerry's code */ 74 74
Note:
See TracChangeset
for help on using the changeset viewer.