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/Image.cpp')
-rw-r--r--source/blender/imbuf/intern/dds/Image.cpp78
1 files changed, 38 insertions, 40 deletions
diff --git a/source/blender/imbuf/intern/dds/Image.cpp b/source/blender/imbuf/intern/dds/Image.cpp
index 642194fa39b..6f0fff75818 100644
--- a/source/blender/imbuf/intern/dds/Image.cpp
+++ b/source/blender/imbuf/intern/dds/Image.cpp
@@ -18,7 +18,6 @@
* \ingroup imbdds
*/
-
/*
* This file is based on a similar file from the NVIDIA texture tools
* (http://nvidia-texture-tools.googlecode.com/)
@@ -31,7 +30,7 @@
#include <Color.h>
#include <Image.h>
-#include <stdio.h> // printf
+#include <stdio.h> // printf
Image::Image() : m_width(0), m_height(0), m_format(Format_RGB), m_data(NULL)
{
@@ -39,87 +38,86 @@ Image::Image() : m_width(0), m_height(0), m_format(Format_RGB), m_data(NULL)
Image::~Image()
{
- free();
+ free();
}
void Image::allocate(uint w, uint h)
{
- free();
- m_width = w;
- m_height = h;
- m_data = new Color32[w * h];
+ free();
+ m_width = w;
+ m_height = h;
+ m_data = new Color32[w * h];
}
void Image::free()
{
- if (m_data) delete [] m_data;
- m_data = NULL;
+ if (m_data)
+ delete[] m_data;
+ m_data = NULL;
}
-
uint Image::width() const
{
- return m_width;
+ return m_width;
}
uint Image::height() const
{
- return m_height;
+ return m_height;
}
-const Color32 * Image::scanline(uint h) const
+const Color32 *Image::scanline(uint h) const
{
- if (h >= m_height) {
- printf("DDS: scanline beyond dimensions of image\n");
- return m_data;
- }
- return m_data + h * m_width;
+ if (h >= m_height) {
+ printf("DDS: scanline beyond dimensions of image\n");
+ return m_data;
+ }
+ return m_data + h * m_width;
}
Color32 *Image::scanline(uint h)
{
- if (h >= m_height) {
- printf("DDS: scanline beyond dimensions of image\n");
- return m_data;
- }
- return m_data + h * m_width;
+ if (h >= m_height) {
+ printf("DDS: scanline beyond dimensions of image\n");
+ return m_data;
+ }
+ return m_data + h * m_width;
}
const Color32 *Image::pixels() const
{
- return m_data;
+ return m_data;
}
Color32 *Image::pixels()
{
- return m_data;
+ return m_data;
}
-const Color32 & Image::pixel(uint idx) const
+const Color32 &Image::pixel(uint idx) const
{
- if (idx >= m_width * m_height) {
- printf("DDS: pixel beyond dimensions of image\n");
- return m_data[0];
- }
- return m_data[idx];
+ if (idx >= m_width * m_height) {
+ printf("DDS: pixel beyond dimensions of image\n");
+ return m_data[0];
+ }
+ return m_data[idx];
}
-Color32 & Image::pixel(uint idx)
+Color32 &Image::pixel(uint idx)
{
- if (idx >= m_width * m_height) {
- printf("DDS: pixel beyond dimensions of image\n");
- return m_data[0];
- }
- return m_data[idx];
+ if (idx >= m_width * m_height) {
+ printf("DDS: pixel beyond dimensions of image\n");
+ return m_data[0];
+ }
+ return m_data[idx];
}
-
Image::Format Image::format() const
{
- return m_format;
+ return m_format;
}
void Image::setFormat(Image::Format f)
{
- m_format = f;
+ m_format = f;
}