Changeset 5851
- Timestamp:
- Dec 27, 2005, 3:22:30 PM (20 years ago)
- Location:
- trunk/Ohana/src
- Files:
-
- 6 edited
-
libautocode/def/autocode.c (modified) (1 diff)
-
libfits/matrix/F_load_M.c (modified) (1 diff)
-
libfits/matrix/F_read_portion.c (modified) (1 diff)
-
libfits/matrix/F_read_segment.c (modified) (1 diff)
-
libfits/matrix/F_write_M.c (modified) (2 diffs)
-
libohana/src/Fread.c (modified) (19 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Ohana/src/libautocode/def/autocode.c
r5291 r5851 17 17 18 18 # ifdef BYTE_SWAP 19 byte = ( char *) data;19 byte = (unsigned char *) data; 20 20 for (i = 0; i < nitems; i++, byte += $SIZE) { 21 21 /** BYTE SWAP **/ -
trunk/Ohana/src/libfits/matrix/F_load_M.c
r5238 r5851 34 34 perpix = abs(header[0].bitpix) / 8; 35 35 if (perpix > 1) { 36 byte0 = ( char *) matrix[0].buffer;37 byte1 = ( char *) matrix[0].buffer + 1;38 byte2 = ( char *) matrix[0].buffer + 2;39 byte3 = ( char *) matrix[0].buffer + 3;40 byte4 = ( char *) matrix[0].buffer + 4;41 byte5 = ( char *) matrix[0].buffer + 5;42 byte6 = ( char *) matrix[0].buffer + 6;43 byte7 = ( char *) matrix[0].buffer + 7;36 byte0 = (unsigned char *) matrix[0].buffer; 37 byte1 = (unsigned char *) matrix[0].buffer + 1; 38 byte2 = (unsigned char *) matrix[0].buffer + 2; 39 byte3 = (unsigned char *) matrix[0].buffer + 3; 40 byte4 = (unsigned char *) matrix[0].buffer + 4; 41 byte5 = (unsigned char *) matrix[0].buffer + 5; 42 byte6 = (unsigned char *) matrix[0].buffer + 6; 43 byte7 = (unsigned char *) matrix[0].buffer + 7; 44 44 if (perpix == 2) { 45 45 for (i = 0; i < nbytes; i+=2, byte0 += 2, byte1 += 2) { -
trunk/Ohana/src/libfits/matrix/F_read_portion.c
r5238 r5851 52 52 perpix = abs(header.bitpix) / 8; 53 53 if (perpix > 1) { 54 byte0 = ( char *) matrix[0].buffer;55 byte1 = ( char *) matrix[0].buffer + 1;56 byte2 = ( char *) matrix[0].buffer + 2;57 byte3 = ( char *) matrix[0].buffer + 3;58 byte4 = ( char *) matrix[0].buffer + 4;59 byte5 = ( char *) matrix[0].buffer + 5;60 byte6 = ( char *) matrix[0].buffer + 6;61 byte7 = ( char *) matrix[0].buffer + 7;54 byte0 = (unsigned char *) matrix[0].buffer; 55 byte1 = (unsigned char *) matrix[0].buffer + 1; 56 byte2 = (unsigned char *) matrix[0].buffer + 2; 57 byte3 = (unsigned char *) matrix[0].buffer + 3; 58 byte4 = (unsigned char *) matrix[0].buffer + 4; 59 byte5 = (unsigned char *) matrix[0].buffer + 5; 60 byte6 = (unsigned char *) matrix[0].buffer + 6; 61 byte7 = (unsigned char *) matrix[0].buffer + 7; 62 62 if (perpix == 2) { 63 63 for (i = 0; i < nbytes; i+=2, byte0 += 2, byte1 += 2) { -
trunk/Ohana/src/libfits/matrix/F_read_segment.c
r5238 r5851 84 84 perpix = abs(header.bitpix) / 8; 85 85 if (perpix > 1) { 86 byte0 = ( char *) matrix[0].buffer;87 byte1 = ( char *) matrix[0].buffer + 1;88 byte2 = ( char *) matrix[0].buffer + 2;89 byte3 = ( char *) matrix[0].buffer + 3;90 byte4 = ( char *) matrix[0].buffer + 4;91 byte5 = ( char *) matrix[0].buffer + 5;92 byte6 = ( char *) matrix[0].buffer + 6;93 byte7 = ( char *) matrix[0].buffer + 7;86 byte0 = (unsigned char *) matrix[0].buffer; 87 byte1 = (unsigned char *) matrix[0].buffer + 1; 88 byte2 = (unsigned char *) matrix[0].buffer + 2; 89 byte3 = (unsigned char *) matrix[0].buffer + 3; 90 byte4 = (unsigned char *) matrix[0].buffer + 4; 91 byte5 = (unsigned char *) matrix[0].buffer + 5; 92 byte6 = (unsigned char *) matrix[0].buffer + 6; 93 byte7 = (unsigned char *) matrix[0].buffer + 7; 94 94 if (perpix == 2) { 95 95 for (i = 0; i < nbytes; i+=2, byte0 += 2, byte1 += 2) { -
trunk/Ohana/src/libfits/matrix/F_write_M.c
r5238 r5851 41 41 perpix = abs(matrix[0].bitpix) / 8; 42 42 if (perpix > 1) { 43 byte0 = ( char *) matrix[0].buffer;44 byte1 = ( char *) matrix[0].buffer + 1;45 byte2 = ( char *) matrix[0].buffer + 2;46 byte3 = ( char *) matrix[0].buffer + 3;47 byte4 = ( char *) matrix[0].buffer + 4;48 byte5 = ( char *) matrix[0].buffer + 5;49 byte6 = ( char *) matrix[0].buffer + 6;50 byte7 = ( char *) matrix[0].buffer + 7;43 byte0 = (unsigned char *) matrix[0].buffer; 44 byte1 = (unsigned char *) matrix[0].buffer + 1; 45 byte2 = (unsigned char *) matrix[0].buffer + 2; 46 byte3 = (unsigned char *) matrix[0].buffer + 3; 47 byte4 = (unsigned char *) matrix[0].buffer + 4; 48 byte5 = (unsigned char *) matrix[0].buffer + 5; 49 byte6 = (unsigned char *) matrix[0].buffer + 6; 50 byte7 = (unsigned char *) matrix[0].buffer + 7; 51 51 if (perpix == 2) { 52 52 for (i = 0; i < nbytes; i+=2, byte0 += 2, byte1 += 2) { … … 93 93 perpix = abs(matrix[0].bitpix) / 8; 94 94 if (perpix > 1) { 95 byte0 = ( char *) matrix[0].buffer;96 byte1 = ( char *) matrix[0].buffer + 1;97 byte2 = ( char *) matrix[0].buffer + 2;98 byte3 = ( char *) matrix[0].buffer + 3;99 byte4 = ( char *) matrix[0].buffer + 4;100 byte5 = ( char *) matrix[0].buffer + 5;101 byte6 = ( char *) matrix[0].buffer + 6;102 byte7 = ( char *) matrix[0].buffer + 7;95 byte0 = (unsigned char *) matrix[0].buffer; 96 byte1 = (unsigned char *) matrix[0].buffer + 1; 97 byte2 = (unsigned char *) matrix[0].buffer + 2; 98 byte3 = (unsigned char *) matrix[0].buffer + 3; 99 byte4 = (unsigned char *) matrix[0].buffer + 4; 100 byte5 = (unsigned char *) matrix[0].buffer + 5; 101 byte6 = (unsigned char *) matrix[0].buffer + 6; 102 byte7 = (unsigned char *) matrix[0].buffer + 7; 103 103 if (perpix == 2) { 104 104 for (i = 0; i < nbytes; i+=2, byte0 += 2, byte1 += 2) { -
trunk/Ohana/src/libohana/src/Fread.c
r5237 r5851 64 64 65 65 if (!strcmp (type, "short")) { 66 byte0 = ( char *)ptr;67 byte1 = ( char *)ptr + 1;66 byte0 = (unsigned char *)ptr; 67 byte1 = (unsigned char *)ptr + 1; 68 68 for (i = 0; i < nitems; i++, byte0 += 2, byte1 += 2) { 69 69 tmp = *byte0; … … 75 75 76 76 if (!strcmp (type, "int") || !strcmp (type, "float")) { 77 byte0 = ( char *)ptr;78 byte1 = ( char *)ptr + 1;79 byte2 = ( char *)ptr + 2;80 byte3 = ( char *)ptr + 3;77 byte0 = (unsigned char *)ptr; 78 byte1 = (unsigned char *)ptr + 1; 79 byte2 = (unsigned char *)ptr + 2; 80 byte3 = (unsigned char *)ptr + 3; 81 81 for (i = 0; i < nitems; i++, byte0 += 4, byte1 += 4, byte2 += 4, byte3 += 4) { 82 82 tmp = *byte0; … … 91 91 92 92 if (!strcmp (type, "double")) { 93 byte0 = ( char *)ptr;94 byte1 = ( char *)ptr + 1;95 byte2 = ( char *)ptr + 2;96 byte3 = ( char *)ptr + 3;97 byte4 = ( char *)ptr + 4;98 byte5 = ( char *)ptr + 5;99 byte6 = ( char *)ptr + 6;100 byte7 = ( char *)ptr + 7;93 byte0 = (unsigned char *)ptr; 94 byte1 = (unsigned char *)ptr + 1; 95 byte2 = (unsigned char *)ptr + 2; 96 byte3 = (unsigned char *)ptr + 3; 97 byte4 = (unsigned char *)ptr + 4; 98 byte5 = (unsigned char *)ptr + 5; 99 byte6 = (unsigned char *)ptr + 6; 100 byte7 = (unsigned char *)ptr + 7; 101 101 for (i = 0; i < nitems; i++, byte0 += 8, byte1 += 8, byte2 += 8, byte3 += 8, byte4 += 8, byte5 += 8, byte6 += 8, byte7 += 8) { 102 102 tmp = *byte0; … … 122 122 return (FALSE); 123 123 } 124 byte = ( char *)ptr;124 byte = (unsigned char *)ptr; 125 125 for (i = 0; i < nitems; i++, byte += REGIMAGE_SIZE) { 126 126 SWAP_WORD (284); /* exptime */ … … 152 152 return (FALSE); 153 153 } 154 byte = ( char *)ptr;154 byte = (unsigned char *)ptr; 155 155 for (i = 0; i < nitems; i++, byte += DETREG_SIZE) { 156 156 SWAP_WORD (0); /* tstart */ … … 172 172 return (FALSE); 173 173 } 174 byte = ( char *)ptr;174 byte = (unsigned char *)ptr; 175 175 for (i = 0; i < nitems; i++, byte += PHOTPARS_SIZE) { 176 176 SWAP_WORD (0); /* ZP */ … … 195 195 return (FALSE); 196 196 } 197 byte0 = ( char *)ptr;198 byte1 = ( char *)ptr + 1;199 byte2 = ( char *)ptr + 2;200 byte3 = ( char *)ptr + 3;197 byte0 = (unsigned char *)ptr; 198 byte1 = (unsigned char *)ptr + 1; 199 byte2 = (unsigned char *)ptr + 2; 200 byte3 = (unsigned char *)ptr + 3; 201 201 for (i = 0; i < nitems; i++, byte0 += 4, byte1 += 4, byte2 += 4, byte3 += 4) { 202 202 tmp = *byte0; … … 215 215 return (FALSE); 216 216 } 217 byte = ( char *) ptr;217 byte = (unsigned char *) ptr; 218 218 for (i = 0; i < nitems; i++, byte += SECFILT_SIZE) { 219 219 SWAP_BYTE (0); /* M */ … … 229 229 return (FALSE); 230 230 } 231 byte = ( char *)ptr;231 byte = (unsigned char *)ptr; 232 232 for (i = 0; i < nitems; i++, byte += SPECTRUM_SIZE) { 233 233 SWAP_WORD (0); /* ra */ … … 250 250 return (FALSE); 251 251 } 252 byte = ( char *)ptr;252 byte = (unsigned char *)ptr; 253 253 for (i = 0; i < nitems; i++, byte += IMAGE_SIZE) { 254 254 SWAP_DBLE (0); /* coords.crval1 */ … … 278 278 return (FALSE); 279 279 } 280 byte = ( char *)ptr;280 byte = (unsigned char *)ptr; 281 281 for (i = 0; i < nitems; i++, byte += AVERAGE_SIZE) { 282 282 SWAP_DBLE (0); /* R */ … … 300 300 return (FALSE); 301 301 } 302 byte = ( char *)ptr;302 byte = (unsigned char *)ptr; 303 303 for (i = 0; i < nitems; i++, byte += MEASURE_SIZE) { 304 304 SWAP_BYTE (0); /* dR */ … … 328 328 return (FALSE); 329 329 } 330 byte = ( char *)ptr;330 byte = (unsigned char *)ptr; 331 331 for (i = 0; i < nitems; i++, byte += AVERAGE_SIZE) { 332 332 SWAP_WORD (0); /* R */ … … 350 350 return (FALSE); 351 351 } 352 byte = ( char *)ptr;352 byte = (unsigned char *)ptr; 353 353 for (i = 0; i < nitems; i++, byte += MEASURE_SIZE) { 354 354 SWAP_BYTE (0); /* dR */ … … 378 378 return (FALSE); 379 379 } 380 byte = ( char *)ptr;380 byte = (unsigned char *)ptr; 381 381 for (i = 0; i < nitems; i++, byte += OLDAVERAGE_SIZE) { 382 382 SWAP_WORD (0); /* R */ … … 398 398 return (FALSE); 399 399 } 400 byte = ( char *)ptr;400 byte = (unsigned char *)ptr; 401 401 for (i = 0; i < nitems; i++, byte += OLDMEASURE_SIZE) { 402 402 SWAP_BYTE (0); /* dR */ … … 418 418 return (FALSE); 419 419 } 420 byte = ( char *) ptr;420 byte = (unsigned char *) ptr; 421 421 for (i = 0; i < nitems; i++, byte += OLDSECFILT_SIZE) { 422 422 SWAP_BYTE (0); /* M */ … … 430 430 return (FALSE); 431 431 } 432 byte = ( char *)ptr;432 byte = (unsigned char *)ptr; 433 433 for (i = 0; i < nitems; i++, byte += RUFIMAGE_SIZE) { 434 434 SWAP_WORD (0); /* sky */ … … 447 447 return (FALSE); 448 448 } 449 byte = ( char *)ptr;449 byte = (unsigned char *)ptr; 450 450 for (i = 0; i < nitems; i++, byte += OLDDETREG_SIZE) { 451 451 SWAP_WORD (0); /* tstart */
Note:
See TracChangeset
for help on using the changeset viewer.
