Ticket #46218: pymol-clang.diff

layer0/ShaderMgr.cpp

@@ -665 +665 @@
 }
 
 int CShaderPrg_Reload(PyMOLGlobals * G, char *name, char *v, char *f){
-  int status, howLong, needAttach = 0;
+  int status, howLong;
   CShaderPrg * I = CShaderMgr_GetShaderPrg_NoSet(G->ShaderMgr, name);
   if (!I){
     CShaderMgr *SM = G->ShaderMgr;

layer0/Sphere.cpp

@@ -32 +32 @@
 #define tau 0.8506508084F       /* t=(1+sqrt(5))/2, tau=t/sqrt(1+t^2)  */
 #define one 0.5257311121F       /* one=1/sqrt(1+t^2) , unit sphere     */
 
+#define FAST_SPHERE_INIT
+
+#ifndef FAST_SPHERE_INIT
 static const float start_points[13][3] = {
   {tau, one, 0},
   {-tau, one, 0},
@@ -69 +72 @@
   {7, 2, 9},
   {6, 10, 2}
 };
+#endif
 
 static const int mesh[30][2] = {
   {0, 3},
@@ -103 +107 @@
   {9, 10}
 };
 
-#define FAST_SPHERE_INIT
-
 #ifdef FAST_SPHERE_INIT
 #include"SphereData.h"
 

layer2/RepNonbonded.cpp

@@ -199 +199 @@
   int ok = true;
   // 0.018f is found by trial and error
   // TODO: this is not sufficient to solve the problem of disappearing cylinders
-  float scale_bound = SettingGetGlobal_f(G, cSetting_field_of_view)  * cPI / 180.0f * 0.018f;
+  // float scale_bound = SettingGetGlobal_f(G, cSetting_field_of_view)  * cPI / 180.0f * 0.018f;
 
   alpha =
     SettingGet_f(G, I->R.cs->Setting, I->R.obj->Setting, cSetting_nonbonded_transparency);
@@ -208 +208 @@
     alpha = 1.0F;
   if(ray) {
     float radius;
-    float pixel_radius = ray->PixelRadius;
     ray->transparentf(1.0F - alpha);
 
     if(I->Radius == 0.0F) {
@@ -360 +359 @@
           CShaderPrg *shaderPrg;
           if (nonbonded_as_cylinders){
             // vertex scale is bound so that cylinders cannot disappear when it gets too low
-            float vertex_scale = info->vertex_scale;
             float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
             if(pixel_scale_value < 0)
               pixel_scale_value = 1.0F;
@@ -596 +594 @@
           CShaderPrg *shaderPrg;
           if (nonbonded_as_cylinders){
             // vertex scale is bound so that cylinders cannot disappear when it gets too low
-            float vertex_scale = info->vertex_scale;
             float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
             if(pixel_scale_value < 0)
               pixel_scale_value = 1.0F;

layer2/RepWireBond.cpp

@@ -779 +779 @@
           CShaderPrg *shaderPrg;
           if (line_as_cylinders){
             // vertex scale is bound so that cylinders cannot disappear when it gets too low
-            float vertex_scale = info->vertex_scale;
             float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
             if(pixel_scale_value < 0)
               pixel_scale_value = 1.0F;
@@ -973 +972 @@
           CShaderPrg *shaderPrg;
           if (line_as_cylinders){
             // vertex scale is bound so that cylinders cannot disappear when it gets too low
-            float vertex_scale = info->vertex_scale;
             float pixel_scale_value = SettingGetGlobal_f(G, cSetting_ray_pixel_scale);
             if(pixel_scale_value < 0)
               pixel_scale_value = 1.0F;

layer3/Executive.cpp

@@ -13978 +13978 @@
 
 #ifndef _PYMOL_NO_GLUT
   if(G->HaveGUI && G->ValidContext) {
-    CExecutive *I = G->Executive;
     if (flag) {
 #ifndef GLUT_FULL_SCREEN
       if(wm_flag < 1) {