← Back to branch summary

~unity-team/nux/nux-remove-glew-mx

« back to all changes in this revision

Viewing changes to NuxImage/ImageSurface.h

  • Committer: Jay Taoko
  • Date: 2011-05-30 02:54:31 UTC
  • mfrom: (353.1.1 nux)
  • Revision ID: jay.taoko@canonical.com-20110530025431-kpqcnbcq3apsfz92
* Object::Dispose() now does the same thing as Object::UnReference()
* Fixed memory leak in UXTheme::Load2DTextureFile
* Mesh Resource manager
    - Fixed mesh Resource manager pipeline
    - See example ProgObjMeshLoader

* Fixed GLSL Shaders in FontRendering.cpp
    - removed global variable USE_ARB_SHADERS and replaced with GraphicsEngine::UsingGLSLCodePath()

* Removing files IniFile.cpp/.h
* Removing files UIColorTheme.cpp/.h

Show diffs side-by-side

added added

removed removed

Lines of Context:
NuxImage/ImageSurface.h
149
149
        Sum up all the image elements and divide by the number of elements.
150
150
        @return The average color of the image.
151
151
    */
152
 
    Color AverageColor();
 
152
    struct Color AverageColor();
153
153
 
154
154
  private:
155
155
    void FlipDXTVertical();
525
525
 
526
526
  bool HasOpenEXRSupport();
527
527
 
528
 
  NBitmapData *LoadGdkPixbuf (GdkPixbuf *pixbuf);
529
 
  NBitmapData *LoadImageFile (const TCHAR *Filename);
 
528
  /*!
 
529
      Return and object that has to be destroyed with delete.
 
530
 
 
531
      @return A bitmap source. Destroy it with delete.
 
532
  */
 
533
  NBitmapData* LoadGdkPixbuf(GdkPixbuf *pixbuf);
 
534
 
 
535
  /*!
 
536
      Return and object that has to be destroyed with delete.
 
537
 
 
538
      @return A bitmap source. Destroy it with delete.
 
539
  */
 
540
  NBitmapData* LoadImageFile(const TCHAR *Filename);
530
541
 
531
542
}
532
543