Modify codes for Dali Windows backend

Change-Id: Iee3bb315945ce15d5b94480e18175e4de7240d38

diff --git a/dali/devel-api/text-abstraction/glyph-info.h b/dali/devel-api/text-abstraction/glyph-info.h
old mode 100644 (file)
new mode 100755 (executable)
index 6bf9208..772c78f
--- a/dali/devel-api/text-abstraction/glyph-info.h
+++ b/dali/devel-api/text-abstraction/glyph-info.h
@@ -18,7 +18,7 @@
  *
  */
 
-// EXTERNAL INCLUDES
+// INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
 #include <dali/devel-api/text-abstraction/text-abstraction-definitions.h>
 

diff --git a/dali/integration-api/native-render-surface-factory.h b/dali/integration-api/native-render-surface-factory.h
old mode 100644 (file)
new mode 100755 (executable)
index 6a752a1..582e08f
--- a/dali/integration-api/native-render-surface-factory.h
+++ b/dali/integration-api/native-render-surface-factory.h
@@ -24,8 +24,6 @@
 // INTERNAL INCLUDES
 #include <dali/public-api/dali-adaptor-common.h>
 
-// INTERNAL INCLUDES
-
 namespace Dali
 {
 

diff --git a/dali/internal/adaptor/common/combined-update-render-controller-debug.h b/dali/internal/adaptor/common/combined-update-render-controller-debug.h
old mode 100644 (file)
new mode 100755 (executable)
index 41b9162..ca52e25
--- a/dali/internal/adaptor/common/combined-update-render-controller-debug.h
+++ b/dali/internal/adaptor/common/combined-update-render-controller-debug.h
@@ -48,16 +48,16 @@ namespace
 
 Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_THREAD_SYNC" );
 
-#define LOG_THREAD_SYNC(level, color, format, args...) \
-  DALI_LOG_INFO( gLogFilter, level, "%s" format "%s\n", color, ## args, COLOR_CLEAR )
+#define LOG_THREAD_SYNC(level, color, format, ...) \
+  DALI_LOG_INFO( gLogFilter, level, "%s" format "%s\n", color, ## __VA_ARGS__, COLOR_CLEAR )
 
 #define LOG_THREAD_SYNC_TRACE(color) \
   Dali::Integration::Log::TraceObj debugTraceObj( gLogFilter, "%s%s%s", color, __FUNCTION__, COLOR_CLEAR ); \
   if( ! gLogFilter->IsTraceEnabled() ) { LOG_THREAD_SYNC( Debug::Concise, color, "%s", __FUNCTION__ ); }
 
-#define LOG_THREAD_SYNC_TRACE_FMT(color, format, args...) \
-  Dali::Integration::Log::TraceObj debugTraceObj( gLogFilter, "%s%s: " format "%s", color, __FUNCTION__, ## args, COLOR_CLEAR ); \
-  if( ! gLogFilter->IsTraceEnabled() ) { LOG_THREAD_SYNC( Debug::Concise, color, "%s: " format, __FUNCTION__, ## args ); }
+#define LOG_THREAD_SYNC_TRACE_FMT(color, format, ...) \
+  Dali::Integration::Log::TraceObj debugTraceObj( gLogFilter, "%s%s: " format "%s", color, __FUNCTION__, ## __VA_ARGS__, COLOR_CLEAR ); \
+  if( ! gLogFilter->IsTraceEnabled() ) { LOG_THREAD_SYNC( Debug::Concise, color, "%s: " format, __FUNCTION__, ## __VA_ARGS__ ); }
 
 #elif defined( RELEASE_BUILD_LOGGING )
 
@@ -70,20 +70,20 @@ Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_TH
 #define DEBUG_LEVEL_UPDATE_RENDER      0
 #define DEBUG_LEVEL_EVENT       0
 
-#define LOG_THREAD_SYNC(level, color, format, args...) \
-  Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s" format "%s\n", color, ## args, COLOR_CLEAR )
+#define LOG_THREAD_SYNC(level, color, format, ...) \
+  Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s" format "%s\n", color, ## __VA_ARGS__, COLOR_CLEAR )
 
 #define LOG_THREAD_SYNC_TRACE(color) \
   Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s%s%s\n", color, __FUNCTION__, COLOR_CLEAR )
 
-#define LOG_THREAD_SYNC_TRACE_FMT(color, format, args...) \
-  Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s%s: " format "%s\n", color, __FUNCTION__, ## args, COLOR_CLEAR )
+#define LOG_THREAD_SYNC_TRACE_FMT(color, format, ...) \
+  Dali::Integration::Log::LogMessage( Dali::Integration::Log::DebugInfo, "%s%s: " format "%s\n", color, __FUNCTION__, ## __VA_ARGS__, COLOR_CLEAR )
 
 #else
 
-#define LOG_THREAD_SYNC(level, color, format, args...)
+#define LOG_THREAD_SYNC(level, color, format, ...)
 #define LOG_THREAD_SYNC_TRACE(color)
-#define LOG_THREAD_SYNC_TRACE_FMT(color, format, args...)
+#define LOG_THREAD_SYNC_TRACE_FMT(color, format, ...)
 
 #endif // DEBUG_ENABLED
 
@@ -102,31 +102,31 @@ Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_TH
 #endif
 
 #ifdef ENABLE_COUNTER_LOGGING
-#define LOG_COUNTER_EVENT(format, args...)            LOG_THREAD_SYNC(DEBUG_LEVEL_COUNTER, COLOR_LIGHT_RED, "%s: " format, __FUNCTION__, ## args)
-#define LOG_COUNTER_UPDATE_RENDER(format, args...)    LOG_THREAD_SYNC(DEBUG_LEVEL_COUNTER, COLOR_LIGHT_YELLOW, "%s: " format, __FUNCTION__, ## args)
+#define LOG_COUNTER_EVENT(format, ...)            LOG_THREAD_SYNC(DEBUG_LEVEL_COUNTER, COLOR_LIGHT_RED, "%s: " format, __FUNCTION__, ## __VA_ARGS__)
+#define LOG_COUNTER_UPDATE_RENDER(format, ...)    LOG_THREAD_SYNC(DEBUG_LEVEL_COUNTER, COLOR_LIGHT_YELLOW, "%s: " format, __FUNCTION__, ## __VA_ARGS__)
 #else
-#define LOG_COUNTER_EVENT(format, args...)
-#define LOG_COUNTER_UPDATE_RENDER(format, args...)
+#define LOG_COUNTER_EVENT(format, ...)
+#define LOG_COUNTER_UPDATE_RENDER(format, ...)
 #endif
 
 #ifdef ENABLE_UPDATE_RENDER_THREAD_LOGGING
-#define LOG_UPDATE_RENDER(format, args...)            LOG_THREAD_SYNC(DEBUG_LEVEL_UPDATE_RENDER, COLOR_YELLOW, "%s: " format, __FUNCTION__, ## args)
+#define LOG_UPDATE_RENDER(format, ...)            LOG_THREAD_SYNC(DEBUG_LEVEL_UPDATE_RENDER, COLOR_YELLOW, "%s: " format, __FUNCTION__, ## __VA_ARGS__)
 #define LOG_UPDATE_RENDER_TRACE                       LOG_THREAD_SYNC_TRACE(COLOR_YELLOW)
-#define LOG_UPDATE_RENDER_TRACE_FMT(format, args...)  LOG_THREAD_SYNC_TRACE_FMT(COLOR_YELLOW, format, ## args)
+#define LOG_UPDATE_RENDER_TRACE_FMT(format, ...)  LOG_THREAD_SYNC_TRACE_FMT(COLOR_YELLOW, format, ## __VA_ARGS__)
 #else
-#define LOG_UPDATE_RENDER(format, args...)
+#define LOG_UPDATE_RENDER(format, ...)
 #define LOG_UPDATE_RENDER_TRACE
-#define LOG_UPDATE_RENDER_TRACE_FMT(format, args...)
+#define LOG_UPDATE_RENDER_TRACE_FMT(format, ...)
 #endif
 
 #ifdef ENABLE_EVENT_LOGGING
-#define LOG_EVENT(format, args...)             LOG_THREAD_SYNC(DEBUG_LEVEL_EVENT, COLOR_WHITE, "%s: " format, __FUNCTION__, ## args)
+#define LOG_EVENT(format, ...)             LOG_THREAD_SYNC(DEBUG_LEVEL_EVENT, COLOR_WHITE, "%s: " format, __FUNCTION__, ## __VA_ARGS__)
 #define LOG_EVENT_TRACE                        LOG_THREAD_SYNC_TRACE(COLOR_WHITE)
-#define LOG_EVENT_TRACE_FMT(format, args...)   LOG_THREAD_SYNC_TRACE_FMT(COLOR_WHITE, format, ## args)
+#define LOG_EVENT_TRACE_FMT(format, ...)   LOG_THREAD_SYNC_TRACE_FMT(COLOR_WHITE, format, ## __VA_ARGS__)
 #else
-#define LOG_EVENT(format, args...)
+#define LOG_EVENT(format, ...)
 #define LOG_EVENT_TRACE
-#define LOG_EVENT_TRACE_FMT(format, args...)
+#define LOG_EVENT_TRACE_FMT(format, ...)
 #endif
 
 } // unnamed namespace

diff --git a/dali/internal/imaging/common/image-operations.cpp b/dali/internal/imaging/common/image-operations.cpp
old mode 100644 (file)
new mode 100755 (executable)
index 9a2ae6b..d4716b1
--- a/dali/internal/imaging/common/image-operations.cpp
+++ b/dali/internal/imaging/common/image-operations.cpp
@@ -1915,8 +1915,8 @@ void Resample( const unsigned char * __restrict__ inPixels,
     }
   }
 
-  Resampler* resamplers[numChannels];
-  Vector<float> samples[numChannels];
+  std::vector<Resampler*> resamplers( numChannels );
+  std::vector<Vector<float>> samples(numChannels);
 
   const int srcWidth = inputDimensions.GetWidth();
   const int srcHeight = inputDimensions.GetHeight();

diff --git a/dali/internal/system/common/singleton-service-impl.cpp b/dali/internal/system/common/singleton-service-impl.cpp
old mode 100644 (file)
new mode 100755 (executable)
index afc5740..cb7830b
--- a/dali/internal/system/common/singleton-service-impl.cpp
+++ b/dali/internal/system/common/singleton-service-impl.cpp
@@ -33,12 +33,11 @@ Debug::Filter* gSingletonServiceLogFilter = Debug::Filter::New( Debug::NoLogging
 #define DALI_LOG_SINGLETON_SERVICE_DIRECT(level, message)                        \
     if(gSingletonServiceLogFilter && gSingletonServiceLogFilter->IsEnabledFor(level)) { std::string string(message); Dali::TizenPlatform::LogMessage( Debug::DebugInfo, string );  }
 
-#define DALI_LOG_SINGLETON_SERVICE(level, format, args...) DALI_LOG_INFO(gSingletonServiceLogFilter, level, format, ## args )
-
+#define DALI_LOG_SINGLETON_SERVICE(level, format, ...) DALI_LOG_INFO(gSingletonServiceLogFilter, level, format, ## __VA_ARGS__ )
 #else
 
 #define DALI_LOG_SINGLETON_SERVICE_DIRECT(level, message)
-#define DALI_LOG_SINGLETON_SERVICE(level, format, args...)
+#define DALI_LOG_SINGLETON_SERVICE(level, format, ...)
 
 #endif
 

diff --git a/dali/public-api/dali-adaptor-common.h b/dali/public-api/dali-adaptor-common.h
index 18239f2..c0a5651 100755 (executable)
--- a/dali/public-api/dali-adaptor-common.h
+++ b/dali/public-api/dali-adaptor-common.h
@@ -38,8 +38,18 @@
 #    define DALI_ADAPTOR_API __attribute__ ((visibility ("default")))
 #  endif
 #else
+#ifdef WIN32
+#ifdef BUILDING_DALI_ADAPTOR
+/** Visibility attribute to hide declarations */
+#  define DALI_ADAPTOR_API __declspec(dllexport)
+#else
+/** Visibility attribute to hide declarations */
+#  define DALI_ADAPTOR_API __declspec(dllimport)
+#endif
+#else
 /** Visibility attribute to show declarations */
 #  define DALI_ADAPTOR_API
 #endif
+#endif
 
 #endif // DALI_ADAPTOR_COMMON_H