Emscripten workarounds and llvm syntax fixes

[platform/core/uifw/dali-core.git] / automated-tests / dali-test-suite-utils / test-platform-abstraction.h

diff --git a/automated-tests/dali-test-suite-utils/test-platform-abstraction.h b/automated-tests/dali-test-suite-utils/test-platform-abstraction.h
index d636ab4..6ae2627 100644 (file)
--- a/automated-tests/dali-test-suite-utils/test-platform-abstraction.h
+++ b/automated-tests/dali-test-suite-utils/test-platform-abstraction.h
@@ -113,16 +113,23 @@ public:
     mTrace.PushCall("Resume", "");
   }
 
-  /**
-   * @copydoc PlatformAbstraction::LoadImageMetadata()
-   */
-  virtual void LoadImageMetadata(const std::string fileName, Vector2 &size)
+  virtual void GetClosestImageSize( const std::string& filename,
+                                    const ImageAttributes& attributes,
+                                    Vector2& closestSize)
   {
-    size = mSize;
+    closestSize = mClosestSize;
+    mTrace.PushCall("GetClosestImageSize", "");
+  }
 
-    mTrace.PushCall("LoadImageMetadata", "");
+  virtual void GetClosestImageSize( Integration::ResourcePointer resourceBuffer,
+                                    const ImageAttributes& attributes,
+                                    Vector2& closestSize)
+  {
+    closestSize = mClosestSize;
+    mTrace.PushCall("GetClosestImageSize", "");
   }
 
+
   /**
    * @copydoc PlatformAbstraction::LoadResource()
    */
@@ -253,7 +260,7 @@ public:
         {
           bitmapData = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, true);
           bitmapData->GetPackedPixelsProfile()->ReserveBuffer(Pixel::A8, 64, 64);
-          PixelBuffer* pixelBuffer = bitmapData->GetBuffer();
+          Integration::PixelBuffer* pixelBuffer = bitmapData->GetBuffer();
           memset( pixelBuffer, it->character, 64*64 );
         }
 
@@ -294,7 +301,7 @@ public:
 
         bitmapData = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, true);
         bitmapData->GetPackedPixelsProfile()->ReserveBuffer(Pixel::A8, 64, 64);
-        PixelBuffer* pixelBuffer = bitmapData->GetBuffer();
+        Integration::PixelBuffer* pixelBuffer = bitmapData->GetBuffer();
         memset( pixelBuffer, it->character, 64*64 );
         set->AddCharacter(bitmapData, character);
       }
@@ -476,7 +483,6 @@ public: // TEST FUNCTIONS
     GetTimeMicrosecondsFunc,
     SuspendFunc,
     ResumeFunc,
-    LoadImageMetadataFunc,
     LoadResourceFunc,
     SaveResourceFunc,
     SaveFileFunc,
@@ -538,7 +544,6 @@ public: // TEST FUNCTIONS
       case GetTimeMicrosecondsFunc:             return mTrace.FindMethod("GetTimeMicroseconds");
       case SuspendFunc:                         return mTrace.FindMethod("Suspend");
       case ResumeFunc:                          return mTrace.FindMethod("Resume");
-      case LoadImageMetadataFunc:               return mTrace.FindMethod("LoadImageMetadata");
       case LoadResourceFunc:                    return mTrace.FindMethod("LoadResource");
       case SaveResourceFunc:                    return mTrace.FindMethod("SaveResource");
       case LoadFileFunc:                        return mTrace.FindMethod("LoadFile");
@@ -653,9 +658,9 @@ public: // TEST FUNCTIONS
     mRequest = NULL;
   }
 
-  void SetImageMetaDataSize(const Vector2& size)
+  void SetClosestImageSize(const Vector2& size)
   {
-    mSize = size;
+    mClosestSize = size;
   }
 
   void SetLoadFileResult( bool result, std::vector< unsigned char >& buffer )
@@ -700,6 +705,7 @@ private:
   Resources                     mResources;
   Integration::ResourceRequest* mRequest;
   Vector2                       mSize;
+  Vector2                       mClosestSize;
   bool                          mReadGlobalMetricsResult;
   bool                          mReadMetricsResult;
   Integration::GlobalMetrics mReadGlobalMetrics;