Commit ac966c57 authored by Robert Butora's avatar Robert Butora
Browse files

fix warnings: long-int mismatch on card-ix & unused func-params eliminated

parent 632b868c

data-access/engine/src/vlkb/src/imcopydav.cpp

+9 −9
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ class dav 
      {

         *numkeys = endcard_cix;



         long rem = (endcard_cix+1) % 36;

         int rem = (endcard_cix+1) % 36;

         *morekeys = (rem==0) ? 0 : (36-rem);

         return *status;

      }
@@ -123,7 +123,7 @@ class dav 
            if(0 == string(lkeyname).compare(string{keyname}))

            {

               fits_parse_value(card, lvalue, comment, status);

               if((lvalue!=NULL) && (*status==0))

               if(/*(lvalue!=NULL) &&*/ (*status==0))

               {

                  switch(datatype)

                  {
@@ -142,9 +142,9 @@ class dav 
// 'The fpixel and lpixel parameters are integer arrays which specify the starting

// and ending pixel coordinate in each dimension (starting with 1, not 0) of the FITS image'

      int ffgsv(int bitpix,

            int naxis, long *naxes,

            int naxis, /*long *naxes,*/

            long *fpixel, /*long *lpixel, long *inc,*/ long arraylen,

            char nulval, char *array, int *anynul, int *status )

            /*char nulval,*/ char *array, /*int *anynul,*/ int *status )

      {

         //assert( fpixel[0] <= lpixel[0] );
@@ -177,7 +177,7 @@ class dav 


         fits_read_record(card_ix+1, card, status);

         fits_parse_value(card, value, NULL, status);

         if((value!=NULL) && (*status==0))

         if(/*(value!=NULL) &&*/ (*status==0))

         {

            return string{value};

         }
@@ -214,7 +214,7 @@ class dav 


      static const int NCARDS=1400;

      char buffer[NCARDS*80];

      long endcard_cix;

      int endcard_cix;

      long du_firstbyte_cix;



      dav_off_t volume[9] = {1,1,1,1,1,1,1,1,1};
@@ -270,7 +270,7 @@ int fits_copy_image_section3( 
   long lpixels[] = {1,1,1,1,1,1,1,1,1};

   long incs[] = {1,1,1,1,1,1,1,1,1};

   char *cptr, keyname[FLEN_KEYWORD], card[FLEN_CARD];

   int ii, tstatus, anynull;

   int ii, tstatus;

   long minrow, maxrow, minslice, maxslice, mincube, maxcube;

   long firstpix;

   long ncubeiter, nsliceiter, nrowiter, kiter, jiter, iiter;
@@ -551,8 +551,8 @@ int fits_copy_image_section3( 
            lpixels[1] = fpixels[1];



            //

            fdav.ffgsv(bitpix, naxis, naxes,

                  fpixels, buffsize, 0, (char*)buffer, NULL, status);

            fdav.ffgsv(bitpix, naxis, /*naxes,*/

                  fpixels, buffsize, /*0,*/ (char*)buffer, /*NULL,*/ status);



            endianess(bitpix, buffsize, (char*)buffer);