[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36594] trunk/blender/source/blender: minor cleanup: make functions static, use NULL for pointer comparisons,
Campbell Barton
ideasman42 at gmail.com
Tue May 10 15:11:37 CEST 2011
Revision: 36594
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36594
Author: campbellbarton
Date: 2011-05-10 13:11:36 +0000 (Tue, 10 May 2011)
Log Message:
-----------
minor cleanup: make functions static, use NULL for pointer comparisons,
also fixed a possible bug assigning incorrect DPX function types to
imbuf.
Modified Paths:
--------------
trunk/blender/source/blender/blenfont/intern/blf_dir.c
trunk/blender/source/blender/blenfont/intern/blf_internal.h
trunk/blender/source/blender/blenkernel/intern/object.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/space_nla/nla_select.c
trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
trunk/blender/source/blender/imbuf/intern/cineon/cineonfile.h
trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c
trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.c
trunk/blender/source/blender/python/intern/bpy_library.c
trunk/blender/source/blender/render/intern/include/shading.h
trunk/blender/source/blender/render/intern/source/rayshade.c
trunk/blender/source/blender/render/intern/source/renderdatabase.c
trunk/blender/source/blender/render/intern/source/strand.c
trunk/blender/source/blender/render/intern/source/sunsky.c
trunk/blender/source/blender/render/intern/source/volume_precache.c
trunk/blender/source/blender/render/intern/source/volumetric.c
Modified: trunk/blender/source/blender/blenfont/intern/blf_dir.c
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_dir.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/blenfont/intern/blf_dir.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -51,6 +51,7 @@
#include "BLF_api.h"
#include "blf_internal_types.h"
+#include "blf_internal.h"
static ListBase global_font_dir= { NULL, NULL };
@@ -150,6 +151,7 @@
return(s);
}
+#if 0 // UNUSED
int blf_dir_split(const char *str, char *file, int *size)
{
int i, len;
@@ -173,6 +175,7 @@
}
return(0);
}
+#endif
/* Some font have additional file with metrics information,
* in general, the extension of the file is: .afm or .pfm
Modified: trunk/blender/source/blender/blenfont/intern/blf_internal.h
===================================================================
--- trunk/blender/source/blender/blenfont/intern/blf_internal.h 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/blenfont/intern/blf_internal.h 2011-05-10 13:11:36 UTC (rev 36594)
@@ -44,7 +44,7 @@
char *blf_dir_search(const char *file);
char *blf_dir_metrics_search(const char *filename);
-int blf_dir_split(const char *str, char *file, int *size);
+// int blf_dir_split(const char *str, char *file, int *size); // UNUSED
int blf_font_init(void);
void blf_font_exit(void);
Modified: trunk/blender/source/blender/blenkernel/intern/object.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/object.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/blenkernel/intern/object.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -1913,9 +1913,10 @@
if(dm) {
MVert *mvert= dm->getVertArray(dm);
int *index = (int *)dm->getVertDataArray(dm, CD_ORIGINDEX);
- int i, count = 0, vindex, numVerts = dm->getNumVerts(dm);
+ int i, vindex, numVerts = dm->getNumVerts(dm);
/* get the average of all verts with (original index == nr) */
+ count= 0;
for(i = 0; i < numVerts; i++) {
vindex= (index)? index[i]: i;
Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -110,7 +110,7 @@
}
/* XXX added this to prevent anim state to change during renders */
-int ED_operator_screenactive_norender(bContext *C)
+static int ED_operator_screenactive_norender(bContext *C)
{
if(G.rendering) return 0;
if(CTX_wm_window(C)==NULL) return 0;
Modified: trunk/blender/source/blender/editors/space_nla/nla_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_nla/nla_select.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/editors/space_nla/nla_select.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -612,7 +612,7 @@
bAnimContext ac;
Scene *scene;
ARegion *ar;
- View2D *v2d;
+ // View2D *v2d; /*UNUSED*/
short selectmode;
int mval[2];
@@ -623,7 +623,7 @@
/* get useful pointers from animation context data */
scene= ac.scene;
ar= ac.ar;
- v2d= &ar->v2d;
+ // v2d= &ar->v2d;
/* get mouse coordinates (in region coordinates) */
mval[0]= (event->x - ar->winrct.xmin);
Modified: trunk/blender/source/blender/editors/uvedit/uvedit_ops.c
===================================================================
--- trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/editors/uvedit/uvedit_ops.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -419,7 +419,7 @@
return sel;
}
-int ED_uvedit_median(Scene *scene, Image *ima, Object *obedit, float co[3])
+static int ED_uvedit_median(Scene *scene, Image *ima, Object *obedit, float co[3])
{
EditMesh *em= BKE_mesh_get_editmesh((Mesh*)obedit->data);
EditFace *efa;
Modified: trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/imbuf/intern/cineon/cineon_dpx.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -44,6 +44,7 @@
#include "IMB_imbuf_types.h"
#include "IMB_imbuf.h"
+#include "IMB_filetype.h"
#include "BKE_global.h"
@@ -192,7 +193,7 @@
return 1;
}
-short imb_savecineon(struct ImBuf *buf, const char *myfile, int flags)
+int imb_savecineon(struct ImBuf *buf, const char *myfile, int flags)
{
return imb_save_dpx_cineon(buf, myfile, 1, flags);
}
@@ -203,14 +204,14 @@
return cineonIsMemFileCineon(buf);
}
-ImBuf *imb_loadcineon(unsigned char *mem, int size, int flags)
+ImBuf *imb_loadcineon(unsigned char *mem, size_t size, int flags)
{
if(imb_is_cineon(mem))
return imb_load_dpx_cineon(mem, 1, size, flags);
return NULL;
}
-short imb_save_dpx(struct ImBuf *buf, const char *myfile, int flags)
+int imb_save_dpx(struct ImBuf *buf, const char *myfile, int flags)
{
return imb_save_dpx_cineon(buf, myfile, 0, flags);
}
@@ -220,7 +221,7 @@
return dpxIsMemFileCineon(buf);
}
-ImBuf *imb_loaddpx(unsigned char *mem, int size, int flags)
+ImBuf *imb_loaddpx(unsigned char *mem, size_t size, int flags)
{
if(imb_is_dpx(mem))
return imb_load_dpx_cineon(mem, 0, size, flags);
Modified: trunk/blender/source/blender/imbuf/intern/cineon/cineonfile.h
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/cineonfile.h 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/imbuf/intern/cineon/cineonfile.h 2011-05-10 13:11:36 UTC (rev 36594)
@@ -126,19 +126,6 @@
ASCII reserved[740];
} CineonMPISpecificInformation;
-#if 0
-/* create CineonFile from data in header */
-/* return 0 for OK */
-int readCineonGenericHeader(CineonFile* cineon, CineonGenericHeader* header);
-
-/* create header from data in CineonFile */
-int initCineonGenericHeader(
- CineonFile* cineon, CineonGenericHeader* header, const char* imagename);
-
-/* Note: dump routine assumes network byte order */
-void dumpCineonGenericHeader(CineonGenericHeader* header);
-#endif
-
#ifdef __cplusplus
}
#endif
Modified: trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/imbuf/intern/cineon/cineonlib.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -276,7 +276,7 @@
d_printf("Input device gamma %f\n", ntohf(originInfo->input_device_gamma));
}
-int
+static int
initCineonGenericHeader(CineonFile* cineon, CineonGenericHeader* header, const char* imagename) {
fillCineonFileInfo(cineon, &header->fileInfo, imagename);
@@ -287,7 +287,7 @@
return 0;
}
-void
+static void
dumpCineonGenericHeader(CineonGenericHeader* header) {
dumpCineonFileInfo(&header->fileInfo);
dumpCineonImageInfo(&header->imageInfo);
Modified: trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/imbuf/intern/cineon/logmemfile.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -27,6 +27,8 @@
#include "logImageCore.h"
+#include "logmemfile.h" /* own include */
+
int logimage_fseek(void* logfile, intptr_t offsett, int origin)
{
struct _Log_Image_File_t_ *file = (struct _Log_Image_File_t_*) logfile;
Modified: trunk/blender/source/blender/python/intern/bpy_library.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_library.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/python/intern/bpy_library.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -76,7 +76,7 @@
}
-PyTypeObject bpy_lib_Type= {
+static PyTypeObject bpy_lib_Type= {
PyVarObject_HEAD_INIT(NULL, 0)
"bpy_lib", /* tp_name */
sizeof(BPy_Library), /* tp_basicsize */
Modified: trunk/blender/source/blender/render/intern/include/shading.h
===================================================================
--- trunk/blender/source/blender/render/intern/include/shading.h 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/render/intern/include/shading.h 2011-05-10 13:11:36 UTC (rev 36594)
@@ -37,7 +37,7 @@
struct VlakRen;
struct StrandSegment;
struct StrandPoint;
-struct ObjectInstanceRen obi;
+struct ObjectInstanceRen;
struct Isect;
/* shadeinput.c */
Modified: trunk/blender/source/blender/render/intern/source/rayshade.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/rayshade.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/render/intern/source/rayshade.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -96,7 +96,7 @@
}
}
-RayObject* RE_rayobject_create(Render *re, int type, int size)
+static RayObject* RE_rayobject_create(Render *re, int type, int size)
{
RayObject * res = NULL;
@@ -1679,7 +1679,7 @@
/* not used, test function for ambient occlusion (yaf: pathlight) */
/* main problem; has to be called within shading loop, giving unwanted recursion */
-int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr)
+static int ray_trace_shadow_rad(ShadeInput *ship, ShadeResult *shr)
{
static int counter=0, only_one= 0;
extern float hashvectf[];
Modified: trunk/blender/source/blender/render/intern/source/renderdatabase.c
===================================================================
--- trunk/blender/source/blender/render/intern/source/renderdatabase.c 2011-05-10 11:19:26 UTC (rev 36593)
+++ trunk/blender/source/blender/render/intern/source/renderdatabase.c 2011-05-10 13:11:36 UTC (rev 36594)
@@ -782,7 +782,7 @@
MEM_freeN(vlaknodes);
}
-void free_renderdata_strandnodes(StrandTableNode *strandnodes)
+static void free_renderdata_strandnodes(StrandTableNode *strandnodes)
{
int a;
Modified: trunk/blender/source/blender/render/intern/source/strand.c
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list