[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51053] trunk/blender: Code cleanup: fix some clang checker warnings.
Brecht Van Lommel
brechtvanlommel at pandora.be
Thu Oct 4 22:11:57 CEST 2012
Revision: 51053
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51053
Author: blendix
Date: 2012-10-04 20:11:54 +0000 (Thu, 04 Oct 2012)
Log Message:
-----------
Code cleanup: fix some clang checker warnings.
Modified Paths:
--------------
trunk/blender/intern/opennl/intern/opennl.c
trunk/blender/intern/opennl/superlu/get_perm_c.c
trunk/blender/source/blender/editors/space_image/image_edit.c
Modified: trunk/blender/intern/opennl/intern/opennl.c
===================================================================
--- trunk/blender/intern/opennl/intern/opennl.c 2012-10-04 20:01:25 UTC (rev 51052)
+++ trunk/blender/intern/opennl/intern/opennl.c 2012-10-04 20:11:54 UTC (rev 51053)
@@ -137,14 +137,14 @@
/************************************************************************************/
/* memory management */
-#define __NL_NEW(T) (T*)(calloc(1, sizeof(T)))
-#define __NL_NEW_ARRAY(T,NB) (T*)(calloc((NB),sizeof(T)))
+#define __NL_NEW(T) (T*)(calloc(1, sizeof(T)))
+#define __NL_NEW_ARRAY(T,NB) (T*)(calloc(MAX(NB, 1),sizeof(T)))
#define __NL_RENEW_ARRAY(T,x,NB) (T*)(realloc(x,(NB)*sizeof(T)))
-#define __NL_DELETE(x) free(x); x = NULL
-#define __NL_DELETE_ARRAY(x) free(x); x = NULL
+#define __NL_DELETE(x) if(x) free(x); x = NULL
+#define __NL_DELETE_ARRAY(x) if(x) free(x); x = NULL
-#define __NL_CLEAR(T, x) memset(x, 0, sizeof(T))
-#define __NL_CLEAR_ARRAY(T,x,NB) memset(x, 0, (NB)*sizeof(T))
+#define __NL_CLEAR(T, x) memset(x, 0, sizeof(T))
+#define __NL_CLEAR_ARRAY(T,x,NB) if(NB) memset(x, 0, (NB)*sizeof(T))
/************************************************************************************/
/* Dynamic arrays for sparse row/columns */
@@ -1042,6 +1042,9 @@
NLuint n = context->n;
NLuint nnz = __nlSparseMatrixNNZ(M); /* number of non-zero coeffs */
+ /*if(n > 10)
+ n = 10;*/
+
/* Compressed Row Storage matrix representation */
NLint *xa = __NL_NEW_ARRAY(NLint, n+1);
NLfloat *rhs = __NL_NEW_ARRAY(NLfloat, n);
Modified: trunk/blender/intern/opennl/superlu/get_perm_c.c
===================================================================
--- trunk/blender/intern/opennl/superlu/get_perm_c.c 2012-10-04 20:01:25 UTC (rev 51052)
+++ trunk/blender/intern/opennl/superlu/get_perm_c.c 2012-10-04 20:11:54 UTC (rev 51053)
@@ -173,17 +173,19 @@
/* Flag the diagonal so it's not included in the B matrix */
marker[j] = j;
- for (i = colptr[j]; i < colptr[j+1]; ++i) {
- /* A_kj is nonzero, add pattern of column T_*k to B_*j */
- k = rowind[i];
- for (ti = t_colptr[k]; ti < t_colptr[k+1]; ++ti) {
- trow = t_rowind[ti];
- if ( marker[trow] != j ) {
- marker[trow] = j;
- b_rowind[num_nz++] = trow;
+ if ( *atanz ) {
+ for (i = colptr[j]; i < colptr[j+1]; ++i) {
+ /* A_kj is nonzero, add pattern of column T_*k to B_*j */
+ k = rowind[i];
+ for (ti = t_colptr[k]; ti < t_colptr[k+1]; ++ti) {
+ trow = t_rowind[ti];
+ if ( marker[trow] != j ) {
+ marker[trow] = j;
+ b_rowind[num_nz++] = trow;
+ }
+ }
+ }
}
- }
- }
}
b_colptr[n] = num_nz;
@@ -305,21 +307,23 @@
marker[j] = j;
/* Add pattern of column A_*k to B_*j */
- for (i = colptr[j]; i < colptr[j+1]; ++i) {
- k = rowind[i];
- if ( marker[k] != j ) {
- marker[k] = j;
- (*b_rowind)[num_nz++] = k;
- }
- }
+ if (*bnz) {
+ for (i = colptr[j]; i < colptr[j+1]; ++i) {
+ k = rowind[i];
+ if ( marker[k] != j ) {
+ marker[k] = j;
+ (*b_rowind)[num_nz++] = k;
+ }
+ }
- /* Add pattern of column T_*k to B_*j */
- for (i = t_colptr[j]; i < t_colptr[j+1]; ++i) {
- k = t_rowind[i];
- if ( marker[k] != j ) {
- marker[k] = j;
- (*b_rowind)[num_nz++] = k;
- }
+ /* Add pattern of column T_*k to B_*j */
+ for (i = t_colptr[j]; i < t_colptr[j+1]; ++i) {
+ k = t_rowind[i];
+ if ( marker[k] != j ) {
+ marker[k] = j;
+ (*b_rowind)[num_nz++] = k;
+ }
+ }
}
}
(*b_colptr)[n] = num_nz;
Modified: trunk/blender/source/blender/editors/space_image/image_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_edit.c 2012-10-04 20:01:25 UTC (rev 51052)
+++ trunk/blender/source/blender/editors/space_image/image_edit.c 2012-10-04 20:11:54 UTC (rev 51053)
@@ -120,6 +120,8 @@
if (ibuf && (ibuf->rect || ibuf->rect_float))
return ibuf;
}
+ else
+ *lock_r = NULL;
return NULL;
}
More information about the Bf-blender-cvs
mailing list