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>2013-03-29 10:25:22 +0400
committerCampbell Barton <ideasman42@gmail.com>2013-03-29 10:25:22 +0400
commit1777a69818610d4ed8a93f661a45219d97e7f6c5 (patch)
treebbfb0b35629e94ffd727f4a8b98fbf6cbebdaa36 /source/blender/imbuf/intern
parentab41583bc2be591c0af921b243158e43a94505d7 (diff)
misc minor edits.
- pass string size to BLI_timestr() to avoid possible buffer overrun. - quiet warning for mingw. - include guards for windows utf conversion funcs. - fix for mistage in edge-angle-selection check. - some style cleanup.
Diffstat (limited to 'source/blender/imbuf/intern')
-rw-r--r--source/blender/imbuf/intern/IMB_indexer.h4
-rw-r--r--source/blender/imbuf/intern/dds/DirectDrawSurface.h4
-rw-r--r--source/blender/imbuf/intern/dds/Image.h4
-rw-r--r--source/blender/imbuf/intern/dds/PixelFormat.h2
4 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/imbuf/intern/IMB_indexer.h b/source/blender/imbuf/intern/IMB_indexer.h
index 64ec658f0db..96f7a68d669 100644
--- a/source/blender/imbuf/intern/IMB_indexer.h
+++ b/source/blender/imbuf/intern/IMB_indexer.h
@@ -81,7 +81,7 @@ typedef struct anim_index_builder {
struct anim_index_entry *entry);
} anim_index_builder;
-anim_index_builder * IMB_index_builder_create(const char *name);
+anim_index_builder *IMB_index_builder_create(const char *name);
void IMB_index_builder_add_entry(
anim_index_builder * fp,
int frameno, unsigned long long seek_pos,
@@ -118,7 +118,7 @@ void IMB_free_indices(struct anim *anim);
struct anim *IMB_anim_open_proxy(
struct anim *anim, IMB_Proxy_Size preview_size);
-struct anim_index * IMB_anim_open_index(
+struct anim_index *IMB_anim_open_index(
struct anim *anim, IMB_Timecode_Type tc);
int IMB_proxy_size_to_array_index(IMB_Proxy_Size pr_size);
diff --git a/source/blender/imbuf/intern/dds/DirectDrawSurface.h b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
index 11e6d4a5708..3d308ba1ff1 100644
--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.h
+++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.h
@@ -171,9 +171,9 @@ public:
void setHasAlphaFlag(bool b);
void setUserVersion(int version);
- void mipmap(Image * img, uint f, uint m);
+ void mipmap(Image *img, uint f, uint m);
void *readData(uint &size);
- // void mipmap(FloatImage * img, uint f, uint m);
+ // void mipmap(FloatImage *img, uint f, uint m);
void printInfo() const;
diff --git a/source/blender/imbuf/intern/dds/Image.h b/source/blender/imbuf/intern/dds/Image.h
index 81074fba6b7..658f01deaec 100644
--- a/source/blender/imbuf/intern/dds/Image.h
+++ b/source/blender/imbuf/intern/dds/Image.h
@@ -56,9 +56,9 @@ public:
void allocate(uint w, uint h);
#if 0
- bool load(const char * name);
+ bool load(const char *name);
- void wrap(void * data, uint w, uint h);
+ void wrap(void *data, uint w, uint h);
void unwrap();
#endif
diff --git a/source/blender/imbuf/intern/dds/PixelFormat.h b/source/blender/imbuf/intern/dds/PixelFormat.h
index 2bb1864e49d..e841e696833 100644
--- a/source/blender/imbuf/intern/dds/PixelFormat.h
+++ b/source/blender/imbuf/intern/dds/PixelFormat.h
@@ -80,7 +80,7 @@
}
// Get pixel component shift and size given its mask.
- inline void maskShiftAndSize(uint mask, uint * shift, uint * size)
+ inline void maskShiftAndSize(uint mask, uint *shift, uint *size)
{
if (!mask) {
*shift = 0;