Merge branch 'devel/master' into tizen

diff --git a/examples/image-view-encoded-image-buffer/image-view-encoded-image-buffer-example.cpp b/examples/image-view-encoded-image-buffer/image-view-encoded-image-buffer-example.cpp
index 8aea44a..36e2039 100644 (file)
--- a/examples/image-view-encoded-image-buffer/image-view-encoded-image-buffer-example.cpp
+++ b/examples/image-view-encoded-image-buffer/image-view-encoded-image-buffer-example.cpp
@@ -61,7 +61,7 @@ EncodedImageBuffer ConvertFileToEncodedImageBuffer(const char* url)
     Dali::Vector<uint8_t> data;
     data.Resize(size);
     fseek(fp, 0, SEEK_SET);
-    size_t realSize = fread(data.Begin(), size, sizeof(uint8_t), fp);
+    size_t realSize = fread(data.Begin(), sizeof(uint8_t), size, fp);
     fclose(fp);
     data.Resize(realSize);
     buffer = EncodedImageBuffer::New(data);

diff --git a/packaging/com.samsung.dali-demo.spec b/packaging/com.samsung.dali-demo.spec
index f96bda5..926accf 100755 (executable)
--- a/packaging/com.samsung.dali-demo.spec
+++ b/packaging/com.samsung.dali-demo.spec
@@ -2,7 +2,7 @@
 
 Name:       com.samsung.dali-demo
 Summary:    The OpenGLES Canvas Core Demo
-Version:    2.0.38
+Version:    2.0.39
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0