projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Add codes for Dali Windows Backend
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
imaging
/
common
/
image-loader.cpp
diff --git
a/dali/internal/imaging/common/image-loader.cpp
b/dali/internal/imaging/common/image-loader.cpp
index
09c1d00
..
e8b3b79
100755
(executable)
--- a/
dali/internal/imaging/common/image-loader.cpp
+++ b/
dali/internal/imaging/common/image-loader.cpp
@@
-33,6
+33,7
@@
#include <dali/internal/system/common/file-reader.h>
using namespace Dali::Integration;
#include <dali/internal/system/common/file-reader.h>
using namespace Dali::Integration;
+using namespace Dali::Internal::Platform;
namespace Dali
{
namespace Dali
{
@@
-45,6
+46,7
@@
namespace
Integration::Log::Filter* gLogFilter = Debug::Filter::New( Debug::Concise, false, "LOG_IMAGE_LOADING" );
#endif
Integration::Log::Filter* gLogFilter = Debug::Filter::New( Debug::Concise, false, "LOG_IMAGE_LOADING" );
#endif
+static unsigned int gMaxTextureSize = 4096;
/**
* Enum for file formats, has to be in sync with BITMAP_LOADER_LOOKUP_TABLE
/**
* Enum for file formats, has to be in sync with BITMAP_LOADER_LOOKUP_TABLE
@@
-146,10
+148,10
@@
bool GetBitmapLoaderFunctions( FILE *fp,
const std::string& filename )
{
unsigned char magic[MAGIC_LENGTH];
const std::string& filename )
{
unsigned char magic[MAGIC_LENGTH];
- size_t read = fread(magic, sizeof(unsigned char), MAGIC_LENGTH, fp);
+ size_t read =
InternalFile::
fread(magic, sizeof(unsigned char), MAGIC_LENGTH, fp);
// Reset to the start of the file.
// Reset to the start of the file.
- if( fseek(fp, 0, SEEK_SET) )
+ if(
InternalFile::
fseek(fp, 0, SEEK_SET) )
{
DALI_LOG_ERROR("Error seeking to start of file\n");
}
{
DALI_LOG_ERROR("Error seeking to start of file\n");
}
@@
-234,7
+236,7
@@
bool GetBitmapLoaderFunctions( FILE *fp,
}
// Reset to the start of the file.
}
// Reset to the start of the file.
- if( fseek(fp, 0, SEEK_SET) )
+ if(
InternalFile::
fseek(fp, 0, SEEK_SET) )
{
DALI_LOG_ERROR("Error seeking to start of file\n");
}
{
DALI_LOG_ERROR("Error seeking to start of file\n");
}
@@
-414,6
+416,16
@@
ImageDimensions GetClosestImageSize( Integration::ResourcePointer resourceBuffer
return ImageDimensions( width, height );
}
return ImageDimensions( width, height );
}
+void SetMaxTextureSize( unsigned int size )
+{
+ gMaxTextureSize = size;
+}
+
+unsigned int GetMaxTextureSize()
+{
+ return gMaxTextureSize;
+}
+
} // ImageLoader
} // TizenPlatform
} // Dali
} // ImageLoader
} // TizenPlatform
} // Dali