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:
authorCampbell Barton <ideasman42@gmail.com>2012-05-01 21:51:03 +0400
committerCampbell Barton <ideasman42@gmail.com>2012-05-01 21:51:03 +0400
commit933b3166fc212f8fc47e7dba9ac0e6b26d85653c (patch)
treeea5e9dcfd0ae0c38f9647efb1a9ccfafbed49717 /source/blender/imbuf
parentf2ff1da6d70609d6b741038349aafba7f141ebc7 (diff)
style cleanup: guys - set your editors to tabs!
Diffstat (limited to 'source/blender/imbuf')
-rw-r--r--source/blender/imbuf/intern/dds/ColorBlock.h6
-rw-r--r--source/blender/imbuf/intern/dds/DirectDrawSurface.h18
-rw-r--r--source/blender/imbuf/intern/indexer.c24
3 files changed, 24 insertions, 24 deletions
diff --git a/source/blender/imbuf/intern/dds/ColorBlock.h b/source/blender/imbuf/intern/dds/ColorBlock.h
index e72b6253035..2bf362f2780 100644
--- a/source/blender/imbuf/intern/dds/ColorBlock.h
+++ b/source/blender/imbuf/intern/dds/ColorBlock.h
@@ -49,12 +49,12 @@ struct ColorBlock
ColorBlock(const Image * img, uint x, uint y);
void init(const Image * img, uint x, uint y);
- void init(uint w, uint h, const uint * data, uint x, uint y);
- void init(uint w, uint h, const float * data, uint x, uint y);
+ void init(uint w, uint h, const uint * data, uint x, uint y);
+ void init(uint w, uint h, const float * data, uint x, uint y);
void swizzle(uint x, uint y, uint z, uint w); // 0=r, 1=g, 2=b, 3=a, 4=0xFF, 5=0
- bool isSingleColor(Color32 mask = Color32(0xFF, 0xFF, 0xFF, 0x00)) const;
+ bool isSingleColor(Color32 mask = Color32(0xFF, 0xFF, 0xFF, 0x00)) const;
bool hasAlpha() const;
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
index 23c8bbf2de3..ddae8826620 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
@@ -129,20 +129,20 @@ struct DDSHeader
void setPixelFormat(uint bitcount, uint rmask, uint gmask, uint bmask, uint amask);
void setDX10Format(uint format);
void setNormalFlag(bool b);
- void setSrgbFlag(bool b);
+ void setSrgbFlag(bool b);
void setHasAlphaFlag(bool b);
- void setUserVersion(int version);
+ void setUserVersion(int version);
/*void swapBytes();*/
bool hasDX10Header() const;
- uint signature() const;
- uint toolVersion() const;
- uint userVersion() const;
- bool isNormalMap() const;
- bool isSrgb() const;
- bool hasAlpha() const;
- uint d3d9Format() const;
+ uint signature() const;
+ uint toolVersion() const;
+ uint userVersion() const;
+ bool isNormalMap() const;
+ bool isSrgb() const;
+ bool hasAlpha() const;
+ uint d3d9Format() const;
};
/// DirectDraw Surface. (DDS)
diff --git a/source/blender/imbuf/intern/indexer.c b/source/blender/imbuf/intern/indexer.c
index c38599028f8..3095f5639fe 100644
--- a/source/blender/imbuf/intern/indexer.c
+++ b/source/blender/imbuf/intern/indexer.c
@@ -62,8 +62,8 @@ static int tc_types[] = { IMB_TC_RECORD_RUN,
#define INDEX_FILE_VERSION 1
/* ----------------------------------------------------------------------
- - time code index functions
- ---------------------------------------------------------------------- */
+ * - time code index functions
+ * ---------------------------------------------------------------------- */
anim_index_builder * IMB_index_builder_create(const char * name)
{
@@ -354,8 +354,8 @@ int IMB_timecode_to_array_index(IMB_Timecode_Type tc)
/* ----------------------------------------------------------------------
- - rebuild helper functions
- ---------------------------------------------------------------------- */
+ * - rebuild helper functions
+ * ---------------------------------------------------------------------- */
static void get_index_dir(struct anim * anim, char * index_dir)
{
@@ -427,8 +427,8 @@ static void get_tc_filename(struct anim * anim, IMB_Timecode_Type tc,
}
/* ----------------------------------------------------------------------
- - common rebuilder structures
- ---------------------------------------------------------------------- */
+ * - common rebuilder structures
+ * ---------------------------------------------------------------------- */
typedef struct IndexBuildContext {
int anim_type;
@@ -436,8 +436,8 @@ typedef struct IndexBuildContext {
/* ----------------------------------------------------------------------
- - ffmpeg rebuilder
- ---------------------------------------------------------------------- */
+ * - ffmpeg rebuilder
+ * ---------------------------------------------------------------------- */
#ifdef WITH_FFMPEG
@@ -952,8 +952,8 @@ static int index_rebuild_ffmpeg(FFmpegIndexBuilderContext *context,
#endif
/* ----------------------------------------------------------------------
- - internal AVI (fallback) rebuilder
- ---------------------------------------------------------------------- */
+ * - internal AVI (fallback) rebuilder
+ * ---------------------------------------------------------------------- */
typedef struct FallbackIndexBuilderContext {
int anim_type;
@@ -1116,8 +1116,8 @@ static void index_rebuild_fallback(FallbackIndexBuilderContext *context,
}
/* ----------------------------------------------------------------------
- - public API
- ---------------------------------------------------------------------- */
+ * - public API
+ * ---------------------------------------------------------------------- */
IndexBuildContext *IMB_anim_index_rebuild_context(struct anim *anim, IMB_Timecode_Type tcs_in_use,
IMB_Proxy_Size proxy_sizes_in_use, int quality)