[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55664] trunk/blender: misc minor edits.
Campbell Barton
ideasman42 at gmail.com
Fri Mar 29 07:25:22 CET 2013
Revision: 55664
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55664
Author: campbellbarton
Date: 2013-03-29 06:25:22 +0000 (Fri, 29 Mar 2013)
Log Message:
-----------
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.
Modified Paths:
--------------
trunk/blender/extern/recastnavigation/recast-capi.cpp
trunk/blender/intern/cycles/blender/blender_session.cpp
trunk/blender/intern/cycles/blender/blender_util.h
trunk/blender/intern/dualcon/intern/octree.h
trunk/blender/intern/utfconv/utf_winfunc.c
trunk/blender/intern/utfconv/utf_winfunc.h
trunk/blender/intern/utfconv/utfconv.h
trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
trunk/blender/source/blender/blenkernel/intern/image.c
trunk/blender/source/blender/blenlib/BLI_string.h
trunk/blender/source/blender/blenlib/intern/string.c
trunk/blender/source/blender/blenlib/intern/string_utf8.c
trunk/blender/source/blender/collada/AnimationImporter.h
trunk/blender/source/blender/collada/ArmatureImporter.h
trunk/blender/source/blender/compositor/intern/COM_ExecutionGroup.cpp
trunk/blender/source/blender/editors/include/ED_anim_api.h
trunk/blender/source/blender/editors/physics/dynamicpaint_ops.c
trunk/blender/source/blender/editors/render/render_internal.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_view3d/drawobject.c
trunk/blender/source/blender/imbuf/intern/IMB_indexer.h
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.h
trunk/blender/source/blender/imbuf/intern/dds/Image.h
trunk/blender/source/blender/imbuf/intern/dds/PixelFormat.h
trunk/blender/source/blender/makesrna/intern/rna_test.c
trunk/blender/source/blender/render/intern/source/pipeline.c
trunk/blender/source/blender/windowmanager/intern/wm_files.c
Modified: trunk/blender/extern/recastnavigation/recast-capi.cpp
===================================================================
--- trunk/blender/extern/recastnavigation/recast-capi.cpp 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/extern/recastnavigation/recast-capi.cpp 2013-03-29 06:25:22 UTC (rev 55664)
@@ -309,7 +309,7 @@
#define vecswap(a, b, n) if ((n) > 0) swapfunc(a, b, n, swaptype)
#define CMP(t, x, y) (cmp((t), (x), (y)))
-static inline char * med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk)
+static inline char *med3(char *a, char *b, char *c, cmp_t *cmp, void *thunk)
{
return CMP(thunk, a, b) < 0 ?
(CMP(thunk, b, c) < 0 ? b : (CMP(thunk, a, c) < 0 ? c : a ))
Modified: trunk/blender/intern/cycles/blender/blender_session.cpp
===================================================================
--- trunk/blender/intern/cycles/blender/blender_session.cpp 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/intern/cycles/blender/blender_session.cpp 2013-03-29 06:25:22 UTC (rev 55664)
@@ -576,7 +576,7 @@
timestatus += ", " + b_rlay_name;
timestatus += " | ";
- BLI_timestr(total_time, time_str);
+ BLI_timestr(total_time, time_str, sizeof(time_str));
timestatus += "Elapsed: " + string(time_str) + " | ";
if(substatus.size() > 0)
Modified: trunk/blender/intern/cycles/blender/blender_util.h
===================================================================
--- trunk/blender/intern/cycles/blender/blender_util.h 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/intern/cycles/blender/blender_util.h 2013-03-29 06:25:22 UTC (rev 55664)
@@ -30,7 +30,7 @@
* todo: clean this up ... */
extern "C" {
-void BLI_timestr(double _time, char *str);
+void BLI_timestr(double _time, char *str, size_t maxlen);
void BKE_image_user_frame_calc(void *iuser, int cfra, int fieldnr);
void BKE_image_user_file_path(void *iuser, void *ima, char *path);
unsigned char *BKE_image_get_pixels_for_frame(void *image, int frame);
Modified: trunk/blender/intern/dualcon/intern/octree.h
===================================================================
--- trunk/blender/intern/dualcon/intern/octree.h 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/intern/dualcon/intern/octree.h 2013-03-29 06:25:22 UTC (rev 55664)
@@ -374,14 +374,14 @@
/**
* Functions to patch rings in a node
*/
- Node *patch(Node * node, int st[3], int len, PathList * rings);
- Node *patchSplit(Node * node, int st[3], int len, PathList * rings, int dir, PathList * &nrings1, PathList * &nrings2);
- Node *patchSplitSingle(Node * node, int st[3], int len, PathElement * head, int dir, PathList * &nrings1, PathList * &nrings2);
- Node *connectFace(Node * node, int st[3], int len, int dir, PathElement * f1, PathElement * f2);
- Node *locateCell(InternalNode * node, int st[3], int len, int ori[3], int dir, int side, Node * &rleaf, int rst[3], int& rlen);
+ Node *patch(Node *node, int st[3], int len, PathList * rings);
+ Node *patchSplit(Node *node, int st[3], int len, PathList * rings, int dir, PathList * &nrings1, PathList * &nrings2);
+ Node *patchSplitSingle(Node *node, int st[3], int len, PathElement *head, int dir, PathList * &nrings1, PathList * &nrings2);
+ Node *connectFace(Node *node, int st[3], int len, int dir, PathElement * f1, PathElement * f2);
+ Node *locateCell(InternalNode *node, int st[3], int len, int ori[3], int dir, int side, Node * &rleaf, int rst[3], int& rlen);
void compressRing(PathElement *& ring);
void getFacePoint(PathElement *leaf, int dir, int& x, int& y, float& p, float& q);
- LeafNode *patchAdjacent(InternalNode * node, int len, int st1[3], LeafNode * leaf1, int st2[3], LeafNode * leaf2, int walkdir, int inc, int dir, int side, float alpha);
+ LeafNode *patchAdjacent(InternalNode *node, int len, int st1[3], LeafNode * leaf1, int st2[3], LeafNode * leaf2, int walkdir, int inc, int dir, int side, float alpha);
int findPair(PathElement *head, int pos, int dir, PathElement *& pre1, PathElement *& pre2);
int getSide(PathElement *e, int pos, int dir);
int isEqual(PathElement *e1, PathElement *e2);
@@ -412,8 +412,8 @@
/************************************************************************/
void floodFill();
void clearProcessBits(Node *node, int height);
- int floodFill(LeafNode * leaf, int st[3], int len, int height, int threshold);
- int floodFill(Node * node, int st[3], int len, int height, int threshold);
+ int floodFill(LeafNode *leaf, int st[3], int len, int height, int threshold);
+ int floodFill(Node *node, int st[3], int len, int height, int threshold);
/**
* Write out polygon file
@@ -421,9 +421,9 @@
void writeOut();
void countIntersection(Node *node, int height, int& nedge, int& ncell, int& nface);
- void generateMinimizer(Node * node, int st[3], int len, int height, int& offset);
+ void generateMinimizer(Node *node, int st[3], int len, int height, int& offset);
void computeMinimizer(const LeafNode * leaf, int st[3], int len,
- float rvalue[3]) const;
+ float rvalue[3]) const;
/**
* Traversal functions to generate polygon model
* op: 0 for counting, 1 for writing OBJ, 2 for writing OFF, 3 for writing PLY
Modified: trunk/blender/intern/utfconv/utf_winfunc.c
===================================================================
--- trunk/blender/intern/utfconv/utf_winfunc.c 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/intern/utfconv/utf_winfunc.c 2013-03-29 06:25:22 UTC (rev 55664)
@@ -34,7 +34,7 @@
#include <wchar.h>
-FILE * ufopen(const char * filename, const char * mode)
+FILE *ufopen(const char *filename, const char *mode)
{
FILE *f = NULL;
UTF16_ENCODE(filename);
@@ -120,7 +120,7 @@
return r ? 0 : -1;
}
-char * u_alloc_getenv(const char *varname)
+char *u_alloc_getenv(const char *varname)
{
char * r = 0;
wchar_t * str;
Modified: trunk/blender/intern/utfconv/utf_winfunc.h
===================================================================
--- trunk/blender/intern/utfconv/utf_winfunc.h 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/intern/utfconv/utf_winfunc.h 2013-03-29 06:25:22 UTC (rev 55664)
@@ -23,21 +23,26 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __UTF_WINFUNC_H__
+#define __UTF_WINFUNC_H__
+
#ifndef WIN32
# error "This file can only compile on windows"
#endif
#include <stdio.h>
-FILE * ufopen(const char * filename, const char * mode);
+FILE *ufopen(const char * filename, const char * mode);
int uopen(const char *filename, int oflag, int pmode);
int uaccess(const char *filename, int mode);
-int urename(const char *oldname, const char *newname );
+int urename(const char *oldname, const char *newname);
-char * u_alloc_getenv(const char *varname);
+char *u_alloc_getenv(const char *varname);
void u_free_getenv(char *val);
-int uput_getenv(const char *varname, char * value, size_t buffsize);
+int uput_getenv(const char *varname, char *value, size_t buffsize);
int uputenv(const char *name, const char *value);
int umkdir(const char *pathname);
+
+#endif /* __UTF_WINFUNC_H__ */
Modified: trunk/blender/intern/utfconv/utfconv.h
===================================================================
--- trunk/blender/intern/utfconv/utfconv.h 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/intern/utfconv/utfconv.h 2013-03-29 06:25:22 UTC (rev 55664)
@@ -23,6 +23,9 @@
* ***** END GPL LICENSE BLOCK *****
*/
+#ifndef __UTFCONV_H__
+#define __UTFCONV_H__
+
#include <wchar.h>
#include <stdio.h>
#include <stdlib.h>
@@ -98,3 +101,5 @@
#ifdef __cplusplus
}
#endif
+
+#endif /* __UTFCONV_H__ */
Modified: trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
===================================================================
--- trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2013-03-29 06:25:22 UTC (rev 55664)
@@ -111,7 +111,7 @@
return VF_OK;
}
-static unsigned long getipaddress(const char * ipaddr)
+static unsigned long getipaddress(const char *ipaddr)
{
struct hostent *host;
unsigned long ip;
Modified: trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/source/blender/blenkernel/BKE_DerivedMesh.h 2013-03-29 06:25:22 UTC (rev 55664)
@@ -235,19 +235,19 @@
* from the derived mesh (this gives a pointer to the actual data, not
* a copy)
*/
- void *(*getVertData)(DerivedMesh * dm, int index, int type);
- void *(*getEdgeData)(DerivedMesh * dm, int index, int type);
- void *(*getTessFaceData)(DerivedMesh * dm, int index, int type);
- void *(*getPolyData)(DerivedMesh * dm, int index, int type);
+ void *(*getVertData)(DerivedMesh *dm, int index, int type);
+ void *(*getEdgeData)(DerivedMesh *dm, int index, int type);
+ void *(*getTessFaceData)(DerivedMesh *dm, int index, int type);
+ void *(*getPolyData)(DerivedMesh *dm, int index, int type);
/** Return a pointer to the entire array of vert/edge/face custom data
* from the derived mesh (this gives a pointer to the actual data, not
* a copy)
*/
- void *(*getVertDataArray)(DerivedMesh * dm, int type);
- void *(*getEdgeDataArray)(DerivedMesh * dm, int type);
- void *(*getTessFaceDataArray)(DerivedMesh * dm, int type);
- void *(*getPolyDataArray)(DerivedMesh * dm, int type);
+ void *(*getVertDataArray)(DerivedMesh *dm, int type);
+ void *(*getEdgeDataArray)(DerivedMesh *dm, int type);
+ void *(*getTessFaceDataArray)(DerivedMesh *dm, int type);
+ void *(*getPolyDataArray)(DerivedMesh *dm, int type);
/** Retrieves the base CustomData structures for
* verts/edges/tessfaces/loops/facdes*/
Modified: trunk/blender/source/blender/blenkernel/intern/image.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/image.c 2013-03-29 06:21:28 UTC (rev 55663)
+++ trunk/blender/source/blender/blenkernel/intern/image.c 2013-03-29 06:25:22 UTC (rev 55664)
@@ -1601,7 +1601,7 @@
RenderStats *stats = re ? RE_GetStats(re) : NULL;
if (stats && (scene->r.stamp & R_STAMP_RENDERTIME)) {
- BLI_timestr(stats->lastframetime, text);
+ BLI_timestr(stats->lastframetime, text, sizeof(text));
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list