bugfix: resource file searching was broken

[chaz/yoink] / src / Moof / Image.hh

diff --git a/src/Moof/Image.hh b/src/Moof/Image.hh
index 5f7c5a3205c746e8ca091ba6568ca7999561fef9..6c36cddcd827a45b6e945a037269e8f742db629a 100644 (file)
--- a/src/Moof/Image.hh
+++ b/src/Moof/Image.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _MOOF_IMAGE_HH_
 #define _MOOF_IMAGE_HH_
@@ -38,10 +21,18 @@
 namespace Mf {
 
 
+class Image;
+typedef boost::shared_ptr<Image> ImageP;
+
 class Image : public Resource
 {
 public:
 
+       static ImageP alloc(const std::string& name)
+       {
+               return ImageP(new Image(name));
+       }
+
        explicit Image(const std::string& name);
 
        bool isValid() const;
@@ -51,7 +42,7 @@ public:
 
        unsigned getDepth() const;
        unsigned getPitch() const;
-       GLuint getColorMode() const;
+       GLuint getMode() const;
 
        std::string getComment() const;
 
@@ -62,10 +53,12 @@ public:
 
        void setAsIcon() const;
 
-       static std::string getPath(const std::string& name);
+       static bool getPath(std::string& name);
 
 private:
 
+       static FILE* openFile(std::string& name);
+
        class Impl;
        boost::shared_ptr<Impl> mImpl;
 };
@@ -75,5 +68,3 @@ private:
 
 #endif // _MOOF_IMAGE_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-