comparison src/Modules/Output/Graphics/Scale/Scale.cc @ 230:2aa72aa8a0d4

- Well, most of  the graphics stuff at least compiles now. Next step is getting it running.

M    Modules/Output/Graphics/GraphicsView.h
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovieDirect.cc
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovieDirect.h
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceCairo.cc
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceCairo.h
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.cc
M    Modules/Output/Graphics/Devices/GraphicsOutputDeviceMovie.h
M    Modules/Output/Graphics/Scale/ScaleLog.h
M    Modules/Output/Graphics/Scale/ScaleERB.h
M    Modules/Output/Graphics/Scale/ScaleLinear.h
M    Modules/Output/Graphics/Scale/ScaleLogScaled.h
M    Modules/Output/Graphics/Scale/Scale.cc
M    Modules/Output/Graphics/Scale/Scale.h
M    Support/Common.h

 #include "Modules/Output/Graphics/Scale/ScaleLinear.h"
 #include "Modules/Output/Graphics/Scale/ScaleERB.h"
 #include "Modules/Output/Graphics/Scale/ScaleLog.h"
 #include "Modules/Output/Graphics/Scale/ScaleLogScaled.h"
 
+namespace aimc {
+
 Scale *Scale::Create(ScaleType iType,
 		     unsigned int min,
 		     unsigned int max,
 		     float density) {
   switch(iType) {

   case SCALE_LOG:
     return static_cast<Scale*>(new ScaleLog(min, max, density));
   case SCALE_LOGSCALED:
     return static_cast<Scale*>(new ScaleLogScaled(min, max, density));
   default:
-    aimASSERT(0);
+    AIM_ASSERT(0);
     break;
   }
   // Unreachable code
-  aimASSERT(0);
+  AIM_ASSERT(0);
   return NULL;
 }
 
 Scale *Scale::Create(ScaleType iType) {
   return Create(iType, 0, 0, 0);

   m_fMin = fMin;
   m_fMax = fMax;
 }
 
 void Scale::FromLinearScaledExtrema(Scale *pScale) {
-  aimASSERT(pScale);
+  AIM_ASSERT(pScale);
   FromLinearScaledExtrema(pScale->m_fMin, pScale->m_fMax);
 }
+}  // namespace aimc