Changeset 20115 for trunk/Mars/mcore
- Timestamp:
- 11/21/22 08:10:47 (2 years ago)
- Location:
- trunk/Mars/mcore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Mars/mcore/fits.h
r20067 r20115 475 475 // There may be a gap between the main table and the start of the heap: 476 476 // this computes the offset 477 st reamoff GetHeapShift() const477 std::streamoff GetHeapShift() const 478 478 { 479 479 if (!HasKey("ZHEAPPTR")) … … 485 485 486 486 // return total number of bytes 'all inclusive' 487 st reamoff GetTotalBytes() const487 std::streamoff GetTotalBytes() const 488 488 { 489 489 //get offset of special data area from start of main table 490 const st reamoff shift = GetHeapShift();490 const std::streamoff shift = GetHeapShift(); 491 491 492 492 //and special data area size 493 const st reamoff size = HasKey("PCOUNT") ? Get<streamoff>("PCOUNT") : 0;493 const std::streamoff size = HasKey("PCOUNT") ? Get<std::streamoff>("PCOUNT") : 0; 494 494 495 495 // Get the total size 496 const st reamoff total = total_bytes + size + shift;496 const std::streamoff total = total_bytes + size + shift; 497 497 498 498 // check for padding … … 684 684 if ((!tableName.empty() && tableName!=tname) || (tableName.empty() && "ZDrsCellOffsets"==tname)) 685 685 { 686 const st reamoff skip = fTable.GetTotalBytes();686 const std::streamoff skip = fTable.GetTotalBytes(); 687 687 seekg(skip, std::ios_base::cur); 688 688 … … 720 720 } 721 721 722 const st reampos p = tellg();722 const std::streampos p = tellg(); 723 723 seekg(0); 724 724 -
trunk/Mars/mcore/izstream.h
r17140 r20115 139 139 } 140 140 141 const st reampos pos = gzseek(fFile, offset-sbuf, SEEK_CUR);141 const std::streampos pos = gzseek(fFile, offset-sbuf, SEEK_CUR); 142 142 143 143 // Buffer is empty - force refilling 144 144 setg(fBuffer+4, fBuffer+4, fBuffer+4); 145 145 146 return pos<0 ? st reampos(EOF) : pos;146 return pos<0 ? std::streampos(EOF) : pos; 147 147 148 148 /* -
trunk/Mars/mcore/zfits.h
r20066 r20115 145 145 size_t fShrinkFactor; ///< shrink factor 146 146 147 st reamoff fHeapOff; ///< offset from the beginning of the file of the binary data148 st reamoff fHeapFromDataStart; ///< offset from the beginning of the data table147 std::streamoff fHeapOff; ///< offset from the beginning of the file of the binary data 148 std::streamoff fHeapFromDataStart; ///< offset from the beginning of the data table 149 149 150 150 std::vector<std::vector<std::pair<int64_t, int64_t>>> fCatalog; ///< Catalog, i.e. the main table that points to the compressed data. … … 184 184 fCatalog.resize(fNumTiles); 185 185 186 const st reampos catalogStart = tellg();186 const std::streampos catalogStart = tellg(); 187 187 188 188 fChkData.reset(); … … 569 569 { 570 570 //goto start of heap 571 const st reamoff whereAreWe = tellg();571 const std::streamoff whereAreWe = tellg(); 572 572 seekg(fHeapOff); 573 573 … … 583 583 FITS::BlockHeader columnHead; 584 584 585 st reamoff offsetInHeap = 0;585 std::streamoff offsetInHeap = 0; 586 586 //skip through the heap 587 587 while (true)
Note:
See TracChangeset
for help on using the changeset viewer.