← Back to branch summary

~saiarcot895/ubuntu/trusty/openscenegraph/armhf-support

« back to all changes in this revision

Viewing changes to OpenSceneGraph/src/osgPlugins/ive/ImageLayer.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Loic Dachary (OuoU)
  • Date: 2009-03-23 14:08:20 UTC
  • mfrom: (1.1.7 upstream) (2.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20090323140820-i4j3jozdlhyn4lre
http://bugs.debian.org/517671
rules prevent lib64 with -D LIB_POSTFIX="" (Closes: #517671)

Show diffs side-by-side

added added

removed removed

Lines of Context:
OpenSceneGraph/src/osgPlugins/ive/ImageLayer.cpp
15
15
#include "ImageLayer.h"
16
16
#include "Layer.h"
17
17
 
 
18
#include <osgTerrain/TerrainTile>
 
19
 
18
20
#include <osgDB/ReadFile>
19
21
 
20
22
using namespace ive;
32
34
        throw Exception("ImageLayer::write(): Could not cast this osgLayer::ImageLayer to an osgTerrain::Layer.");
33
35
 
34
36
 
35
 
    IncludeImageMode imMode = out->getIncludeImageMode();
 
37
    IncludeImageMode imMode = out->getIncludeImageMode(getImage());
36
38
 
37
39
    if (getFileName().empty() && imMode==IMAGE_REFERENCE_FILE) imMode = IMAGE_INCLUDE_DATA;
38
40
 
59
61
        throw Exception("ImageLayer::read(): Could not cast this osgLayer::Layer to an osg::Group.");
60
62
 
61
63
 
 
64
    bool deferExternalLayerLoading = osgTerrain::TerrainTile::getTileLoadedCallback().valid() ? 
 
65
        osgTerrain::TerrainTile::getTileLoadedCallback()->deferExternalLayerLoading() : false;
 
66
 
62
67
    // Should we read image data from stream
63
68
    IncludeImageMode includeImg = (IncludeImageMode)in->readChar();
64
 
    setImage(in->readImage(includeImg));
65
 
 
 
69
    
 
70
    if (includeImg==IMAGE_REFERENCE_FILE && deferExternalLayerLoading)
 
71
    {
 
72
        setFileName(in->readString());
 
73
    }
 
74
    else
 
75
    {
 
76
        setImage(in->readImage(includeImg));
 
77
    }
66
78
}