diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-01-19 10:12:25 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-01-19 10:12:25 +0400 |
commit | 162c3314170167f097e9befb028e71c4fde463fc (patch) | |
tree | 4bb3d02ce0c8aeb67069894f4d301c19a7754a36 /source/blender/imbuf/intern/dds/Stream.cpp | |
parent | 905186856426dce4a61673870a8dd9f7597c09bd (diff) |
style cleanup
Diffstat (limited to 'source/blender/imbuf/intern/dds/Stream.cpp')
-rw-r--r-- | source/blender/imbuf/intern/dds/Stream.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/imbuf/intern/dds/Stream.cpp b/source/blender/imbuf/intern/dds/Stream.cpp index 00e1b679c69..57a251261a1 100644 --- a/source/blender/imbuf/intern/dds/Stream.cpp +++ b/source/blender/imbuf/intern/dds/Stream.cpp @@ -47,7 +47,7 @@ unsigned int mem_read(Stream & mem, unsigned long long & i) if (mem.pos + 8 > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } memcpy(&i, mem.mem + mem.pos, 8); // @@ todo: make sure little endian mem.pos += 8; return(8); @@ -58,7 +58,7 @@ unsigned int mem_read(Stream & mem, unsigned int & i) if (mem.pos + 4 > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } memcpy(&i, mem.mem + mem.pos, 4); // @@ todo: make sure little endian mem.pos += 4; return(4); @@ -69,7 +69,7 @@ unsigned int mem_read(Stream & mem, unsigned short & i) if (mem.pos + 2 > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } memcpy(&i, mem.mem + mem.pos, 2); // @@ todo: make sure little endian mem.pos += 2; return(2); @@ -80,7 +80,7 @@ unsigned int mem_read(Stream & mem, unsigned char & i) if (mem.pos + 1 > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } i = (mem.mem + mem.pos)[0]; mem.pos += 1; return(1); @@ -91,7 +91,7 @@ unsigned int mem_read(Stream & mem, unsigned char *i, unsigned int cnt) if (mem.pos + cnt > mem.size) { printf("DDS: trying to read beyond end of stream (corrupt file?)"); return(0); - }; + } memcpy(i, mem.mem + mem.pos, cnt); mem.pos += cnt; return(cnt); |