[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37271] branches/soc-2011-avocado/blender: Fix compile on Windows:

[Andrea Weikert]

Revision: 37271
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37271
Author:   elubie
Date:     2011-06-06 20:04:20 +0000 (Mon, 06 Jun 2011)
Log Message:
-----------
Fix compile on Windows:
DummyClass.c: fixed missing include
BLI_smallhash.h: fixed warning about signed/unsigned - ABS was called on 
unsigned, has no effect (needs to be fixed in bmesh branch as well)
autoseam_tools.c: Variable declaration not at beginning of a block.

Modified Paths:
--------------
    branches/soc-2011-avocado/blender/intern/autoseam/DummyClass.cpp
    branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_smallhash.h
    
branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c

Modified: branches/soc-2011-avocado/blender/intern/autoseam/DummyClass.cpp
===================================================================
--- branches/soc-2011-avocado/blender/intern/autoseam/DummyClass.cpp    
2011-06-06 19:50:35 UTC (rev 37270)
+++ branches/soc-2011-avocado/blender/intern/autoseam/DummyClass.cpp    
2011-06-06 20:04:20 UTC (rev 37271)
@@ -2,6 +2,7 @@
 #include <Eigen/Dense>
 #include <Eigen/Eigenvalues> 
 
+#include <iostream>
 
 #include "DummyClass.h"
 

Modified: 
branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_smallhash.h
===================================================================
--- branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_smallhash.h    
2011-06-06 19:50:35 UTC (rev 37270)
+++ branches/soc-2011-avocado/blender/source/blender/blenlib/BLI_smallhash.h    
2011-06-06 20:04:20 UTC (rev 37271)
@@ -100,7 +100,7 @@
 {
        int h, hoff=1;
 
-       key = ABS(key);
+       /* key = ABS(key); */
 
        if (hash->size < hash->used*3) {
                int newsize = hashsizes[++hash->curhash];
@@ -156,7 +156,7 @@
 {
        int h, hoff=1;
 
-       key = ABS(key);
+       /* key = ABS(key); */
        h = key;
        
        while (hash->table[h % hash->size].key != key 
@@ -176,7 +176,7 @@
 {
        int h, hoff=1;
 
-       key = ABS(key);
+       /* key = ABS(key); */
        h = key;
        
        if (!hash->table)
@@ -196,9 +196,11 @@
 
 BM_INLINE int BLI_smallhash_haskey(SmallHash *hash, uintptr_t key)
 {
-       int h = ABS(key), hoff=1;
-       key = ABS(key);
-       
+       int hoff=1;
+       int h;
+       /* key = ABS(key); */
+       h = key;
+
        if (!hash->table)
                return 0;
        

Modified: 
branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c
===================================================================
--- 
branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c  
    2011-06-06 19:50:35 UTC (rev 37270)
+++ 
branches/soc-2011-avocado/blender/source/blender/editors/mesh/autoseam_tools.c  
    2011-06-06 20:04:20 UTC (rev 37271)
@@ -139,7 +139,8 @@
 void calculate_eigen(float **dual_graph, int dimension)
 {
     int i,j,k;
-    
+    AUTOSEAM_DummyClassHandle handle = autoseam_create_dummyclass();
+
     float **array = (float **) malloc(dimension* sizeof(float *));
     
     for(k = 0; k < dimension; k++ ){
@@ -154,7 +155,7 @@
         }
         printf("\n");
     }
-    AUTOSEAM_DummyClassHandle handle = autoseam_create_dummyclass();
+    
     autoseam_calculate_eigen(handle, array, dimension);
 }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs