/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
mDestroyUpdateRenderThread( FALSE ),
mUpdateRenderThreadCanSleep( FALSE ),
mPendingRequestUpdate( FALSE ),
+ mUseElapsedTimeAfterWait( FALSE ),
mNewSurface( NULL ),
mPostRendering( FALSE )
{
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
: mEnvironmentOptions( environmentOptions ),
mKernelTrace( adaptorServices.GetKernelTraceInterface() ),
mSystemTrace( adaptorServices.GetSystemTraceInterface() ),
+ mLogMutex(),
#if defined(NETWORK_LOGGING_ENABLED)
mNetworkServer( adaptorServices, environmentOptions ),
mNetworkControlEnabled( mEnvironmentOptions.GetNetworkControlMode()),
#endif
mStatContextManager( *this ),
mStatisticsLogBitmask( 0 ),
+ mPerformanceOutputBitmask( 0 ),
mLoggingEnabled( false ),
mLogFunctionInstalled( false )
{
#define __DALI_INTERNAL_ADAPTOR_STAT_CONTEXT_MANAGER_H__
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
private:
+ StatContextManager( const StatContextManager& ); ///< Undefined
+ StatContextManager& operator=( const StatContextManager& ); ///< Undefined
+
typedef Dali::Vector< StatContext* > StatContexts;
/**
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
timespec sleepTime;
sleepTime.tv_sec = 0;
- sleepTime.tv_nsec = sleepTimeInMicroseconds * 1000;
+ sleepTime.tv_nsec = sleepTimeInMicroseconds;
+ sleepTime.tv_nsec *= NANOSECONDS_PER_MICROSECOND;
nanosleep( &sleepTime, NULL );
}
mThreadSynchronization.AddPerformanceMarker( PerformanceInterface::VSYNC );
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
{
ApplicationExtensions::ApplicationExtensions()
+: mApplication( NULL )
{
}
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Indicator::Indicator( Adaptor* adaptor, Dali::Window::WindowOrientation orientation, IndicatorInterface::Observer* observer )
: mPixmap( 0 ),
+ mGestureDeltaY( 0.0f ),
mGestureDetected( false ),
mConnection( this ),
mOpacityMode( Dali::Window::OPAQUE ),
else if( scopedLock.IsLocked() )
{
unsigned char *src = mSharedFileInfo[bufferNumber].mSharedFile->GetAddress();
- size_t size = mSharedFileInfo[bufferNumber].mImageWidth * mSharedFileInfo[bufferNumber].mImageHeight * 4;
+ size_t size = static_cast< size_t >( mSharedFileInfo[bufferNumber].mImageWidth ) * mSharedFileInfo[bufferNumber].mImageHeight * 4;
if( mIndicatorBuffer->UpdatePixels( src, size ) )
{
void Indicator::OnPan( Dali::Actor actor, const Dali::PanGesture& gesture )
{
- return ;
-
- if( mServerConnection )
- {
- switch( gesture.state )
- {
- case Gesture::Started:
- {
- mGestureDetected = false;
-
- // The gesture position is the current position after it has moved by the displacement.
- // We want to reference the original position.
- mGestureDeltaY = gesture.position.y - gesture.displacement.y;
- }
-
- // No break, Fall through
- case Gesture::Continuing:
- {
- if( mVisible == Dali::Window::AUTO && !mIsShowing )
- {
- // Only take one touch point
- if( gesture.numberOfTouches == 1 && mGestureDetected == false )
- {
- mGestureDeltaY += gesture.displacement.y;
-
- if( mGestureDeltaY >= mImageHeight * SHOWING_DISTANCE_HEIGHT_RATE )
- {
- ShowIndicator( AUTO_INDICATOR_STAY_DURATION );
- mGestureDetected = true;
- }
- }
- }
-
- break;
- }
-
- case Gesture::Finished:
- case Gesture::Cancelled:
- {
- // if indicator is showing, hide again when touching is finished (Since touch leave is activated, checking it in gesture::finish instead of touch::up)
- if( mVisible == Dali::Window::AUTO && mIsShowing )
- {
- ShowIndicator( AUTO_INDICATOR_STAY_DURATION );
- }
- break;
- }
-
-
- default:
- break;
- }
- }
+ // Nothing to do, but we still want to consume pan
}
void Indicator::OnStageTouched(const Dali::TouchEvent& touchEvent)
#define __DALI_INTERNAL_ADAPTOR_ECORE_SERVER_CONNECTION_H_
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
static Eina_Bool IpcServerData(void *data, int type, void *event);
private:
+
+ ServerConnection( const ServerConnection& ); ///< Undefined
+ ServerConnection& operator=( const ServerConnection& ); ///< Undefined
+
void CloseConnection();
private:
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
const std::string& name,
bool isTransparent)
: EcoreWlRenderSurface( positionSize, surface, name, isTransparent ),
+ mWlWindow( NULL ),
mEglWindow( NULL ),
mNeedToApproveDeiconify( false )
{
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
pixbuf.resize(width*height*4);
unsigned * bufPtr = reinterpret_cast<unsigned *>(&pixbuf[0]);
const unsigned xDataLineSkip = pXImage->bytes_per_line;
- const size_t copy_count = width * 4;
+ const size_t copy_count = static_cast< size_t >( width ) * 4;
pixelFormat = Pixel::BGRA8888;
for(unsigned y = height-1; y < height; --y, bufPtr += width)
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
const std::string& className,
bool isTransparent)
: EcoreXRenderSurface( positionSize, surface, name, isTransparent ),
+ mX11Window( 0 ),
mNeedToApproveDeiconify(false),
mClassName(className)
{
#define __TEST_GL_SYNC_ABSTRACTION_H__
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
int GetNumberOfSyncObjects();
private:
+
+ TestGlSyncAbstraction( const TestGlSyncAbstraction& ); ///< Undefined
+ TestGlSyncAbstraction& operator=( const TestGlSyncAbstraction& ); ///< Undefined
+
typedef std::vector<TestSyncObject*> SyncContainer;
typedef SyncContainer::iterator SyncIter;
SyncContainer mSyncObjects; ///< The sync objects
size_t imageByteCount = fileSize - sizeof( AstcFileHeader );
// Sanity-check the image data is not too large and that it is at less than 2 bytes per texel:
- if( ( imageByteCount > MAX_IMAGE_DATA_SIZE ) || ( imageByteCount > ( ( width * height ) << 1 ) ) )
+ if( ( imageByteCount > MAX_IMAGE_DATA_SIZE ) || ( imageByteCount > ( ( static_cast< size_t >( width ) * height ) << 1 ) ) )
{
DALI_LOG_ERROR( "ASTC file has too large image-data field.\n" );
return false;
/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
for(unsigned int j = 0; j < fillw; j ++)
{
- int ctIndex = 0;
+ unsigned int ctIndex = 0;
if((fillw * index + j ) < (fillw * height))
{
ctIndex = colorIndex[ fillw * index + j ];
colorIndex[i] = cmd >> 4;
colorIndex[i + 1] = cmd & (0x0F);
}
- int ctIndex = 0;
+ unsigned int ctIndex = 0;
for(unsigned int index = 0; index < height; index = index + 1)
{
colorIndex[i] = cmd;
}
- int ctIndex = 0;
+ unsigned int ctIndex = 0;
for(unsigned int index = 0; index < height; index = index + 1)
{
PixelBuffer *pixelsPtr = NULL;
char colorTable[64];
std::vector<char> colorIndex(width * height >> 1);
std::vector<char> run;
- int x = 0;
- int y = 0;
- int dx = 0;
- int dy = 0;
+ unsigned int x = 0;
+ unsigned int y = 0;
+ unsigned int dx = 0;
+ unsigned int dy = 0;
width += (width & 1);
width = width >> 1;
return false;
}
PixelBuffer *pixelsPtr = pixels;
- int x = 0;
- int y = 0;
+ unsigned int x = 0;
+ unsigned int y = 0;
unsigned int cmdStride = 2;
width = ((width & 3) != 0) ? width + 4 - (width & 3) : width;
return false;
}
- int dx = 0;
- int dy = 0;
+ unsigned int dx = 0;
+ unsigned int dy = 0;
bool finish = false;
unsigned int length = 0;
unsigned int copylength = 0;
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
mStoredRequests.erase( iter );
}
}
+
+private:
+
+ ResourceLoaderImpl( const ResourceLoaderImpl& ); ///< Undefined
+ ResourceLoaderImpl& operator=( const ResourceLoaderImpl& ); ///< Undefined
};
/********************************************************************************/
#define __DALI_TIZEN_PLATFORM_ABSTRACTION_H__
/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
void SetDataStoragePath( const std::string& path );
private:
+
+ TizenPlatformAbstraction( const TizenPlatformAbstraction& ); ///< Undefined
+ TizenPlatformAbstraction& operator=( const TizenPlatformAbstraction& ); ///< Undefined
+
ResourceLoader* mResourceLoader;
std::string mDataStoragePath;
};