fix armel build issues

diff --git a/platform/hgw.cpp b/platform/hgw.cpp
index 4617525..bccc6ed 100644 (file)
--- a/platform/hgw.cpp
+++ b/platform/hgw.cpp
@@ -88,7 +88,7 @@ void HgwConfig()
        }
 
        char scaler[NAME_MAX];
-       if (hgw_conf_request_bool(hgw, kGConfScaler, scaler) == HGW_ERR_NONE
+       if (hgw_conf_request_string(hgw, kGConfScaler, scaler) == HGW_ERR_NONE
                && strlen(scaler) > 0) {
                free(Config.scaler);
                Config.scaler = strdup(scaler);

diff --git a/platform/sdlvscalers.cpp b/platform/sdlvscalers.cpp
index bb26e9b..7139f5a 100644 (file)
--- a/platform/sdlvscalers.cpp
+++ b/platform/sdlvscalers.cpp
@@ -228,6 +228,7 @@ class ARMScaler : public Scaler
        uint8 * m_surface;
        const int m_w, m_h, m_Bpp;
 
+protected:
        ARMScaler(SDL_Surface* screen, int w, int h)
        : m_screen(screen), m_w(w), m_h(h),
         m_Bpp(m_screen->format->BitsPerPixel / 8)
@@ -848,7 +849,7 @@ const HDSW::Factory HDSW::factory;
 class HDARM : public ARMScaler
 {
        HDARM(SDL_Surface* screen, int w, int h)
-       : SWScaler(screen, w, h)
+       : ARMScaler(screen, w, h)
        {
                hildon_set_non_compositing(true);
        }
@@ -884,7 +885,7 @@ public:
                return "compositor disabled and software ARM 2x scaling";
        }
 };
-const HDSW::Factory HDSW::factory;
+const HDARM::Factory HDARM::factory;
 #endif /* __arm__ */
 #endif /* CONF_HD */