1 files changed, 20 insertions, 20 deletions

diff --git a/src/c_fl_rgb_image.cpp b/src/c_fl_rgb_image.cpp
index cfd87a6..65afbf9 100644
--- a/src/c_fl_rgb_image.cpp
+++ b/src/c_fl_rgb_image.cpp
@@ -11,18 +11,18 @@
 
 
 
-RGB_IMAGE new_fl_rgb_image(void *data, int w, int h, int d, int ld) {
-    Fl_RGB_Image *rgb = new Fl_RGB_Image(reinterpret_cast<uchar*>(data), w, h, d, ld);
+RGBIMAGE new_fl_rgb_image(void *data, int w, int h, int d, int ld) {
+    Fl_RGB_Image *rgb = new Fl_RGB_Image(static_cast<uchar*>(data), w, h, d, ld);
     return rgb;
 }
 
-RGB_IMAGE new_fl_rgb_image2(void *pix, unsigned int c) {
-    Fl_RGB_Image *rgb = new Fl_RGB_Image(reinterpret_cast<Fl_Pixmap*>(pix), c);
+RGBIMAGE new_fl_rgb_image2(void *pix, unsigned int c) {
+    Fl_RGB_Image *rgb = new Fl_RGB_Image(static_cast<Fl_Pixmap*>(pix), c);
     return rgb;
 }
 
-void free_fl_rgb_image(RGB_IMAGE i) {
-    delete reinterpret_cast<Fl_RGB_Image*>(i);
+void free_fl_rgb_image(RGBIMAGE i) {
+    delete static_cast<Fl_RGB_Image*>(i);
 }
 
 size_t fl_rgb_image_get_max_size() {
@@ -33,46 +33,46 @@ void fl_rgb_image_set_max_size(size_t v) {
     Fl_RGB_Image::max_size(v);
 }
 
-RGB_IMAGE fl_rgb_image_copy(RGB_IMAGE i, int w, int h) {
+RGBIMAGE fl_rgb_image_copy(RGBIMAGE i, int w, int h) {
     //  virtual so disable dispatch
-    return reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::copy(w, h);
+    return static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::copy(w, h);
 }
 
-RGB_IMAGE fl_rgb_image_copy2(RGB_IMAGE i) {
-    return reinterpret_cast<Fl_RGB_Image*>(i)->copy();
+RGBIMAGE fl_rgb_image_copy2(RGBIMAGE i) {
+    return static_cast<Fl_RGB_Image*>(i)->copy();
 }
 
 
 
 
-void fl_rgb_image_color_average(RGB_IMAGE i, int c, float b) {
+void fl_rgb_image_color_average(RGBIMAGE i, int c, float b) {
     //  virtual so disable dispatch
-    reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::color_average(c, b);
+    static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::color_average(c, b);
 }
 
-void fl_rgb_image_desaturate(RGB_IMAGE i) {
+void fl_rgb_image_desaturate(RGBIMAGE i) {
     //  virtual so disable dispatch
-    reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::desaturate();
+    static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::desaturate();
 }
 
 
 
 
-void fl_rgb_image_uncache(RGB_IMAGE i) {
+void fl_rgb_image_uncache(RGBIMAGE i) {
     //  virtual so disable dispatch
-    reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::uncache();
+    static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::uncache();
 }
 
 
 
 
-void fl_rgb_image_draw2(RGB_IMAGE i, int x, int y) {
-    reinterpret_cast<Fl_RGB_Image*>(i)->draw(x, y);
+void fl_rgb_image_draw2(RGBIMAGE i, int x, int y) {
+    static_cast<Fl_RGB_Image*>(i)->draw(x, y);
 }
 
-void fl_rgb_image_draw(RGB_IMAGE i, int x, int y, int w, int h, int cx, int cy) {
+void fl_rgb_image_draw(RGBIMAGE i, int x, int y, int w, int h, int cx, int cy) {
     //  virtual so disable dispatch
-    reinterpret_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::draw(x, y, w, h, cx, cy);
+    static_cast<Fl_RGB_Image*>(i)->Fl_RGB_Image::draw(x, y, w, h, cx, cy);
 }