diff options
author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-03-30 10:36:27 -0400 |
---|---|---|
committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-03-30 10:36:27 -0400 |
commit | 865efe9af6cb353fd3b57741ba36239a21794e80 (patch) | |
tree | ce4b83db3ed9af39f9364e41d04283a161b7c64a /indra/llimage/llimage.h | |
parent | e711e8af3d5f560fd93334d44eb7be1e01f02bec (diff) | |
parent | ac4e4607b8bde0fa05af75da5f873ef42e3c5918 (diff) |
merge
Diffstat (limited to 'indra/llimage/llimage.h')
-rw-r--r-- | indra/llimage/llimage.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llimage/llimage.h b/indra/llimage/llimage.h index 825b9aab1a..18444f3934 100644 --- a/indra/llimage/llimage.h +++ b/indra/llimage/llimage.h @@ -266,13 +266,13 @@ public: // subclasses must return a prefered file extension (lowercase without a leading dot) virtual std::string getExtension() = 0; // calcHeaderSize() returns the maximum size of header; - // 0 indicates we don't know have a header and have to lead the entire file + // 0 indicates we don't have a header and have to read the entire file virtual S32 calcHeaderSize() { return 0; }; // calcDataSize() returns how many bytes to read to load discard_level (including header) virtual S32 calcDataSize(S32 discard_level); // calcDiscardLevelBytes() returns the smallest valid discard level based on the number of input bytes virtual S32 calcDiscardLevelBytes(S32 bytes); - // getRawDiscardLevel()by default returns mDiscardLevel, but may be overridden (LLImageJ2C) + // getRawDiscardLevel() by default returns mDiscardLevel, but may be overridden (LLImageJ2C) virtual S8 getRawDiscardLevel() { return mDiscardLevel; } BOOL load(const std::string& filename); |