From f83bcfdf7d939a211317b7b6fd1f2f36916536f2 Mon Sep 17 00:00:00 2001
From: Ferran Sole <ferran.sole@samsung.com>
Date: Tue, 28 Jun 2016 16:51:10 +0100
Subject: [PATCH] Changes following patch "Added support for compressed texture
 upload to Render::NewTexture"

Change-Id: If323b7a0a177b3e504d46a8c879f9ed7d11ccfad
---
 .../dali-toolkit-test-utils/test-gl-abstraction.h  | 24 ++++++++++++++++++++++
 .../toolkit-bitmap-loader.cpp                      |  2 +-
 .../renderers/svg/svg-rasterize-thread.cpp         |  5 +++--
 .../internal/image-atlas/image-atlas-impl.cpp      |  2 +-
 4 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
index 9a93c8e..e445084 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-gl-abstraction.h
@@ -295,10 +295,34 @@ public:
 
   inline void CompressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const void* data)
   {
+    std::stringstream out;
+    out << target<<", "<<level<<", "<<width << ", " << height;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["level"] = ToString(level);
+    namedParams["internalformat"] = ToString(internalformat);
+    namedParams["width"] = ToString(width);
+    namedParams["height"] = ToString(height);
+    namedParams["border"] = ToString(border);
+    namedParams["size"] = ToString(imageSize);
+
+    mTextureTrace.PushCall("CompressedTexImage2D", out.str(), namedParams);
   }
 
   inline void CompressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const void* data)
   {
+    std::stringstream out;
+    out << target << ", "<<level <<", " << xoffset << ", " << yoffset << ", " << width << ", " << height;
+
+    TraceCallStack::NamedParams namedParams;
+    namedParams["target"] = ToString(target);
+    namedParams["level"] = ToString(level);
+    namedParams["xoffset"] = ToString(xoffset);
+    namedParams["yoffset"] = ToString(yoffset);
+    namedParams["width"] = ToString(width);
+    namedParams["height"] = ToString(height);
+    mTextureTrace.PushCall("CompressedTexSubImage2D", out.str(), namedParams);
   }
 
   inline void CopyTexImage2D(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
index 1315e53..61cbe4d 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-bitmap-loader.cpp
@@ -68,7 +68,7 @@ public:
     unsigned char* buffer = static_cast<unsigned char*>(malloc(bufferSize));
     memset(buffer, 0, bufferSize);
 
-    mPixelData = Dali::PixelData::New( buffer, mSize.GetWidth(), mSize.GetHeight(), Pixel::RGBA8888, Dali::PixelData::FREE);
+    mPixelData = Dali::PixelData::New( buffer, bufferSize, mSize.GetWidth(), mSize.GetHeight(), Pixel::RGBA8888, Dali::PixelData::FREE);
 
     sem_post( &mySemaphore );
   }
diff --git a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
index 9e2e707..f1dc374 100644
--- a/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
+++ b/dali-toolkit/internal/controls/renderers/svg/svg-rasterize-thread.cpp
@@ -47,13 +47,14 @@ void RasterizingTask::Rasterize( NSVGrasterizer* rasterizer )
     float scaleY =  static_cast<float>( mHeight ) /  mParsedSvg->height;
     float scale = scaleX < scaleY ? scaleX : scaleY;
     unsigned int bufferStride = mWidth*Pixel::GetBytesPerPixel( Pixel::RGBA8888 );
+    unsigned int bufferSize = bufferStride * mHeight;
 
-    unsigned char* buffer = new unsigned char [bufferStride*mHeight];
+    unsigned char* buffer = new unsigned char [bufferSize];
     nsvgRasterize(rasterizer, mParsedSvg, 0.f,0.f,scale,
         buffer, mWidth, mHeight,
         bufferStride );
 
-    mPixelData = Dali::PixelData::New( buffer, mWidth, mHeight, Pixel::RGBA8888, Dali::PixelData::DELETE_ARRAY );
+    mPixelData = Dali::PixelData::New( buffer, bufferSize, mWidth, mHeight, Pixel::RGBA8888, Dali::PixelData::DELETE_ARRAY );
   }
 }
 
diff --git a/dali-toolkit/internal/image-atlas/image-atlas-impl.cpp b/dali-toolkit/internal/image-atlas/image-atlas-impl.cpp
index 33475c1..0459de5 100644
--- a/dali-toolkit/internal/image-atlas/image-atlas-impl.cpp
+++ b/dali-toolkit/internal/image-atlas/image-atlas-impl.cpp
@@ -223,7 +223,7 @@ void ImageAtlas::UploadBrokenImage( const Rect<SizeType>& area )
   {
     SizeType size = area.width * area.height * Pixel::GetBytesPerPixel( mPixelFormat );
     PixelBuffer* buffer = new PixelBuffer [size];
-    PixelData background = PixelData::New( buffer, area.width, area.height, mPixelFormat, PixelData::DELETE_ARRAY );
+    PixelData background = PixelData::New( buffer, size, area.width, area.height, mPixelFormat, PixelData::DELETE_ARRAY );
     for( SizeType idx = 0; idx < size; idx++ )
     {
       buffer[idx] = 0x00;
-- 
2.7.4