1 files changed, 26 insertions, 24 deletions
diff --git a/dep/g3dlite/include/G3D/Image1.h b/dep/g3dlite/include/G3D/Image1.h
index 711e83f2079..615c0a8e224 100644
--- a/dep/g3dlite/include/G3D/Image1.h
+++ b/dep/g3dlite/include/G3D/Image1.h
@@ -1,35 +1,34 @@
 /**
-  @file Image1.h
+  \file G3D/Image1.h
 
-  @maintainer Morgan McGuire, http://graphics.cs.williams.edu
+  \maintainer Morgan McGuire, http://graphics.cs.williams.edu
 
-  @created 2007-01-31
-  @edited  2007-01-31
+  \created 2007-01-31
+  \edited  2011-08-31
 */
 
 
-#ifndef G3D_IMAGE1_H
-#define G3D_IMAGE1_H
+#ifndef G3D_Image1_h
+#define G3D_Image1_h
 
 #include "G3D/platform.h"
 #include "G3D/Map2D.h"
 #include "G3D/Color1.h"
-#include "G3D/GImage.h"
 
 namespace G3D {
 
-typedef ReferenceCountedPointer<class Image1> Image1Ref;
+typedef shared_ptr<class Image1> Image1Ref;
 
 /**
  Luminance image with 32-bit floating point storage.
 
- See also G3D::Image1uint8, G3D::GImage.
+ See also G3D::Image1unorm8, G3D::GImage.
  */
 class Image1 : public Map2D<Color1, Color1> {
 public:
 
     typedef Image1      Type;
-    typedef ReferenceCountedPointer<class Image1>   Ref;
+    typedef shared_ptr<class Image1>   Ref;
     typedef Color1      Storage;
     typedef Color1      Compute;
 
@@ -41,9 +40,9 @@ protected:
     void copyArray(const Color1* src, int w, int h);
     void copyArray(const Color3* src, int w, int h);
     void copyArray(const Color4* src, int w, int h);
-    void copyArray(const Color1uint8* src, int w, int h);
-    void copyArray(const Color3uint8* src, int w, int h);
-    void copyArray(const Color4uint8* src, int w, int h);
+    void copyArray(const Color1unorm8* src, int w, int h);
+    void copyArray(const Color3unorm8* src, int w, int h);
+    void copyArray(const Color4unorm8* src, int w, int h);
 
 public:
 
@@ -55,25 +54,28 @@ public:
     /** Creates a 0 x 0 image. */
     static Ref createEmpty(WrapMode wrap = WrapMode::ERROR);
 
-    static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR, GImage::Format fmt = GImage::AUTODETECT);
+    static Ref fromFile(const std::string& filename, WrapMode wrap = WrapMode::ERROR);
     
-    static Ref fromArray(const class Color1uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
-    static Ref fromArray(const class Color3uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
-    static Ref fromArray(const class Color4uint8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color1unorm8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color3unorm8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
+    static Ref fromArray(const class Color4unorm8* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
     static Ref fromArray(const class Color1* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
     static Ref fromArray(const class Color3* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
     static Ref fromArray(const class Color4* ptr, int width, int height, WrapMode wrap = WrapMode::ERROR);
 
-    static Ref fromImage1uint8(const ReferenceCountedPointer<class Image1uint8>& im);
+    static Ref fromImage1unorm8(const shared_ptr<class Image1unorm8>& im);
 
-    static Ref fromGImage(const class GImage& im, WrapMode wrap = WrapMode::ERROR);
+    /** Loads from any of the file formats supported by G3D::Image.
 
-    /** Loads from any of the file formats supported by G3D::GImage.  If there is an alpha channel on the input,
-        it is stripped. */
-    void load(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+        If there is an alpha channel on the input, it is stripped.
+        Values are automatically scaled to the range [0, 1]. */
+    void load(const std::string& filename);
 
-    /** Saves in any of the formats supported by G3D::GImage. */
-    void save(const std::string& filename, GImage::Format fmt = GImage::AUTODETECT);
+    /** Saves in any of the formats supported by G3D::Image. 
+
+        The data values are assumed to be on the range [0, 1] and will
+        be scaled appropriately for the save format.*/
+    void save(const std::string& filename);
 };
 
 } // G3D