Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/imbuf/intern/dds/Stream.cpp')
-rw-r--r--source/blender/imbuf/intern/dds/Stream.cpp107
1 files changed, 53 insertions, 54 deletions
diff --git a/source/blender/imbuf/intern/dds/Stream.cpp b/source/blender/imbuf/intern/dds/Stream.cpp
index 993fa7734ba..271717f165c 100644
--- a/source/blender/imbuf/intern/dds/Stream.cpp
+++ b/source/blender/imbuf/intern/dds/Stream.cpp
@@ -18,86 +18,85 @@
* \ingroup imbdds
*/
-
#include <Stream.h>
-#include <stdio.h> // printf
-#include <string.h> // memcpy
+#include <stdio.h> // printf
+#include <string.h> // memcpy
static const char *msg_error_seek = "DDS: trying to seek beyond end of stream (corrupt file?)";
static const char *msg_error_read = "DDS: trying to read beyond end of stream (corrupt file?)";
unsigned int Stream::seek(unsigned int p)
{
- if (p > size) {
- set_failed(msg_error_seek);
- }
- else {
- pos = p;
- }
+ if (p > size) {
+ set_failed(msg_error_seek);
+ }
+ else {
+ pos = p;
+ }
- return pos;
+ return pos;
}
-unsigned int mem_read(Stream & mem, unsigned long long & i)
+unsigned int mem_read(Stream &mem, unsigned long long &i)
{
- if (mem.pos + 8 > mem.size) {
- mem.set_failed(msg_error_seek);
- return(0);
- }
- memcpy(&i, mem.mem + mem.pos, 8); // @@ todo: make sure little endian
- mem.pos += 8;
- return(8);
+ if (mem.pos + 8 > mem.size) {
+ mem.set_failed(msg_error_seek);
+ return (0);
+ }
+ memcpy(&i, mem.mem + mem.pos, 8); // @@ todo: make sure little endian
+ mem.pos += 8;
+ return (8);
}
-unsigned int mem_read(Stream & mem, unsigned int & i)
+unsigned int mem_read(Stream &mem, unsigned int &i)
{
- if (mem.pos + 4 > mem.size) {
- mem.set_failed(msg_error_read);
- return(0);
- }
- memcpy(&i, mem.mem + mem.pos, 4); // @@ todo: make sure little endian
- mem.pos += 4;
- return(4);
+ if (mem.pos + 4 > mem.size) {
+ mem.set_failed(msg_error_read);
+ return (0);
+ }
+ memcpy(&i, mem.mem + mem.pos, 4); // @@ todo: make sure little endian
+ mem.pos += 4;
+ return (4);
}
-unsigned int mem_read(Stream & mem, unsigned short & i)
+unsigned int mem_read(Stream &mem, unsigned short &i)
{
- if (mem.pos + 2 > mem.size) {
- mem.set_failed(msg_error_read);
- return(0);
- }
- memcpy(&i, mem.mem + mem.pos, 2); // @@ todo: make sure little endian
- mem.pos += 2;
- return(2);
+ if (mem.pos + 2 > mem.size) {
+ mem.set_failed(msg_error_read);
+ return (0);
+ }
+ memcpy(&i, mem.mem + mem.pos, 2); // @@ todo: make sure little endian
+ mem.pos += 2;
+ return (2);
}
-unsigned int mem_read(Stream & mem, unsigned char & i)
+unsigned int mem_read(Stream &mem, unsigned char &i)
{
- if (mem.pos + 1 > mem.size) {
- mem.set_failed(msg_error_read);
- return(0);
- }
- i = (mem.mem + mem.pos)[0];
- mem.pos += 1;
- return(1);
+ if (mem.pos + 1 > mem.size) {
+ mem.set_failed(msg_error_read);
+ return (0);
+ }
+ i = (mem.mem + mem.pos)[0];
+ mem.pos += 1;
+ return (1);
}
-unsigned int mem_read(Stream & mem, unsigned char *i, unsigned int cnt)
+unsigned int mem_read(Stream &mem, unsigned char *i, unsigned int cnt)
{
- if (mem.pos + cnt > mem.size) {
- mem.set_failed(msg_error_read);
- return(0);
- }
- memcpy(i, mem.mem + mem.pos, cnt);
- mem.pos += cnt;
- return(cnt);
+ if (mem.pos + cnt > mem.size) {
+ mem.set_failed(msg_error_read);
+ return (0);
+ }
+ memcpy(i, mem.mem + mem.pos, cnt);
+ mem.pos += cnt;
+ return (cnt);
}
void Stream::set_failed(const char *msg)
{
- if (!failed) {
- puts(msg);
- failed = true;
- }
+ if (!failed) {
+ puts(msg);
+ failed = true;
+ }
}