diff options
| author | George Marques <george@gmarqu.es> | 2017-06-16 22:09:26 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-16 22:09:26 -0300 |
| commit | b1537da605e448899e9cbfbd8695306c96e7915c (patch) | |
| tree | e914cf82da60ded581c9f324fbb762bc78dbca11 | |
| parent | b19225bfce3dab39f8ce6b1ecf610ea0ba650f99 (diff) | |
| parent | 7787700aca695d9de6355d8133c62da285199e20 (diff) | |
Merge pull request #9231 from dumitru-stama/constimg
Fixed a bug in get_pixel not being const
| -rw-r--r-- | core/image.cpp | 2 | ||||
| -rw-r--r-- | core/image.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/core/image.cpp b/core/image.cpp index 72d0d3e554..ad52447935 100644 --- a/core/image.cpp +++ b/core/image.cpp @@ -1712,7 +1712,7 @@ void Image::unlock() { write_lock = PoolVector<uint8_t>::Write(); } -Color Image::get_pixel(int p_x, int p_y) { +Color Image::get_pixel(int p_x, int p_y) const { uint8_t *ptr = write_lock.ptr(); #ifdef DEBUG_ENABLED diff --git a/core/image.h b/core/image.h index 1bb81c939f..838b37352d 100644 --- a/core/image.h +++ b/core/image.h @@ -310,7 +310,7 @@ public: DetectChannels get_detected_channels(); - Color get_pixel(int p_x, int p_y); + Color get_pixel(int p_x, int p_y) const; void put_pixel(int p_x, int p_y, const Color &p_color); void copy_internals_from(const Ref<Image> &p_image) { |