← Back to branch summary

~mc-return/nux/nux.merge-fix-deprecated-warnings

« back to all changes in this revision

Viewing changes to NuxGraphics/ImageSurface.cpp

  • Committer: Jay Taoko
  • Date: 2012-07-11 09:53:57 UTC
  • mto: This revision was merged to the branch mainline in revision 632.
  • Revision ID: jay.taoko@canonical.com-20120711095357-yfeq9v4xu6mte7o4
* Fix in volume texture API

Show diffs side-by-side

added added

removed removed

Lines of Context:
NuxGraphics/ImageSurface.cpp
29
29
 
30
30
#if defined(NUX_OS_WINDOWS)
31
31
  #include "GdiImageLoader.h"
32
 
  #include "DDS.h"
33
32
#endif
34
33
 
35
34
#include "ImageSurface.h"
82
81
#if defined(NUX_OS_WINDOWS)
83
82
    BitmapData = GdiLoadImageFile(filename);
84
83
    if (BitmapData) return BitmapData;
85
 
 
86
 
    BitmapData = read_tga_file(filename);
87
 
    if (BitmapData) return BitmapData;
88
 
 
89
 
    BitmapData = LoadFileFormat_DDS(filename);
90
 
    if (BitmapData) return BitmapData;
91
 
 
92
84
#elif defined(NUX_OS_LINUX)
93
85
    GdkGraphics gdkgraphics;
94
86
    gdkgraphics.LoadImage(filename);
1181
1173
    {
1182
1174
      for (int s = 0; s < ImageSurface::GetLevelDim(object.GetFormat(), object.GetDepth(), mip); s++)
1183
1175
      {
1184
 
        m_MipSurfaceArray[mip].push_back(new ImageSurface(object.GetSurface(mip, s)));
 
1176
        m_MipSurfaceArray[mip].push_back(new ImageSurface(object.GetSurface(s, mip)));
1185
1177
      }
1186
1178
    }
1187
1179
  }
1200
1192
    {
1201
1193
      for (int s = 0; s < ImageSurface::GetLevelDim(copy.GetFormat(), copy.GetDepth(), mip); s++)
1202
1194
      {
1203
 
        m_MipSurfaceArray[mip].push_back(new ImageSurface(copy.GetSurface(mip, s)));
 
1195
        m_MipSurfaceArray[mip].push_back(new ImageSurface(copy.GetSurface(s, mip)));
1204
1196
      }
1205
1197
    }
1206
1198