From ae3aaf71338960e85d27c88d7004497409c6a6d9 Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Sat, 21 Apr 2018 00:19:09 +1000 Subject: More polishing, fixing of minor overlooked things, etc --- src/c_fl_rgb_image.cpp | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) (limited to 'src/c_fl_rgb_image.cpp') diff --git a/src/c_fl_rgb_image.cpp b/src/c_fl_rgb_image.cpp index e91eec2..3c0fec6 100644 --- a/src/c_fl_rgb_image.cpp +++ b/src/c_fl_rgb_image.cpp @@ -11,7 +11,8 @@ void free_fl_rgb_image(RGB_IMAGE i) { } RGB_IMAGE fl_rgb_image_copy(RGB_IMAGE i, int w, int h) { - return reinterpret_cast(i)->copy(w, h); + // virtual so disable dispatch + return reinterpret_cast(i)->Fl_RGB_Image::copy(w, h); } RGB_IMAGE fl_rgb_image_copy2(RGB_IMAGE i) { @@ -22,18 +23,25 @@ RGB_IMAGE fl_rgb_image_copy2(RGB_IMAGE i) { void fl_rgb_image_color_average(RGB_IMAGE i, int c, float b) { - reinterpret_cast(i)->color_average(c, b); + // virtual so disable dispatch + reinterpret_cast(i)->Fl_RGB_Image::color_average(c, b); } void fl_rgb_image_desaturate(RGB_IMAGE i) { - reinterpret_cast(i)->desaturate(); + // virtual so disable dispatch + reinterpret_cast(i)->Fl_RGB_Image::desaturate(); } +void fl_rgb_image_draw2(RGB_IMAGE i, int x, int y) { + reinterpret_cast(i)->draw(x, y); +} + void fl_rgb_image_draw(RGB_IMAGE i, int x, int y, int w, int h, int cx, int cy) { - reinterpret_cast(i)->draw(x, y, w, h, cx, cy); + // virtual so disable dispatch + reinterpret_cast(i)->Fl_RGB_Image::draw(x, y, w, h, cx, cy); } -- cgit