diff options
| -rw-r--r-- | pv/data/logicsnapshot.cpp | 4 | ||||
| -rw-r--r-- | pv/dialogs/about.cpp | 4 | ||||
| -rw-r--r-- | pv/dialogs/about.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/pv/data/logicsnapshot.cpp b/pv/data/logicsnapshot.cpp index 797a00b..f7e1b38 100644 --- a/pv/data/logicsnapshot.cpp +++ b/pv/data/logicsnapshot.cpp @@ -315,7 +315,7 @@ void LogicSnapshot::get_subsampled_edges( pow2_ceil(index, MipMapScalePower)); for (; index < final_index && - (index & ~(~0 << MipMapScalePower)) != 0; + (index & ~((uint64_t)(~0) << MipMapScalePower)) != 0; index++) { const bool sample = @@ -368,7 +368,7 @@ void LogicSnapshot::get_subsampled_edges( 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 diff --git a/pv/dialogs/about.cpp b/pv/dialogs/about.cpp index fe0f16a..c57886e 100644 --- a/pv/dialogs/about.cpp +++ b/pv/dialogs/about.cpp @@ -107,9 +107,9 @@ About::About(QWidget *parent) : s.append("</table>"); - supportedDoc.reset(new QTextDocument(this)); + supportedDoc = new QTextDocument(this); supportedDoc->setHtml(s); - ui->supportList->setDocument(supportedDoc.get()); + ui->supportList->setDocument(supportedDoc); } About::~About() diff --git a/pv/dialogs/about.h b/pv/dialogs/about.h index cc153ad..38eced1 100644 --- a/pv/dialogs/about.h +++ b/pv/dialogs/about.h @@ -44,7 +44,7 @@ public: private: Ui::About *ui; - std::auto_ptr<QTextDocument> supportedDoc; + QTextDocument *supportedDoc; }; } // namespace dialogs |