diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/notificator.cpp | 2 | ||||
| -rw-r--r-- | src/rpcmining.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/notificator.cpp b/src/qt/notificator.cpp index 8028190b8..628dca159 100644 --- a/src/qt/notificator.cpp +++ b/src/qt/notificator.cpp @@ -113,7 +113,7 @@ FreedesktopImage::FreedesktopImage(const QImage &img): { // Convert 00xAARRGGBB to RGBA bytewise (endian-independent) format QImage tmp = img.convertToFormat(QImage::Format_ARGB32); - const uint32_t *data = reinterpret_cast<const uint32_t*>(tmp.constBits()); + const uint32_t *data = reinterpret_cast<const uint32_t*>(tmp.bits()); unsigned int num_pixels = width * height; image.resize(num_pixels * BYTES_PER_PIXEL); diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index b9ebcb400..fddda8b5f 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -307,7 +307,7 @@ Value getblocktemplate(const Array& params, bool fHelp) } entry.push_back(Pair("depends", deps)); - int index_in_template = &tx - pblock->vtx.data(); + int index_in_template = i - 1; entry.push_back(Pair("fee", pblocktemplate->vTxFees[index_in_template])); entry.push_back(Pair("sigops", pblocktemplate->vTxSigOps[index_in_template])); |