Changeset 38062 for trunk/Ohana/src/libfits/matrix/F_convert_format.c

Timestamp:

Mar 29, 2015, 6:52:41 AM (11 years ago)

Author:

eugene

Message:

merge changes from ipp-20150112

Location:

trunk

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/libfits/matrix/F_convert_format.c (modified) (2 diffs)

trunk/Ohana/src/libfits/matrix/F_convert_format.c

@@ -90 +90 @@
 
 /*********************** fits convert format ***********************************/
+/* this function is safe in the number of axes (can even be 0) */
 int gfits_convert_format (Header *header, Matrix *matrix, int outBitpix, double outScale, double outZero, int inBlank, int outUnsign) {
 
-  unsigned long i, nbytes, Npixels;
+  off_t i, nbytes;
   int    inBitpix, inUnsign;
   double inScale, inZero;
@@ -116 +117 @@
   gfits_modify_alt (header, "UNSIGN", "%t", 1, outUnsign);
 
-  Npixels          = header[0].Naxis[0]*header[0].Naxis[1];
-  nbytes           = Npixels * (abs(outBitpix) / 8);
+  off_t Npixels = gfits_npix_matrix (matrix);
+  nbytes                = Npixels * (abs(outBitpix) / 8);
 
   A = inScale / outScale;