asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #9231 from dumitru-stama/constimg

Browse source 
Fixed a bug in get_pixel not being const
This commit is contained in:
George Marques 2017-06-16 22:09:26 -03:00 committed by GitHub
commit b1537da605
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/image.cpp
View file

@ -1712,7 +1712,7 @@ void Image::unlock() {
write_lock = PoolVector<uint8_t>::Write(); 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(); uint8_t *ptr = write_lock.ptr();
#ifdef DEBUG_ENABLED #ifdef DEBUG_ENABLED

2
core/image.h
View file

@ -310,7 +310,7 @@ public:
DetectChannels get_detected_channels(); 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 put_pixel(int p_x, int p_y, const Color &p_color);
void copy_internals_from(const Ref<Image> &p_image) { void copy_internals_from(const Ref<Image> &p_image) {