From 29944b8a50e78122cc472cd387842d8aa9983184 Mon Sep 17 00:00:00 2001 From: William Joye Date: Wed, 16 Aug 2017 16:05:30 -0400 Subject: FITS Compression- fixed a problem with BITPIX=-64 and ZQUANTIZ=NONE --- ds9/doc/release/r7.6.html | 2 ++ tksao/fitsy++/compress.C | 6 ------ tksao/fitsy++/gzip.C | 2 +- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ds9/doc/release/r7.6.html b/ds9/doc/release/r7.6.html index a65efd5..55063fa 100644 --- a/ds9/doc/release/r7.6.html +++ b/ds9/doc/release/r7.6.html @@ -127,6 +127,8 @@
  • 08.14.2017 TCLIIS: updated to version 1.0.5
  • 08.14.2017 TKHTML1: updated to version 1.0.8
  • 08.14.2017 TKMPEG: updated to version 1.0.5
  • +
  • 08.16.2017 FITSY++: FITS compression- fixed a problem with ZQUANIZ=NO_DITHER.
  • +
  • 08.16.2017 FITSY++: FITS compression- fixed a problem with BITPIX=-64 and ZQUANTIZ=NONE.
  • xx.xx.2017 RELEASE version 7.6b5
  • diff --git a/tksao/fitsy++/compress.C b/tksao/fitsy++/compress.C index b1b01ac..96d7715 100644 --- a/tksao/fitsy++/compress.C +++ b/tksao/fitsy++/compress.C @@ -319,8 +319,6 @@ template int FitsCompressm::inflate(FitsFile* fits) if (gzcompress_ && !ok) { if (gzcompressed(dest, sptr, sdata+heap, kkstart, kkstop, jjstart, jjstop, iistart, iistop)) { - if (DebugCompress) - cerr << 'z'; ok=1; } } @@ -329,8 +327,6 @@ template int FitsCompressm::inflate(FitsFile* fits) initRandom(rr); if (compressed(dest, sptr, sdata+heap, kkstart, kkstop, jjstart, jjstop, iistart, iistop)) { - if (DebugCompress) - cerr << 'c'; ok=1; } } @@ -338,8 +334,6 @@ template int FitsCompressm::inflate(FitsFile* fits) if (uncompress_ && !ok) { if (uncompressed(dest, sptr, sdata+heap, kkstart, kkstop, jjstart, jjstop, iistart, iistop)) { - if (DebugCompress) - cerr << 'u'; ok=1; } } diff --git a/tksao/fitsy++/gzip.C b/tksao/fitsy++/gzip.C index 05effdf..7ea6a6d 100644 --- a/tksao/fitsy++/gzip.C +++ b/tksao/fitsy++/gzip.C @@ -66,7 +66,7 @@ template int FitsGzipm::compressed(T* dest, char* sptr, zstrm.avail_in = icnt; zstrm.next_in = ibuf; - zstrm.avail_out = ocnt*sizeof(int); + zstrm.avail_out = ocnt*sizeof(long long); zstrm.next_out = (Bytef*)obuf; if (DebugCompress) -- cgit v0.12