X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=src%2Fcolor.cpp;h=9308abc696d671f793dc231f599c71630cb50a6d;hb=79e12d94cc21232477796a4e76fc2ddb5d88f9dc;hp=63448b334eff560dde1093bfe0761a76ebf1a20d;hpb=61aadd8525de89016f63572fd474547a1bb932de;p=guile-irrlicht.git diff --git a/src/color.cpp b/src/color.cpp index 63448b3..9308abc 100644 --- a/src/color.cpp +++ b/src/color.cpp @@ -23,25 +23,23 @@ #include #include "color.h" -extern "C" { - - SCM - scm_from_color (irr::video::SColor color) - { - return scm_list_4 (scm_from_uint32 (color.getAlpha ()), - scm_from_uint32 (color.getRed ()), - scm_from_uint32 (color.getGreen ()), - scm_from_uint32 (color.getBlue ())); - } - - irr::video::SColor - scm_to_color (SCM color) - { - return irr::video::SColor - (scm_to_uint32 (scm_car (color)), - scm_to_uint32 (scm_cadr (color)), - scm_to_uint32 (scm_caddr (color)), - scm_to_uint32 (scm_cadddr (color))); - } +using namespace irr; + +SCM +scm_from_color (video::SColor color) +{ + return scm_list_4 (scm_from_uint32 (color.getAlpha ()), + scm_from_uint32 (color.getRed ()), + scm_from_uint32 (color.getGreen ()), + scm_from_uint32 (color.getBlue ())); +} +video::SColor +scm_to_color (SCM color) +{ + return video::SColor + (scm_to_uint32 (scm_car (color)), + scm_to_uint32 (scm_cadr (color)), + scm_to_uint32 (scm_caddr (color)), + scm_to_uint32 (scm_cadddr (color))); }