comparison OrthancCppClient/Instance.cpp @ 947:c2c28dd17e87 query-retrieve

integration mainline -> query-retrieve
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 25 Jun 2014 12:09:38 +0200
parents a811bdf8b8eb
children 6e7e5ed91c2d
comparison
equal deleted inserted replaced
758:67e6400fca03 947:c2c28dd17e87
28 * You should have received a copy of the GNU General Public License 28 * You should have received a copy of the GNU General Public License
29 * along with this program. If not, see <http://www.gnu.org/licenses/>. 29 * along with this program. If not, see <http://www.gnu.org/licenses/>.
30 **/ 30 **/
31 31
32 32
33 #include "../Core/PrecompiledHeaders.h"
33 #include "Instance.h" 34 #include "Instance.h"
34 35
35 #include "OrthancConnection.h" 36 #include "OrthancConnection.h"
36 37
37 #include <boost/lexical_cast.hpp> 38 #include <boost/lexical_cast.hpp>
176 } 177 }
177 178
178 const void* Instance::GetBuffer() 179 const void* Instance::GetBuffer()
179 { 180 {
180 DownloadImage(); 181 DownloadImage();
181 return reader_->GetBuffer(); 182 return reader_->GetConstBuffer();
182 } 183 }
183 184
184 const void* Instance::GetBuffer(unsigned int y) 185 const void* Instance::GetBuffer(unsigned int y)
185 { 186 {
186 DownloadImage(); 187 DownloadImage();
187 return reader_->GetBuffer(y); 188 return reader_->GetConstRow(y);
188 } 189 }
189 190
190 void Instance::DiscardImage() 191 void Instance::DiscardImage()
191 { 192 {
192 reader_.reset(); 193 reader_.reset();