← Back to branch summary

~ubuntu-branches/ubuntu/raring/ginkgocadx/raring-proposed

« back to all changes in this revision

Viewing changes to src/cadxcore/main/controllers/streaming/streamingloader.cpp

  • Committer: Package Import Robot
  • Author(s): Andreas Tille
  • Date: 2011-11-09 12:29:00 UTC
  • mfrom: (1.1.4)
  • Revision ID: package-import@ubuntu.com-20111109122900-idkd9vvhr31whz8z
Tags: 2.6.0.0~rc-1
http://bugs.debian.org/647413
http://bugs.debian.org/648167
* New upstream version
  Closes: #647413
* Rebuild against recent insighttoolkit
  Closes: #648167

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/cadxcore/main/controllers/streaming/streamingloader.cpp
1
1
/*
2
2
 *  
3
 
 *  $Id: streamingloader.cpp 3921 2011-07-06 11:36:02Z tovar $
 
3
 *  $Id: streamingloader.cpp 4314 2011-10-19 09:44:46Z carlos $
4
4
 *  Ginkgo CADx Project
5
5
 *
6
6
 *  Copyright 2008-10 MetaEmotion S.L. All rights reserved.
162
162
        m_IO = ImageIO::New();
163
163
        m_IO->SetLoadPrivateTags(false);
164
164
        //Esto da leaks no activar
165
 
        //m_IO->SetLoadSequences(false);
 
165
        m_IO->SetLoadSequences(false);
166
166
        m_IO->SetUseStreamedReading(true);
167
167
        m_IO->SetMaxSizeLoadEntry(1024); // No permitir cargar campos de mas de 1K
168
168
        m_pOutput = vtkSmartPointer<vtkImageChangeInformation>::New();
638
638
                m_CurrentComponentType      = ImageIO::UNKNOWNCOMPONENTTYPE;
639
639
                m_CurrentPixelType          = ImageIO::SCALAR;
640
640
                m_CurrentDimensions[0]      = 800;
641
 
                m_CurrentDimensions[1]      = 600;
 
641
                m_CurrentDimensions[1]      = 800;
642
642
                m_CurrentDimensions[2]      = 1;
643
643
                m_pReader = NULL;
644
644
                m_pPipelineJoiner = NULL;
657
657
                TypedImageType::SizeType size;
658
658
                TypedImageType::IndexType index;
659
659
                size[0] = 800;
660
 
                size[1] = 600;
 
660
                size[1] = 800;
661
661
                size[2] = 1;
662
662
                index[0] = index[1] = index[2] = 0;
663
663
                TypedImageType::RegionType region;