/*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
#include "image-atlas-manager.h"
// EXTERNAL HEADER
-#include <dali/devel-api/images/texture-set-image.h>
-#include <dali/public-api/images/resource-image.h>
+#include <dali/devel-api/adaptor-framework/image-loading.h>
namespace Dali
{
TextureSet ImageAtlasManager::Add( Vector4& textureRect,
const std::string& url,
- ImageDimensions size,
+ ImageDimensions& size,
FittingMode::Type fittingMode,
bool orientationCorrection,
AtlasUploadObserver* atlasUploadObserver )
ImageDimensions zero;
if( size == zero )
{
- dimensions = ResourceImage::GetImageSize( url );
+ dimensions = Dali::GetClosestImageSize( url );
}
// big image, atlasing is not applied
{
return TextureSet();
}
+ size = dimensions;
unsigned int i = 0;
for( AtlasContainer::iterator iter = mAtlasList.begin(); iter != mAtlasList.end(); ++iter)