projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
license: remove FSF postal address from boiler plate license text
[pulseview.git]
/
pv
/
data
/
logicsegment.cpp
diff --git
a/pv/data/logicsegment.cpp
b/pv/data/logicsegment.cpp
index 3e18b85ef4143bb399c5dd1dcff2fb7e6375d7ed..aee09bd70b1808df035b3f4cf49099e8caa1ceb5 100644
(file)
--- a/
pv/data/logicsegment.cpp
+++ b/
pv/data/logicsegment.cpp
@@
-14,8
+14,7
@@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include <extdef.h>
*/
#include <extdef.h>
@@
-308,7
+307,7
@@
void LogicSegment::get_subsampled_edges(
pow2_ceil(index, MipMapScalePower));
for (; index < final_index &&
pow2_ceil(index, MipMapScalePower));
for (; index < final_index &&
- (index & ~(
~0
<< MipMapScalePower)) != 0;
+ (index & ~(
(uint64_t)(~0)
<< MipMapScalePower)) != 0;
index++) {
const bool sample =
(get_sample(index) & sig_mask) != 0;
index++) {
const bool sample =
(get_sample(index) & sig_mask) != 0;
@@
-358,7
+357,7
@@
void LogicSegment::get_subsampled_edges(
sig_mask))
break;
sig_mask))
break;
- if ((offset & ~(
~0
<< MipMapScalePower)) == 0) {
+ if ((offset & ~(
(uint64_t)(~0)
<< MipMapScalePower)) == 0) {
// If we are now at the beginning of a
// higher level mip-map block ascend one
// level
// If we are now at the beginning of a
// higher level mip-map block ascend one
// level