diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-20 13:24:20 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2007-09-20 13:24:20 +0000 |
| commit | a84133850af6d348c0c4e252b26618148702153b (patch) | |
| tree | f4b8d7c9bbdeecd9c1976bdc3d3806909a25cd28 /src/resources/image.cpp | |
| parent | 1afcf2608c0a466d2df21faea1530955cc8061fc (diff) | |
| download | Mana-a84133850af6d348c0c4e252b26618148702153b.tar.gz Mana-a84133850af6d348c0c4e252b26618148702153b.tar.bz2 Mana-a84133850af6d348c0c4e252b26618148702153b.tar.xz Mana-a84133850af6d348c0c4e252b26618148702153b.zip | |
Merged a bunch of small changes from trunk to 0.0 and set svn:eol-style
to native for some files that were still missing this property. This is
a feeble attempt to reduce the amount of conflicts for future merges.
Diffstat (limited to 'src/resources/image.cpp')
| -rw-r--r-- | src/resources/image.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/image.cpp b/src/resources/image.cpp index 2d5cbe82..ad280eeb 100644 --- a/src/resources/image.cpp +++ b/src/resources/image.cpp @@ -159,7 +159,7 @@ Image* Image::load(void *buffer, unsigned int bufferSize, GLenum error = glGetError(); if (error) { - std::string errmsg = "Unkown error"; + std::string errmsg = "Unknown error"; switch (error) { case GL_INVALID_ENUM: @@ -343,5 +343,5 @@ SubImage::~SubImage() Image *SubImage::getSubImage(int x, int y, int w, int h) { - return NULL; + return mParent->getSubImage(mBounds.x + x, mBounds.y + y, w, h); } |