Map.cpp (pymol-v1.8.6.0.tar.bz2) | : | Map.cpp (pymol-v2.1.0.tar.bz2) | ||
---|---|---|---|---|
skipping to change at line 948 | skipping to change at line 948 | |||
} | } | |||
} | } | |||
/* sanity check */ | /* sanity check */ | |||
for(a = 0; a < 3; a++) { | for(a = 0; a < 3; a++) { | |||
if(I->Min[a] > I->Max[a]) { | if(I->Min[a] > I->Max[a]) { | |||
tmp_f = I->Min[a]; | tmp_f = I->Min[a]; | |||
I->Max[a] = I->Min[a]; | I->Max[a] = I->Min[a]; | |||
I->Min[a] = tmp_f; | I->Min[a] = tmp_f; | |||
} | } | |||
// empirical limit to avoid crash in PYMOL-3002 | ||||
const float SANITY_LIMIT = 1e10; | ||||
if(I->Min[a] < -SANITY_LIMIT) { | ||||
PRINTFB(G, FB_Map, FB_Warnings) | ||||
" %s-Warning: clamping Min %e -> %e\n", __FUNCTION__, | ||||
I->Min[a], -SANITY_LIMIT ENDFB(G); | ||||
I->Min[a] = -SANITY_LIMIT; | ||||
} | ||||
if(I->Max[a] > SANITY_LIMIT) { | ||||
PRINTFB(G, FB_Map, FB_Warnings) | ||||
" %s-Warning: clamping Max %e -> %e\n", __FUNCTION__, | ||||
I->Max[a], SANITY_LIMIT ENDFB(G); | ||||
I->Max[a] = SANITY_LIMIT; | ||||
} | ||||
} | } | |||
if(Feedback(G, FB_Map, FB_Debugging)) { | if(Feedback(G, FB_Map, FB_Debugging)) { | |||
printf(" MapSetup: %8.3f %8.3f %8.3f %8.3f %8.3f %8.3f\n", | printf(" MapSetup: %8.3f %8.3f %8.3f %8.3f %8.3f %8.3f\n", | |||
I->Min[0], I->Min[1], I->Min[2], I->Max[0], I->Max[1], I->Max[2]); | I->Min[0], I->Min[1], I->Min[2], I->Max[0], I->Max[1], I->Max[2]); | |||
} | } | |||
/* interesting */ | /* interesting */ | |||
for(c = 0; c < 3; c++) { | for(c = 0; c < 3; c++) { | |||
I->Min[c] -= MapSafety; | I->Min[c] -= MapSafety; | |||
I->Max[c] += MapSafety; | I->Max[c] += MapSafety; | |||
End of changes. 1 change blocks. | ||||
0 lines changed or deleted | 15 lines changed or added |