X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmJPEGFragmentsInfo.cxx;h=6adb33f0220e95237489ac9e53b0b9bfbd01cb2c;hb=dfd2b1cd2925e77ef9466cfb2fc71706c84a418c;hp=f503f38839390a62bf631a5f407b40835e89c8af;hpb=70a3a0f95bf2240a6ef4b1d6523c0e6614437304;p=gdcm.git diff --git a/src/gdcmJPEGFragmentsInfo.cxx b/src/gdcmJPEGFragmentsInfo.cxx index f503f388..6adb33f0 100644 --- a/src/gdcmJPEGFragmentsInfo.cxx +++ b/src/gdcmJPEGFragmentsInfo.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmJPEGFragmentsInfo.cxx,v $ Language: C++ - Date: $Date: 2005/01/24 14:52:50 $ - Version: $Revision: 1.9 $ + Date: $Date: 2005/01/26 16:28:58 $ + Version: $Revision: 1.11 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -23,9 +23,10 @@ namespace gdcm { JPEGFragmentsInfo::JPEGFragmentsInfo() - { - StateSuspension = 0; - } +{ + StateSuspension = 0; +} + /** * \brief Default destructor */ @@ -79,7 +80,7 @@ size_t JPEGFragmentsInfo::GetFragmentsLength() it != Fragments.end(); ++it ) { - totalLength += (*it)->Length; + totalLength += (*it)->GetLength(); } return totalLength; } @@ -97,8 +98,8 @@ void JPEGFragmentsInfo::ReadAllFragments(std::ifstream *fp, JOCTET *buffer ) it != Fragments.end(); ++it ) { - fp->seekg( (*it)->Offset, std::ios::beg); - size_t len = (*it)->Length; + fp->seekg( (*it)->GetOffset(), std::ios::beg); + size_t len = (*it)->GetLength(); fp->read((char *)p,len); p += len; } @@ -119,7 +120,7 @@ void JPEGFragmentsInfo::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t //(*it)->pimage = localRaw; (*it)->DecompressJPEGFramesFromFile(fp, localRaw, nBits, StateSuspension); // update pointer to image after some scanlines read: - localRaw = (*it)->pimage; + localRaw = (*it)->GetImage(); // Advance to next free location in Raw // for next fragment decompression (if any) @@ -128,5 +129,10 @@ void JPEGFragmentsInfo::DecompressJPEGFramesFromFile(std::ifstream *fp, uint8_t } } +void JPEGFragmentsInfo::AddFragment(JPEGFragment *fragment) +{ + Fragments.push_back(fragment); +} + } // end namespace gdcm